[hornetq-commits] JBoss hornetq SVN: r10722 - in branches/HORNETQ-698_SplitJournal: examples/common/config and 47 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue May 24 08:02:24 EDT 2011
Author: borges
Date: 2011-05-24 08:02:21 -0400 (Tue, 24 May 2011)
New Revision: 10722
Added:
branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/InVMContext.java
branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/InVMNameParser.java
branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/NonSerializableFactory.java
Removed:
branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/main/java/
branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/main/java/
branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/test/java/org/hornetq/tests/util/InVMContext.java
branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/test/java/org/hornetq/tests/util/InVMNameParser.java
branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/test/java/org/hornetq/tests/util/NonSerializableFactory.java
Modified:
branches/HORNETQ-698_SplitJournal/
branches/HORNETQ-698_SplitJournal/examples/common/config/hornetq-example-beans.xml
branches/HORNETQ-698_SplitJournal/examples/common/src/org/hornetq/common/example/SpawnedVMSupport.java
branches/HORNETQ-698_SplitJournal/examples/core/microcontainer/
branches/HORNETQ-698_SplitJournal/examples/javaee/common/config/ant.properties
branches/HORNETQ-698_SplitJournal/examples/javaee/ejb-jms-transaction/build.xml
branches/HORNETQ-698_SplitJournal/examples/javaee/jca-remote/server0/hornetq-jms.xml
branches/HORNETQ-698_SplitJournal/examples/javaee/jca-remote/server0/hornetq-users.xml
branches/HORNETQ-698_SplitJournal/examples/javaee/mdb-cmt-setrollbackonly/readme.html
branches/HORNETQ-698_SplitJournal/examples/javaee/mdb-cmt-tx-required/readme.html
branches/HORNETQ-698_SplitJournal/examples/jms/browser/server0/hornetq-beans.xml
branches/HORNETQ-698_SplitJournal/examples/jms/browser/server0/hornetq-jms.xml
branches/HORNETQ-698_SplitJournal/examples/jms/browser/server0/hornetq-users.xml
branches/HORNETQ-698_SplitJournal/examples/jms/dead-letter/server0/hornetq-users.xml
branches/HORNETQ-698_SplitJournal/examples/jms/durable-subscription/server0/hornetq-jms.xml
branches/HORNETQ-698_SplitJournal/examples/jms/durable-subscription/server0/hornetq-users.xml
branches/HORNETQ-698_SplitJournal/examples/jms/paging/server0/hornetq-jms.xml
branches/HORNETQ-698_SplitJournal/examples/jms/paging/server0/hornetq-users.xml
branches/HORNETQ-698_SplitJournal/examples/jms/queue-requestor/server0/hornetq-jms.xml
branches/HORNETQ-698_SplitJournal/examples/jms/queue-requestor/server0/hornetq-users.xml
branches/HORNETQ-698_SplitJournal/examples/jms/queue/server0/hornetq-jms.xml
branches/HORNETQ-698_SplitJournal/examples/jms/queue/server0/hornetq-users.xml
branches/HORNETQ-698_SplitJournal/examples/jms/request-reply/server0/hornetq-jms.xml
branches/HORNETQ-698_SplitJournal/examples/jms/request-reply/server0/hornetq-users.xml
branches/HORNETQ-698_SplitJournal/examples/jms/temp-queue/server0/hornetq-jms.xml
branches/HORNETQ-698_SplitJournal/examples/jms/temp-queue/server0/hornetq-users.xml
branches/HORNETQ-698_SplitJournal/examples/jms/topic-selector-example1/
branches/HORNETQ-698_SplitJournal/examples/jms/topic-selector-example2/
branches/HORNETQ-698_SplitJournal/examples/jms/topic/server0/hornetq-jms.xml
branches/HORNETQ-698_SplitJournal/examples/jms/topic/server0/hornetq-users.xml
branches/HORNETQ-698_SplitJournal/examples/jms/transactional/server0/hornetq-jms.xml
branches/HORNETQ-698_SplitJournal/examples/jms/xa-send/
branches/HORNETQ-698_SplitJournal/hornetq-core/src/main/java/org/hornetq/core/buffers/
branches/HORNETQ-698_SplitJournal/hornetq-core/src/main/java/org/hornetq/core/cluster/DiscoveryGroup.java
branches/HORNETQ-698_SplitJournal/hornetq-core/src/main/java/org/hornetq/core/cluster/DiscoveryListener.java
branches/HORNETQ-698_SplitJournal/hornetq-core/src/main/java/org/hornetq/core/cluster/impl/DiscoveryGroupImpl.java
branches/HORNETQ-698_SplitJournal/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/journal/LargeServerMessageImpl.java
branches/HORNETQ-698_SplitJournal/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java
branches/HORNETQ-698_SplitJournal/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionContinuationMessage.java
branches/HORNETQ-698_SplitJournal/hornetq-core/src/main/java/org/hornetq/core/server/management/ManagementService.java
branches/HORNETQ-698_SplitJournal/hornetq-core/src/main/java/org/hornetq/core/server/management/impl/ManagementServiceImpl.java
branches/HORNETQ-698_SplitJournal/hornetq-jms/src/main/java/org/hornetq/api/jms/management/SubscriptionInfo.java
branches/HORNETQ-698_SplitJournal/hornetq-jms/src/main/java/org/hornetq/jms/server/management/JMSManagementService.java
branches/HORNETQ-698_SplitJournal/hornetq-jms/src/main/java/org/hornetq/jms/server/management/impl/JMSManagementServiceImpl.java
branches/HORNETQ-698_SplitJournal/hornetq-journal/src/main/java/org/hornetq/core/journal/LoaderCallback.java
branches/HORNETQ-698_SplitJournal/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalReaderCallback.java
branches/HORNETQ-698_SplitJournal/hornetq-journal/src/main/java/org/hornetq/utils/UTF8Util.java
branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/AckBatchSizeTest.java
branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/AcknowledgeTest.java
branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/AutogroupIdTest.java
branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/CommitRollbackTest.java
branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerCloseTest.java
branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerRoundRobinTest.java
branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerTest.java
branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java
branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/DeliveryOrderTest.java
branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageTest.java
branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageCounterTest.java
branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageHandlerTest.java
branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageRateTest.java
branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingTest.java
branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ProducerCloseTest.java
branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/QueueBrowserTest.java
branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ReceiveTest.java
branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/RequestorTest.java
branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/RoutingTest.java
branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCloseTest.java
branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCreateAndDeleteQueueTest.java
branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCreateConsumerTest.java
branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCreateProducerTest.java
branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionFactoryTest.java
branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionSendAcknowledgementHandlerTest.java
branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionStopStartTest.java
branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionTest.java
branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/TransactionalSendTest.java
branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/NIOJournalCompactTest.java
branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/SecurityManagementTestBase.java
branches/HORNETQ-698_SplitJournal/tests/jms-tests/src/test/resources/hornetq-beans.xml
branches/HORNETQ-698_SplitJournal/tests/jms-tests/src/test/resources/hornetq-configuration.xml
branches/HORNETQ-698_SplitJournal/tests/jms-tests/src/test/resources/hornetq-jms.xml
branches/HORNETQ-698_SplitJournal/tests/jms-tests/src/test/resources/hornetq-queues.xml
branches/HORNETQ-698_SplitJournal/tests/jms-tests/src/test/resources/hornetq-users.xml
branches/HORNETQ-698_SplitJournal/tests/jms-tests/src/test/resources/jndi.properties
branches/HORNETQ-698_SplitJournal/tests/stress-tests/src/test/java/org/hornetq/tests/stress/paging/PageStressTest.java
branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/asyncio/AsynchronousFileTest.java
branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java
branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/config/impl/DefaultsFileConfigurationTest.java
branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/paging/impl/PagingManagerImplTest.java
branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/test/resources/ConfigurationTest-defaults.xml
Log:
merge changes from trunk
Property changes on: branches/HORNETQ-698_SplitJournal
___________________________________________________________________
Modified: svnmerge-integrated
- /trunk:1-10718
+ /trunk:1-10721
Modified: svn:mergeinfo
- /trunk:10706-10717
+ /trunk:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/examples/common/config/hornetq-example-beans.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/examples/common/config/hornetq-example-beans.xml:10706-10717
+ /trunk/examples/common/config/hornetq-example-beans.xml:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/examples/common/src/org/hornetq/common/example/SpawnedVMSupport.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/examples/common/src/org/hornetq/common/example/SpawnedVMSupport.java:10706-10717
+ /trunk/examples/common/src/org/hornetq/common/example/SpawnedVMSupport.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/examples/core/microcontainer
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/examples/core/microcontainer:10706-10717
+ /trunk/examples/core/microcontainer:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/examples/javaee/common/config/ant.properties
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/examples/javaee/common/config/ant.properties:10706-10717
+ /trunk/examples/javaee/common/config/ant.properties:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/examples/javaee/ejb-jms-transaction/build.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/examples/javaee/ejb-jms-transaction/build.xml:10706-10717
+ /trunk/examples/javaee/ejb-jms-transaction/build.xml:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/examples/javaee/jca-remote/server0/hornetq-jms.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/examples/javaee/jca-remote/server0/hornetq-jms.xml:10706-10717
+ /trunk/examples/javaee/jca-remote/server0/hornetq-jms.xml:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/examples/javaee/jca-remote/server0/hornetq-users.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/examples/javaee/jca-remote/server0/hornetq-users.xml:10706-10717
+ /trunk/examples/javaee/jca-remote/server0/hornetq-users.xml:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/examples/javaee/mdb-cmt-setrollbackonly/readme.html
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/examples/javaee/mdb-cmt-setrollbackonly/readme.html:10706-10717
+ /trunk/examples/javaee/mdb-cmt-setrollbackonly/readme.html:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/examples/javaee/mdb-cmt-tx-required/readme.html
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/examples/javaee/mdb-cmt-tx-required/readme.html:10706-10717
+ /trunk/examples/javaee/mdb-cmt-tx-required/readme.html:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/examples/jms/browser/server0/hornetq-beans.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/examples/jms/browser/server0/hornetq-beans.xml:10706-10717
+ /trunk/examples/jms/browser/server0/hornetq-beans.xml:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/examples/jms/browser/server0/hornetq-jms.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/examples/jms/browser/server0/hornetq-jms.xml:10706-10717
+ /trunk/examples/jms/browser/server0/hornetq-jms.xml:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/examples/jms/browser/server0/hornetq-users.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/examples/jms/browser/server0/hornetq-users.xml:10706-10717
+ /trunk/examples/jms/browser/server0/hornetq-users.xml:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/examples/jms/dead-letter/server0/hornetq-users.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/examples/jms/dead-letter/server0/hornetq-users.xml:10706-10717
+ /trunk/examples/jms/dead-letter/server0/hornetq-users.xml:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/examples/jms/durable-subscription/server0/hornetq-jms.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/examples/jms/durable-subscription/server0/hornetq-jms.xml:10706-10717
+ /trunk/examples/jms/durable-subscription/server0/hornetq-jms.xml:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/examples/jms/durable-subscription/server0/hornetq-users.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/examples/jms/durable-subscription/server0/hornetq-users.xml:10706-10717
+ /trunk/examples/jms/durable-subscription/server0/hornetq-users.xml:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/examples/jms/paging/server0/hornetq-jms.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/examples/jms/paging/server0/hornetq-jms.xml:10706-10717
+ /trunk/examples/jms/paging/server0/hornetq-jms.xml:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/examples/jms/paging/server0/hornetq-users.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/examples/jms/paging/server0/hornetq-users.xml:10706-10717
+ /trunk/examples/jms/paging/server0/hornetq-users.xml:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/examples/jms/queue/server0/hornetq-jms.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/examples/jms/queue/server0/hornetq-jms.xml:10706-10717
+ /trunk/examples/jms/queue/server0/hornetq-jms.xml:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/examples/jms/queue/server0/hornetq-users.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/examples/jms/queue/server0/hornetq-users.xml:10706-10717
+ /trunk/examples/jms/queue/server0/hornetq-users.xml:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/examples/jms/queue-requestor/server0/hornetq-jms.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/examples/jms/queue-requestor/server0/hornetq-jms.xml:10706-10717
+ /trunk/examples/jms/queue-requestor/server0/hornetq-jms.xml:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/examples/jms/queue-requestor/server0/hornetq-users.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/examples/jms/queue-requestor/server0/hornetq-users.xml:10706-10717
+ /trunk/examples/jms/queue-requestor/server0/hornetq-users.xml:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/examples/jms/request-reply/server0/hornetq-jms.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/examples/jms/request-reply/server0/hornetq-jms.xml:10706-10717
+ /trunk/examples/jms/request-reply/server0/hornetq-jms.xml:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/examples/jms/request-reply/server0/hornetq-users.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/examples/jms/request-reply/server0/hornetq-users.xml:10706-10717
+ /trunk/examples/jms/request-reply/server0/hornetq-users.xml:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/examples/jms/temp-queue/server0/hornetq-jms.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/examples/jms/temp-queue/server0/hornetq-jms.xml:10706-10717
+ /trunk/examples/jms/temp-queue/server0/hornetq-jms.xml:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/examples/jms/temp-queue/server0/hornetq-users.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/examples/jms/temp-queue/server0/hornetq-users.xml:10706-10717
+ /trunk/examples/jms/temp-queue/server0/hornetq-users.xml:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/examples/jms/topic/server0/hornetq-jms.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/examples/jms/topic/server0/hornetq-jms.xml:10706-10717
+ /trunk/examples/jms/topic/server0/hornetq-jms.xml:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/examples/jms/topic/server0/hornetq-users.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/examples/jms/topic/server0/hornetq-users.xml:10706-10717
+ /trunk/examples/jms/topic/server0/hornetq-users.xml:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/examples/jms/topic-selector-example1
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/examples/jms/topic-selector-example1:10706-10717
+ /trunk/examples/jms/topic-selector-example1:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/examples/jms/topic-selector-example2
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/examples/jms/topic-selector-example2:10706-10717
+ /trunk/examples/jms/topic-selector-example2:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/examples/jms/transactional/server0/hornetq-jms.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/examples/jms/transactional/server0/hornetq-jms.xml:10706-10717
+ /trunk/examples/jms/transactional/server0/hornetq-jms.xml:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/examples/jms/xa-send
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/examples/jms/xa-send:10706-10717
+ /trunk/examples/jms/xa-send:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/hornetq-core/src/main/java/org/hornetq/core/buffers
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/hornetq-core/src/main/java/org/hornetq/core/buffers:10706-10717
+ /trunk/hornetq-core/src/main/java/org/hornetq/core/buffers:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/hornetq-core/src/main/java/org/hornetq/core/cluster/DiscoveryGroup.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/hornetq-core/src/main/java/org/hornetq/core/cluster/DiscoveryGroup.java:10706-10717
+ /trunk/hornetq-core/src/main/java/org/hornetq/core/cluster/DiscoveryGroup.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/hornetq-core/src/main/java/org/hornetq/core/cluster/DiscoveryListener.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/hornetq-core/src/main/java/org/hornetq/core/cluster/DiscoveryListener.java:10706-10717
+ /trunk/hornetq-core/src/main/java/org/hornetq/core/cluster/DiscoveryListener.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/hornetq-core/src/main/java/org/hornetq/core/cluster/impl/DiscoveryGroupImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/hornetq-core/src/main/java/org/hornetq/core/cluster/impl/DiscoveryGroupImpl.java:10706-10717
+ /trunk/hornetq-core/src/main/java/org/hornetq/core/cluster/impl/DiscoveryGroupImpl.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/journal/LargeServerMessageImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/journal/LargeServerMessageImpl.java:10706-10717
+ /trunk/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/journal/LargeServerMessageImpl.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java:10706-10717
+ /trunk/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionContinuationMessage.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionContinuationMessage.java:10706-10717
+ /trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionContinuationMessage.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/hornetq-core/src/main/java/org/hornetq/core/server/management/ManagementService.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/hornetq-core/src/main/java/org/hornetq/core/server/management/ManagementService.java:10706-10717
+ /trunk/hornetq-core/src/main/java/org/hornetq/core/server/management/ManagementService.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/hornetq-core/src/main/java/org/hornetq/core/server/management/impl/ManagementServiceImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/hornetq-core/src/main/java/org/hornetq/core/server/management/impl/ManagementServiceImpl.java:10706-10717
+ /trunk/hornetq-core/src/main/java/org/hornetq/core/server/management/impl/ManagementServiceImpl.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/hornetq-jms/src/main/java/org/hornetq/api/jms/management/SubscriptionInfo.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/hornetq-jms/src/main/java/org/hornetq/api/jms/management/SubscriptionInfo.java:10706-10717
+ /trunk/hornetq-jms/src/main/java/org/hornetq/api/jms/management/SubscriptionInfo.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/hornetq-jms/src/main/java/org/hornetq/jms/server/management/JMSManagementService.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/hornetq-jms/src/main/java/org/hornetq/jms/server/management/JMSManagementService.java:10706-10717
+ /trunk/hornetq-jms/src/main/java/org/hornetq/jms/server/management/JMSManagementService.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/hornetq-jms/src/main/java/org/hornetq/jms/server/management/impl/JMSManagementServiceImpl.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/hornetq-jms/src/main/java/org/hornetq/jms/server/management/impl/JMSManagementServiceImpl.java:10706-10717
+ /trunk/hornetq-jms/src/main/java/org/hornetq/jms/server/management/impl/JMSManagementServiceImpl.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/hornetq-journal/src/main/java/org/hornetq/core/journal/LoaderCallback.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/hornetq-journal/src/main/java/org/hornetq/core/journal/LoaderCallback.java:10706-10717
+ /trunk/hornetq-journal/src/main/java/org/hornetq/core/journal/LoaderCallback.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalReaderCallback.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalReaderCallback.java:10706-10717
+ /trunk/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalReaderCallback.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/hornetq-journal/src/main/java/org/hornetq/utils/UTF8Util.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/hornetq-journal/src/main/java/org/hornetq/utils/UTF8Util.java:10706-10717
+ /trunk/hornetq-journal/src/main/java/org/hornetq/utils/UTF8Util.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/AckBatchSizeTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/AckBatchSizeTest.java:10706-10717
+ /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/AckBatchSizeTest.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/AcknowledgeTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/AcknowledgeTest.java:10706-10717
+ /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/AcknowledgeTest.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/AutogroupIdTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/AutogroupIdTest.java:10706-10717
+ /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/AutogroupIdTest.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/CommitRollbackTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/CommitRollbackTest.java:10706-10717
+ /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/CommitRollbackTest.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerCloseTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerCloseTest.java:10706-10717
+ /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerCloseTest.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerRoundRobinTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerRoundRobinTest.java:10706-10717
+ /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerRoundRobinTest.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerTest.java:10706-10717
+ /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerTest.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java:10706-10717
+ /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/DeliveryOrderTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/DeliveryOrderTest.java:10706-10717
+ /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/DeliveryOrderTest.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageTest.java:10706-10717
+ /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageTest.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageCounterTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageCounterTest.java:10706-10717
+ /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageCounterTest.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageHandlerTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageHandlerTest.java:10706-10717
+ /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageHandlerTest.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageRateTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageRateTest.java:10706-10717
+ /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageRateTest.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingTest.java:10706-10717
+ /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingTest.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ProducerCloseTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ProducerCloseTest.java:10706-10717
+ /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ProducerCloseTest.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/QueueBrowserTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/QueueBrowserTest.java:10706-10717
+ /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/QueueBrowserTest.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ReceiveTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ReceiveTest.java:10706-10717
+ /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ReceiveTest.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/RequestorTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/RequestorTest.java:10706-10717
+ /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/RequestorTest.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/RoutingTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/RoutingTest.java:10706-10717
+ /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/RoutingTest.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCloseTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCloseTest.java:10706-10717
+ /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCloseTest.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCreateAndDeleteQueueTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCreateAndDeleteQueueTest.java:10706-10717
+ /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCreateAndDeleteQueueTest.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCreateConsumerTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCreateConsumerTest.java:10706-10717
+ /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCreateConsumerTest.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCreateProducerTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCreateProducerTest.java:10706-10717
+ /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCreateProducerTest.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionFactoryTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionFactoryTest.java:10706-10717
+ /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionFactoryTest.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionSendAcknowledgementHandlerTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionSendAcknowledgementHandlerTest.java:10706-10717
+ /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionSendAcknowledgementHandlerTest.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionStopStartTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionStopStartTest.java:10706-10717
+ /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionStopStartTest.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionTest.java:10706-10717
+ /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionTest.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/TransactionalSendTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/TransactionalSendTest.java:10706-10717
+ /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/TransactionalSendTest.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/NIOJournalCompactTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/NIOJournalCompactTest.java:10706-10717
+ /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/NIOJournalCompactTest.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/SecurityManagementTestBase.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/SecurityManagementTestBase.java:10706-10717
+ /trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/SecurityManagementTestBase.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/jms-tests/src/test/resources/hornetq-beans.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/jms-tests/src/test/resources/hornetq-beans.xml:10706-10717
+ /trunk/tests/jms-tests/src/test/resources/hornetq-beans.xml:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/jms-tests/src/test/resources/hornetq-configuration.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/jms-tests/src/test/resources/hornetq-configuration.xml:10706-10717
+ /trunk/tests/jms-tests/src/test/resources/hornetq-configuration.xml:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/jms-tests/src/test/resources/hornetq-jms.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/jms-tests/src/test/resources/hornetq-jms.xml:10706-10717
+ /trunk/tests/jms-tests/src/test/resources/hornetq-jms.xml:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/jms-tests/src/test/resources/hornetq-queues.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/jms-tests/src/test/resources/hornetq-queues.xml:10706-10717
+ /trunk/tests/jms-tests/src/test/resources/hornetq-queues.xml:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/jms-tests/src/test/resources/hornetq-users.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/jms-tests/src/test/resources/hornetq-users.xml:10706-10717
+ /trunk/tests/jms-tests/src/test/resources/hornetq-users.xml:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/jms-tests/src/test/resources/jndi.properties
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/jms-tests/src/test/resources/jndi.properties:10706-10717
+ /trunk/tests/jms-tests/src/test/resources/jndi.properties:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/stress-tests/src/test/java/org/hornetq/tests/stress/paging/PageStressTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/stress-tests/src/test/java/org/hornetq/tests/stress/paging/PageStressTest.java:10706-10717
+ /trunk/tests/stress-tests/src/test/java/org/hornetq/tests/stress/paging/PageStressTest.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/asyncio/AsynchronousFileTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/asyncio/AsynchronousFileTest.java:10706-10717
+ /trunk/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/asyncio/AsynchronousFileTest.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java:10706-10717
+ /trunk/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/config/impl/DefaultsFileConfigurationTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/config/impl/DefaultsFileConfigurationTest.java:10706-10717
+ /trunk/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/config/impl/DefaultsFileConfigurationTest.java:10706-10717,10720-10721
Property changes on: branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/paging/impl/PagingManagerImplTest.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/paging/impl/PagingManagerImplTest.java:10706-10717
+ /trunk/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/paging/impl/PagingManagerImplTest.java:10706-10717,10720-10721
Copied: branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/InVMContext.java (from rev 10721, trunk/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/InVMContext.java)
===================================================================
--- branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/InVMContext.java (rev 0)
+++ branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/InVMContext.java 2011-05-24 12:02:21 UTC (rev 10722)
@@ -0,0 +1,377 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ * Red Hat licenses this file to you under the Apache License, version
+ * 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package org.hornetq.tests.unit.util;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.naming.Binding;
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.NameAlreadyBoundException;
+import javax.naming.NameNotFoundException;
+import javax.naming.NameParser;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.RefAddr;
+import javax.naming.Reference;
+
+import org.hornetq.core.logging.Logger;
+
+/**
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
+ * @version <tt>$Revision: 2868 $</tt>
+ *
+ * $Id: InVMContext.java 2868 2007-07-10 20:22:16Z timfox $
+ */
+public class InVMContext implements Context, Serializable
+{
+ // Constants -----------------------------------------------------
+
+ private static final long serialVersionUID = 385743957345L;
+
+ private static final Logger log = Logger.getLogger(InVMContext.class);
+
+ // Static --------------------------------------------------------
+
+ // Attributes ----------------------------------------------------
+
+ protected Map map;
+
+ protected NameParser parser = new InVMNameParser();
+
+ private String nameInNamespace = "";
+
+ // Constructors --------------------------------------------------
+
+ public InVMContext()
+ {
+ map = Collections.synchronizedMap(new HashMap());
+ }
+
+ public InVMContext(final String nameInNamespace)
+ {
+ this();
+ this.nameInNamespace = nameInNamespace;
+ }
+
+ // Context implementation ----------------------------------------
+
+ public Object lookup(final Name name) throws NamingException
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public Object lookup(String name) throws NamingException
+ {
+ name = trimSlashes(name);
+ int i = name.indexOf("/");
+ String tok = i == -1 ? name : name.substring(0, i);
+ Object value = map.get(tok);
+ if (value == null)
+ {
+ throw new NameNotFoundException("Name not found: " + tok);
+ }
+ if (value instanceof InVMContext && i != -1)
+ {
+ return ((InVMContext)value).lookup(name.substring(i));
+ }
+ if (value instanceof Reference)
+ {
+ Reference ref = (Reference)value;
+ RefAddr refAddr = ref.get("nns");
+
+ // we only deal with references create by NonSerializableFactory
+ String key = (String)refAddr.getContent();
+ return NonSerializableFactory.lookup(key);
+ }
+ else
+ {
+ return value;
+ }
+ }
+
+ public void bind(final Name name, final Object obj) throws NamingException
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public void bind(final String name, final Object obj) throws NamingException
+ {
+ internalBind(name, obj, false);
+ }
+
+ public void rebind(final Name name, final Object obj) throws NamingException
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public void rebind(final String name, final Object obj) throws NamingException
+ {
+ internalBind(name, obj, true);
+ }
+
+ public void unbind(final Name name) throws NamingException
+ {
+ unbind(name.toString());
+ }
+
+ public void unbind(String name) throws NamingException
+ {
+ name = trimSlashes(name);
+ int i = name.indexOf("/");
+ boolean terminal = i == -1;
+ if (terminal)
+ {
+ map.remove(name);
+ }
+ else
+ {
+ String tok = name.substring(0, i);
+ InVMContext c = (InVMContext)map.get(tok);
+ if (c == null)
+ {
+ throw new NameNotFoundException("Context not found: " + tok);
+ }
+ c.unbind(name.substring(i));
+ }
+ }
+
+ public void rename(final Name oldName, final Name newName) throws NamingException
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public void rename(final String oldName, final String newName) throws NamingException
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public NamingEnumeration list(final Name name) throws NamingException
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public NamingEnumeration list(final String name) throws NamingException
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public NamingEnumeration listBindings(final Name name) throws NamingException
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public NamingEnumeration listBindings(String contextName) throws NamingException
+ {
+ contextName = trimSlashes(contextName);
+ if (!"".equals(contextName) && !".".equals(contextName))
+ {
+ try
+ {
+ return ((InVMContext)lookup(contextName)).listBindings("");
+ }
+ catch (Throwable t)
+ {
+ throw new NamingException(t.getMessage());
+ }
+ }
+
+ List l = new ArrayList();
+ for (Iterator i = map.keySet().iterator(); i.hasNext();)
+ {
+ String name = (String)i.next();
+ Object object = map.get(name);
+ l.add(new Binding(name, object));
+ }
+ return new NamingEnumerationImpl(l.iterator());
+ }
+
+ public void destroySubcontext(final Name name) throws NamingException
+ {
+ destroySubcontext(name.toString());
+ }
+
+ public void destroySubcontext(final String name) throws NamingException
+ {
+ map.remove(trimSlashes(name));
+ }
+
+ public Context createSubcontext(final Name name) throws NamingException
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public Context createSubcontext(String name) throws NamingException
+ {
+ name = trimSlashes(name);
+ if (map.get(name) != null)
+ {
+ throw new NameAlreadyBoundException(name);
+ }
+ InVMContext c = new InVMContext(getNameInNamespace());
+ map.put(name, c);
+ return c;
+ }
+
+ public Object lookupLink(final Name name) throws NamingException
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public Object lookupLink(final String name) throws NamingException
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public NameParser getNameParser(final Name name) throws NamingException
+ {
+ return getNameParser(name.toString());
+ }
+
+ public NameParser getNameParser(final String name) throws NamingException
+ {
+ return parser;
+ }
+
+ public Name composeName(final Name name, final Name prefix) throws NamingException
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public String composeName(final String name, final String prefix) throws NamingException
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public Object addToEnvironment(final String propName, final Object propVal) throws NamingException
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public Object removeFromEnvironment(final String propName) throws NamingException
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public Hashtable getEnvironment() throws NamingException
+ {
+ Hashtable env = new Hashtable();
+ env.put("java.naming.factory.initial", "org.hornetq.jms.tests.tools.container.InVMInitialContextFactory");
+ env.put("java.naming.provider.url", "org.jboss.naming:org.jnp.interface");
+ return env;
+ }
+
+ public void close() throws NamingException
+ {
+ }
+
+ public String getNameInNamespace() throws NamingException
+ {
+ return nameInNamespace;
+ }
+
+ // Public --------------------------------------------------------
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ // Private -------------------------------------------------------
+
+ private String trimSlashes(String s)
+ {
+ int i = 0;
+ while (true)
+ {
+ if (i == s.length() || s.charAt(i) != '/')
+ {
+ break;
+ }
+ i++;
+ }
+ s = s.substring(i);
+ i = s.length() - 1;
+ while (true)
+ {
+ if (i == -1 || s.charAt(i) != '/')
+ {
+ break;
+ }
+ i--;
+ }
+ return s.substring(0, i + 1);
+ }
+
+ private void internalBind(String name, final Object obj, final boolean rebind) throws NamingException
+ {
+ InVMContext.log.debug("Binding " + name + " obj " + obj + " rebind " + rebind);
+ name = trimSlashes(name);
+ int i = name.lastIndexOf("/");
+ InVMContext c = this;
+ if (i != -1)
+ {
+ String path = name.substring(0, i);
+ c = (InVMContext)lookup(path);
+ }
+ name = name.substring(i + 1);
+ if (!rebind && c.map.get(name) != null)
+ {
+ throw new NameAlreadyBoundException(name);
+ }
+ c.map.put(name, obj);
+ }
+
+ // Inner classes -------------------------------------------------
+
+ private class NamingEnumerationImpl implements NamingEnumeration
+ {
+ private final Iterator iterator;
+
+ NamingEnumerationImpl(final Iterator bindingIterator)
+ {
+ iterator = bindingIterator;
+ }
+
+ public void close() throws NamingException
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public boolean hasMore() throws NamingException
+ {
+ return iterator.hasNext();
+ }
+
+ public Object next() throws NamingException
+ {
+ return iterator.next();
+ }
+
+ public boolean hasMoreElements()
+ {
+ return iterator.hasNext();
+ }
+
+ public Object nextElement()
+ {
+ return iterator.next();
+ }
+ }
+}
Copied: branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/InVMNameParser.java (from rev 10721, trunk/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/InVMNameParser.java)
===================================================================
--- branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/InVMNameParser.java (rev 0)
+++ branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/InVMNameParser.java 2011-05-24 12:02:21 UTC (rev 10722)
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ * Red Hat licenses this file to you under the Apache License, version
+ * 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package org.hornetq.tests.unit.util;
+
+import java.io.Serializable;
+import java.util.Properties;
+
+import javax.naming.CompoundName;
+import javax.naming.Name;
+import javax.naming.NameParser;
+import javax.naming.NamingException;
+
+/**
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
+ * @version <tt>$Revision: 2868 $</tt>
+ *
+ * $Id: InVMNameParser.java 2868 2007-07-10 20:22:16Z timfox $
+ */
+public class InVMNameParser implements NameParser, Serializable
+{
+ // Constants -----------------------------------------------------
+
+ private static final long serialVersionUID = 2925203703371001031L;
+
+ // Static --------------------------------------------------------
+
+ static Properties syntax;
+
+ static
+ {
+ InVMNameParser.syntax = new Properties();
+ InVMNameParser.syntax.put("jndi.syntax.direction", "left_to_right");
+ InVMNameParser.syntax.put("jndi.syntax.ignorecase", "false");
+ InVMNameParser.syntax.put("jndi.syntax.separator", "/");
+ }
+
+ // Attributes ----------------------------------------------------
+
+ // Constructors --------------------------------------------------
+
+ // Public --------------------------------------------------------
+
+ public static Properties getSyntax()
+ {
+ return InVMNameParser.syntax;
+ }
+
+ public Name parse(final String name) throws NamingException
+ {
+ return new CompoundName(name, InVMNameParser.syntax);
+ }
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ // Private -------------------------------------------------------
+
+ // Inner classes -------------------------------------------------
+
+}
Copied: branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/NonSerializableFactory.java (from rev 10721, trunk/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/NonSerializableFactory.java)
===================================================================
--- branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/NonSerializableFactory.java (rev 0)
+++ branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/NonSerializableFactory.java 2011-05-24 12:02:21 UTC (rev 10722)
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ * Red Hat licenses this file to you under the Apache License, version
+ * 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package org.hornetq.tests.unit.util;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Map;
+
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.NamingException;
+import javax.naming.RefAddr;
+import javax.naming.Reference;
+import javax.naming.StringRefAddr;
+import javax.naming.spi.ObjectFactory;
+
+import org.jboss.util.naming.Util;
+
+/**
+ * used by the default context when running in embedded local configuration
+ * @author <a href="ataylor at redhat.com">Andy Taylor</a>
+ */
+public class NonSerializableFactory implements ObjectFactory
+{
+
+ public NonSerializableFactory()
+ {
+ }
+
+ public static void unbind(final Context ctx, final String strName) throws NamingException
+ {
+ Name name = ctx.getNameParser("").parse(strName);
+ int size = name.size();
+ String atom = name.get(size - 1);
+ Context parentCtx = Util.createSubcontext(ctx, name.getPrefix(size - 1));
+ String key = new StringBuilder().append(parentCtx.getNameInNamespace()).append("/").append(atom).toString();
+ NonSerializableFactory.getWrapperMap().remove(key);
+ Util.unbind(ctx, strName);
+ }
+
+ public static void rebind(final Context ctx, final String strName, final Object value) throws NamingException
+ {
+ Name name = ctx.getNameParser("").parse(strName);
+ int size = name.size();
+ String atom = name.get(size - 1);
+ Context parentCtx = Util.createSubcontext(ctx, name.getPrefix(size - 1));
+ String key = new StringBuilder().append(parentCtx.getNameInNamespace()).append("/").append(atom).toString();
+ NonSerializableFactory.getWrapperMap().put(key, value);
+ String className = value.getClass().getName();
+ String factory = NonSerializableFactory.class.getName();
+ StringRefAddr addr = new StringRefAddr("nns", key);
+ Reference memoryRef = new Reference(className, addr, factory, null);
+ parentCtx.rebind(atom, memoryRef);
+ }
+
+ public static void bind(final Context ctx, final String strName, final Object value) throws NamingException
+ {
+ Name name = ctx.getNameParser("").parse(strName);
+ int size = name.size();
+ String atom = name.get(size - 1);
+ Context parentCtx = Util.createSubcontext(ctx, name.getPrefix(size - 1));
+ String key = new StringBuilder().append(parentCtx.getNameInNamespace()).append("/").append(atom).toString();
+ NonSerializableFactory.getWrapperMap().put(key, value);
+ String className = value.getClass().getName();
+ String factory = NonSerializableFactory.class.getName();
+ StringRefAddr addr = new StringRefAddr("nns", key);
+ Reference memoryRef = new Reference(className, addr, factory, null);
+
+ parentCtx.bind(atom, memoryRef);
+ }
+
+ public static Object lookup(final String name) throws NamingException
+ {
+ if (NonSerializableFactory.getWrapperMap().get(name) == null)
+ {
+ throw new NamingException(name + " not found");
+ }
+ return NonSerializableFactory.getWrapperMap().get(name);
+ }
+
+ public Object getObjectInstance(final Object obj, final Name name, final Context nameCtx, final Hashtable env) throws Exception
+ {
+ Reference ref = (Reference)obj;
+ RefAddr addr = ref.get("nns");
+ String key = (String)addr.getContent();
+ return NonSerializableFactory.getWrapperMap().get(key);
+ }
+
+ public static Map getWrapperMap()
+ {
+ return NonSerializableFactory.wrapperMap;
+ }
+
+ private static Map wrapperMap = Collections.synchronizedMap(new HashMap());
+}
\ No newline at end of file
Deleted: branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/test/java/org/hornetq/tests/util/InVMContext.java
===================================================================
--- branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/test/java/org/hornetq/tests/util/InVMContext.java 2011-05-24 11:00:09 UTC (rev 10721)
+++ branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/test/java/org/hornetq/tests/util/InVMContext.java 2011-05-24 12:02:21 UTC (rev 10722)
@@ -1,377 +0,0 @@
-/*
- * Copyright 2009 Red Hat, Inc.
- * Red Hat licenses this file to you under the Apache License, version
- * 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-package org.hornetq.tests.unit.util;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.naming.Binding;
-import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.NameAlreadyBoundException;
-import javax.naming.NameNotFoundException;
-import javax.naming.NameParser;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.RefAddr;
-import javax.naming.Reference;
-
-import org.hornetq.core.logging.Logger;
-
-/**
- * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
- * @version <tt>$Revision: 2868 $</tt>
- *
- * $Id: InVMContext.java 2868 2007-07-10 20:22:16Z timfox $
- */
-public class InVMContext implements Context, Serializable
-{
- // Constants -----------------------------------------------------
-
- private static final long serialVersionUID = 385743957345L;
-
- private static final Logger log = Logger.getLogger(InVMContext.class);
-
- // Static --------------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- protected Map map;
-
- protected NameParser parser = new InVMNameParser();
-
- private String nameInNamespace = "";
-
- // Constructors --------------------------------------------------
-
- public InVMContext()
- {
- map = Collections.synchronizedMap(new HashMap());
- }
-
- public InVMContext(final String nameInNamespace)
- {
- this();
- this.nameInNamespace = nameInNamespace;
- }
-
- // Context implementation ----------------------------------------
-
- public Object lookup(final Name name) throws NamingException
- {
- throw new UnsupportedOperationException();
- }
-
- public Object lookup(String name) throws NamingException
- {
- name = trimSlashes(name);
- int i = name.indexOf("/");
- String tok = i == -1 ? name : name.substring(0, i);
- Object value = map.get(tok);
- if (value == null)
- {
- throw new NameNotFoundException("Name not found: " + tok);
- }
- if (value instanceof InVMContext && i != -1)
- {
- return ((InVMContext)value).lookup(name.substring(i));
- }
- if (value instanceof Reference)
- {
- Reference ref = (Reference)value;
- RefAddr refAddr = ref.get("nns");
-
- // we only deal with references create by NonSerializableFactory
- String key = (String)refAddr.getContent();
- return NonSerializableFactory.lookup(key);
- }
- else
- {
- return value;
- }
- }
-
- public void bind(final Name name, final Object obj) throws NamingException
- {
- throw new UnsupportedOperationException();
- }
-
- public void bind(final String name, final Object obj) throws NamingException
- {
- internalBind(name, obj, false);
- }
-
- public void rebind(final Name name, final Object obj) throws NamingException
- {
- throw new UnsupportedOperationException();
- }
-
- public void rebind(final String name, final Object obj) throws NamingException
- {
- internalBind(name, obj, true);
- }
-
- public void unbind(final Name name) throws NamingException
- {
- unbind(name.toString());
- }
-
- public void unbind(String name) throws NamingException
- {
- name = trimSlashes(name);
- int i = name.indexOf("/");
- boolean terminal = i == -1;
- if (terminal)
- {
- map.remove(name);
- }
- else
- {
- String tok = name.substring(0, i);
- InVMContext c = (InVMContext)map.get(tok);
- if (c == null)
- {
- throw new NameNotFoundException("Context not found: " + tok);
- }
- c.unbind(name.substring(i));
- }
- }
-
- public void rename(final Name oldName, final Name newName) throws NamingException
- {
- throw new UnsupportedOperationException();
- }
-
- public void rename(final String oldName, final String newName) throws NamingException
- {
- throw new UnsupportedOperationException();
- }
-
- public NamingEnumeration list(final Name name) throws NamingException
- {
- throw new UnsupportedOperationException();
- }
-
- public NamingEnumeration list(final String name) throws NamingException
- {
- throw new UnsupportedOperationException();
- }
-
- public NamingEnumeration listBindings(final Name name) throws NamingException
- {
- throw new UnsupportedOperationException();
- }
-
- public NamingEnumeration listBindings(String contextName) throws NamingException
- {
- contextName = trimSlashes(contextName);
- if (!"".equals(contextName) && !".".equals(contextName))
- {
- try
- {
- return ((InVMContext)lookup(contextName)).listBindings("");
- }
- catch (Throwable t)
- {
- throw new NamingException(t.getMessage());
- }
- }
-
- List l = new ArrayList();
- for (Iterator i = map.keySet().iterator(); i.hasNext();)
- {
- String name = (String)i.next();
- Object object = map.get(name);
- l.add(new Binding(name, object));
- }
- return new NamingEnumerationImpl(l.iterator());
- }
-
- public void destroySubcontext(final Name name) throws NamingException
- {
- destroySubcontext(name.toString());
- }
-
- public void destroySubcontext(final String name) throws NamingException
- {
- map.remove(trimSlashes(name));
- }
-
- public Context createSubcontext(final Name name) throws NamingException
- {
- throw new UnsupportedOperationException();
- }
-
- public Context createSubcontext(String name) throws NamingException
- {
- name = trimSlashes(name);
- if (map.get(name) != null)
- {
- throw new NameAlreadyBoundException(name);
- }
- InVMContext c = new InVMContext(getNameInNamespace());
- map.put(name, c);
- return c;
- }
-
- public Object lookupLink(final Name name) throws NamingException
- {
- throw new UnsupportedOperationException();
- }
-
- public Object lookupLink(final String name) throws NamingException
- {
- throw new UnsupportedOperationException();
- }
-
- public NameParser getNameParser(final Name name) throws NamingException
- {
- return getNameParser(name.toString());
- }
-
- public NameParser getNameParser(final String name) throws NamingException
- {
- return parser;
- }
-
- public Name composeName(final Name name, final Name prefix) throws NamingException
- {
- throw new UnsupportedOperationException();
- }
-
- public String composeName(final String name, final String prefix) throws NamingException
- {
- throw new UnsupportedOperationException();
- }
-
- public Object addToEnvironment(final String propName, final Object propVal) throws NamingException
- {
- throw new UnsupportedOperationException();
- }
-
- public Object removeFromEnvironment(final String propName) throws NamingException
- {
- throw new UnsupportedOperationException();
- }
-
- public Hashtable getEnvironment() throws NamingException
- {
- Hashtable env = new Hashtable();
- env.put("java.naming.factory.initial", "org.hornetq.jms.tests.tools.container.InVMInitialContextFactory");
- env.put("java.naming.provider.url", "org.jboss.naming:org.jnp.interface");
- return env;
- }
-
- public void close() throws NamingException
- {
- }
-
- public String getNameInNamespace() throws NamingException
- {
- return nameInNamespace;
- }
-
- // Public --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- private String trimSlashes(String s)
- {
- int i = 0;
- while (true)
- {
- if (i == s.length() || s.charAt(i) != '/')
- {
- break;
- }
- i++;
- }
- s = s.substring(i);
- i = s.length() - 1;
- while (true)
- {
- if (i == -1 || s.charAt(i) != '/')
- {
- break;
- }
- i--;
- }
- return s.substring(0, i + 1);
- }
-
- private void internalBind(String name, final Object obj, final boolean rebind) throws NamingException
- {
- InVMContext.log.debug("Binding " + name + " obj " + obj + " rebind " + rebind);
- name = trimSlashes(name);
- int i = name.lastIndexOf("/");
- InVMContext c = this;
- if (i != -1)
- {
- String path = name.substring(0, i);
- c = (InVMContext)lookup(path);
- }
- name = name.substring(i + 1);
- if (!rebind && c.map.get(name) != null)
- {
- throw new NameAlreadyBoundException(name);
- }
- c.map.put(name, obj);
- }
-
- // Inner classes -------------------------------------------------
-
- private class NamingEnumerationImpl implements NamingEnumeration
- {
- private final Iterator iterator;
-
- NamingEnumerationImpl(final Iterator bindingIterator)
- {
- iterator = bindingIterator;
- }
-
- public void close() throws NamingException
- {
- throw new UnsupportedOperationException();
- }
-
- public boolean hasMore() throws NamingException
- {
- return iterator.hasNext();
- }
-
- public Object next() throws NamingException
- {
- return iterator.next();
- }
-
- public boolean hasMoreElements()
- {
- return iterator.hasNext();
- }
-
- public Object nextElement()
- {
- return iterator.next();
- }
- }
-}
Deleted: branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/test/java/org/hornetq/tests/util/InVMNameParser.java
===================================================================
--- branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/test/java/org/hornetq/tests/util/InVMNameParser.java 2011-05-24 11:00:09 UTC (rev 10721)
+++ branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/test/java/org/hornetq/tests/util/InVMNameParser.java 2011-05-24 12:02:21 UTC (rev 10722)
@@ -1,71 +0,0 @@
-/*
- * Copyright 2009 Red Hat, Inc.
- * Red Hat licenses this file to you under the Apache License, version
- * 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-package org.hornetq.tests.unit.util;
-
-import java.io.Serializable;
-import java.util.Properties;
-
-import javax.naming.CompoundName;
-import javax.naming.Name;
-import javax.naming.NameParser;
-import javax.naming.NamingException;
-
-/**
- * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
- * @version <tt>$Revision: 2868 $</tt>
- *
- * $Id: InVMNameParser.java 2868 2007-07-10 20:22:16Z timfox $
- */
-public class InVMNameParser implements NameParser, Serializable
-{
- // Constants -----------------------------------------------------
-
- private static final long serialVersionUID = 2925203703371001031L;
-
- // Static --------------------------------------------------------
-
- static Properties syntax;
-
- static
- {
- InVMNameParser.syntax = new Properties();
- InVMNameParser.syntax.put("jndi.syntax.direction", "left_to_right");
- InVMNameParser.syntax.put("jndi.syntax.ignorecase", "false");
- InVMNameParser.syntax.put("jndi.syntax.separator", "/");
- }
-
- // Attributes ----------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
-
- public static Properties getSyntax()
- {
- return InVMNameParser.syntax;
- }
-
- public Name parse(final String name) throws NamingException
- {
- return new CompoundName(name, InVMNameParser.syntax);
- }
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
-}
Deleted: branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/test/java/org/hornetq/tests/util/NonSerializableFactory.java
===================================================================
--- branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/test/java/org/hornetq/tests/util/NonSerializableFactory.java 2011-05-24 11:00:09 UTC (rev 10721)
+++ branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/test/java/org/hornetq/tests/util/NonSerializableFactory.java 2011-05-24 12:02:21 UTC (rev 10722)
@@ -1,106 +0,0 @@
-/*
- * Copyright 2009 Red Hat, Inc.
- * Red Hat licenses this file to you under the Apache License, version
- * 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-package org.hornetq.tests.unit.util;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-
-import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.NamingException;
-import javax.naming.RefAddr;
-import javax.naming.Reference;
-import javax.naming.StringRefAddr;
-import javax.naming.spi.ObjectFactory;
-
-import org.jboss.util.naming.Util;
-
-/**
- * used by the default context when running in embedded local configuration
- * @author <a href="ataylor at redhat.com">Andy Taylor</a>
- */
-public class NonSerializableFactory implements ObjectFactory
-{
-
- public NonSerializableFactory()
- {
- }
-
- public static void unbind(final Context ctx, final String strName) throws NamingException
- {
- Name name = ctx.getNameParser("").parse(strName);
- int size = name.size();
- String atom = name.get(size - 1);
- Context parentCtx = Util.createSubcontext(ctx, name.getPrefix(size - 1));
- String key = new StringBuilder().append(parentCtx.getNameInNamespace()).append("/").append(atom).toString();
- NonSerializableFactory.getWrapperMap().remove(key);
- Util.unbind(ctx, strName);
- }
-
- public static void rebind(final Context ctx, final String strName, final Object value) throws NamingException
- {
- Name name = ctx.getNameParser("").parse(strName);
- int size = name.size();
- String atom = name.get(size - 1);
- Context parentCtx = Util.createSubcontext(ctx, name.getPrefix(size - 1));
- String key = new StringBuilder().append(parentCtx.getNameInNamespace()).append("/").append(atom).toString();
- NonSerializableFactory.getWrapperMap().put(key, value);
- String className = value.getClass().getName();
- String factory = NonSerializableFactory.class.getName();
- StringRefAddr addr = new StringRefAddr("nns", key);
- Reference memoryRef = new Reference(className, addr, factory, null);
- parentCtx.rebind(atom, memoryRef);
- }
-
- public static void bind(final Context ctx, final String strName, final Object value) throws NamingException
- {
- Name name = ctx.getNameParser("").parse(strName);
- int size = name.size();
- String atom = name.get(size - 1);
- Context parentCtx = Util.createSubcontext(ctx, name.getPrefix(size - 1));
- String key = new StringBuilder().append(parentCtx.getNameInNamespace()).append("/").append(atom).toString();
- NonSerializableFactory.getWrapperMap().put(key, value);
- String className = value.getClass().getName();
- String factory = NonSerializableFactory.class.getName();
- StringRefAddr addr = new StringRefAddr("nns", key);
- Reference memoryRef = new Reference(className, addr, factory, null);
-
- parentCtx.bind(atom, memoryRef);
- }
-
- public static Object lookup(final String name) throws NamingException
- {
- if (NonSerializableFactory.getWrapperMap().get(name) == null)
- {
- throw new NamingException(name + " not found");
- }
- return NonSerializableFactory.getWrapperMap().get(name);
- }
-
- public Object getObjectInstance(final Object obj, final Name name, final Context nameCtx, final Hashtable env) throws Exception
- {
- Reference ref = (Reference)obj;
- RefAddr addr = ref.get("nns");
- String key = (String)addr.getContent();
- return NonSerializableFactory.getWrapperMap().get(key);
- }
-
- public static Map getWrapperMap()
- {
- return NonSerializableFactory.wrapperMap;
- }
-
- private static Map wrapperMap = Collections.synchronizedMap(new HashMap());
-}
\ No newline at end of file
Property changes on: branches/HORNETQ-698_SplitJournal/tests/unit-tests/src/test/resources/ConfigurationTest-defaults.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/unit-tests/src/test/resources/ConfigurationTest-defaults.xml:10706-10717
+ /trunk/tests/unit-tests/src/test/resources/ConfigurationTest-defaults.xml:10706-10717,10720-10721
More information about the hornetq-commits
mailing list