Author: borges Date: 2011-06-17 08:12:03 -0400 (Fri, 17 Jun 2011) New Revision: 10840 Modified: trunk/distribution/pom.xml trunk/examples/common/config/hornetq-example-beans.xml trunk/examples/common/src/org/hornetq/common/example/SpawnedVMSupport.java trunk/examples/core/microcontainer/ trunk/examples/javaee/common/config/ant.properties trunk/examples/javaee/ejb-jms-transaction/build.xml trunk/examples/javaee/jca-remote/server0/hornetq-jms.xml trunk/examples/javaee/jca-remote/server0/hornetq-users.xml trunk/examples/javaee/mdb-cmt-setrollbackonly/readme.html trunk/examples/javaee/mdb-cmt-tx-required/readme.html trunk/examples/jms/browser/server0/hornetq-beans.xml trunk/examples/jms/browser/server0/hornetq-jms.xml trunk/examples/jms/browser/server0/hornetq-users.xml trunk/examples/jms/dead-letter/server0/hornetq-users.xml trunk/examples/jms/durable-subscription/server0/hornetq-jms.xml trunk/examples/jms/durable-subscription/server0/hornetq-users.xml trunk/examples/jms/paging/server0/hornetq-jms.xml trunk/examples/jms/paging/server0/hornetq-users.xml trunk/examples/jms/queue-requestor/server0/hornetq-jms.xml trunk/examples/jms/queue-requestor/server0/hornetq-users.xml trunk/examples/jms/queue/server0/hornetq-jms.xml trunk/examples/jms/queue/server0/hornetq-users.xml trunk/examples/jms/request-reply/server0/hornetq-jms.xml trunk/examples/jms/request-reply/server0/hornetq-users.xml trunk/examples/jms/temp-queue/server0/hornetq-jms.xml trunk/examples/jms/temp-queue/server0/hornetq-users.xml trunk/examples/jms/topic-selector-example1/ trunk/examples/jms/topic-selector-example1/src/org/hornetq/jms/example/TopicSelectorExample1.java trunk/examples/jms/topic-selector-example2/ trunk/examples/jms/topic-selector-example2/src/org/hornetq/jms/example/TopicSelectorExample2.java trunk/examples/jms/topic/server0/hornetq-jms.xml trunk/examples/jms/topic/server0/hornetq-users.xml trunk/examples/jms/transactional/server0/hornetq-jms.xml trunk/examples/jms/xa-send/ trunk/hornetq-commons/src/main/java/org/hornetq/utils/UTF8Util.java trunk/hornetq-core/src/main/java/org/hornetq/core/buffers/ trunk/hornetq-core/src/main/java/org/hornetq/core/cluster/DiscoveryGroup.java trunk/hornetq-core/src/main/java/org/hornetq/core/cluster/DiscoveryListener.java trunk/hornetq-core/src/main/java/org/hornetq/core/cluster/impl/DiscoveryGroupImpl.java trunk/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/journal/LargeServerMessageImpl.java trunk/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionContinuationMessage.java trunk/hornetq-core/src/main/java/org/hornetq/core/server/management/ManagementService.java trunk/hornetq-core/src/main/java/org/hornetq/core/server/management/impl/ManagementServiceImpl.java trunk/hornetq-jms/src/main/java/org/hornetq/api/jms/management/SubscriptionInfo.java trunk/hornetq-jms/src/main/java/org/hornetq/jms/server/management/JMSManagementService.java trunk/hornetq-jms/src/main/java/org/hornetq/jms/server/management/impl/JMSManagementServiceImpl.java trunk/hornetq-journal/src/main/java/org/hornetq/core/journal/LoaderCallback.java trunk/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalReaderCallback.java trunk/hornetq-ra/hornetq-ra-rar/pom.xml trunk/pom.xml trunk/tests/concurrent-tests/pom.xml trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/AckBatchSizeTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/AcknowledgeTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/AutogroupIdTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/CommitRollbackTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerCloseTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerRoundRobinTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/DeliveryOrderTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageCounterTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageHandlerTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageRateTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ProducerCloseTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/QueueBrowserTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ReceiveTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/RequestorTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/RoutingTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCloseTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCreateAndDeleteQueueTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCreateConsumerTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCreateProducerTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionFactoryTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionSendAcknowledgementHandlerTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionStopStartTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/TransactionalSendTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/NIOJournalCompactTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/SecurityManagementTestBase.java trunk/tests/jms-tests/pom.xml trunk/tests/jms-tests/src/test/resources/hornetq-beans.xml trunk/tests/jms-tests/src/test/resources/hornetq-configuration.xml trunk/tests/jms-tests/src/test/resources/hornetq-jms.xml trunk/tests/jms-tests/src/test/resources/hornetq-queues.xml trunk/tests/jms-tests/src/test/resources/hornetq-users.xml trunk/tests/jms-tests/src/test/resources/jndi.properties trunk/tests/joram-tests/pom.xml trunk/tests/performance-tests/pom.xml trunk/tests/soak-tests/pom.xml trunk/tests/stress-tests/pom.xml trunk/tests/stress-tests/src/test/java/org/hornetq/tests/stress/paging/PageStressTest.java trunk/tests/timing-tests/pom.xml trunk/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/asyncio/AsynchronousFileTest.java trunk/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java trunk/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/config/impl/DefaultsFileConfigurationTest.java trunk/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/paging/impl/PagingManagerImplTest.java trunk/tests/unit-tests/src/test/resources/ConfigurationTest-defaults.xml Log: HORNETQ-712 Adjust dependencies to stop using deprecated JBoss jars. SVN has automatically deleted a bunch of properties tracking merge status, I _guess_ this is a consequence of our new repository format which is now has built-in support for merge tracking. Modified: trunk/distribution/pom.xml =================================================================== --- trunk/distribution/pom.xml 2011-06-17 09:10:43 UTC (rev 10839) +++ trunk/distribution/pom.xml 2011-06-17 12:12:03 UTC (rev 10840) @@ -15,8 +15,8 @@ <dependencies> <dependency> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-jms-api</artifactId> + <groupId>org.jboss.spec.javax.jms</groupId> + <artifactId>jboss-jms-api_1.1_spec</artifactId> </dependency> <dependency> <groupId>org.jboss.naming</groupId> Property changes on: trunk/examples/common/config/hornetq-example-beans.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/examples/common/src/org/hornetq/common/example/SpawnedVMSupport.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/examples/core/microcontainer ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/examples/javaee/common/config/ant.properties ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/examples/javaee/ejb-jms-transaction/build.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/examples/javaee/jca-remote/server0/hornetq-jms.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/examples/javaee/jca-remote/server0/hornetq-users.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/examples/javaee/mdb-cmt-setrollbackonly/readme.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/examples/javaee/mdb-cmt-tx-required/readme.html ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/examples/jms/browser/server0/hornetq-beans.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/examples/jms/browser/server0/hornetq-jms.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/examples/jms/browser/server0/hornetq-users.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/examples/jms/dead-letter/server0/hornetq-users.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/examples/jms/durable-subscription/server0/hornetq-jms.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/examples/jms/durable-subscription/server0/hornetq-users.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/examples/jms/paging/server0/hornetq-jms.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/examples/jms/paging/server0/hornetq-users.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/examples/jms/queue/server0/hornetq-jms.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/examples/jms/queue/server0/hornetq-users.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/examples/jms/queue-requestor/server0/hornetq-jms.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/examples/jms/queue-requestor/server0/hornetq-users.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/examples/jms/request-reply/server0/hornetq-jms.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/examples/jms/request-reply/server0/hornetq-users.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/examples/jms/temp-queue/server0/hornetq-jms.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/examples/jms/temp-queue/server0/hornetq-users.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/examples/jms/topic/server0/hornetq-jms.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/examples/jms/topic/server0/hornetq-users.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/examples/jms/topic-selector-example1 ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/examples/jms/topic-selector-example1/src/org/hornetq/jms/example/TopicSelectorExample1.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/examples/jms/topic-selector-example2 ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/examples/jms/topic-selector-example2/src/org/hornetq/jms/example/TopicSelectorExample2.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/examples/jms/transactional/server0/hornetq-jms.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/examples/jms/xa-send ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/hornetq-commons/src/main/java/org/hornetq/utils/UTF8Util.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/hornetq-core/src/main/java/org/hornetq/core/buffers ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/hornetq-core/src/main/java/org/hornetq/core/cluster/DiscoveryGroup.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/hornetq-core/src/main/java/org/hornetq/core/cluster/DiscoveryListener.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/hornetq-core/src/main/java/org/hornetq/core/cluster/impl/DiscoveryGroupImpl.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/journal/LargeServerMessageImpl.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/SessionContinuationMessage.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/hornetq-core/src/main/java/org/hornetq/core/server/management/ManagementService.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/hornetq-core/src/main/java/org/hornetq/core/server/management/impl/ManagementServiceImpl.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/hornetq-jms/src/main/java/org/hornetq/api/jms/management/SubscriptionInfo.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/hornetq-jms/src/main/java/org/hornetq/jms/server/management/JMSManagementService.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/hornetq-jms/src/main/java/org/hornetq/jms/server/management/impl/JMSManagementServiceImpl.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/hornetq-journal/src/main/java/org/hornetq/core/journal/LoaderCallback.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalReaderCallback.java ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: trunk/hornetq-ra/hornetq-ra-rar/pom.xml =================================================================== --- trunk/hornetq-ra/hornetq-ra-rar/pom.xml 2011-06-17 09:10:43 UTC (rev 10839) +++ trunk/hornetq-ra/hornetq-ra-rar/pom.xml 2011-06-17 12:12:03 UTC (rev 10840) @@ -27,12 +27,12 @@ <artifactId>hornetq-jms</artifactId> </exclusion> <exclusion> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-jms-api</artifactId> + <groupId>org.jboss.spec.javax.jms</groupId> + <artifactId>jboss-jms-api_1.1_spec</artifactId> </exclusion> <exclusion> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-transaction-api</artifactId> + <groupId>org.jboss.spec.javax.transaction</groupId> + <artifactId>jboss-transaction-api_1.1_spec</artifactId> </exclusion> <exclusion> <groupId>jboss.jbossts</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-17 09:10:43 UTC (rev 10839) +++ trunk/pom.xml 2011-06-17 12:12:03 UTC (rev 10840) @@ -148,11 +148,6 @@ <artifactId>jboss-jms-api_1.1_spec</artifactId> <version>1.0.0.Final</version> </dependency> - <dependency> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-transaction-api</artifactId> - <version>1.0.1.20070913080910</version> - </dependency> <!-- needed to compile JavaEE examples--> <dependency> @@ -165,11 +160,6 @@ <artifactId>jboss-transaction-api_1.1_spec</artifactId> <version>1.0.0.Final</version> </dependency> - <dependency> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-jms-api</artifactId> - <version>1.1.0.20070913080910</version> - </dependency> <!--this specifically for the JMS Bridge--> <dependency> Modified: trunk/tests/concurrent-tests/pom.xml =================================================================== --- trunk/tests/concurrent-tests/pom.xml 2011-06-17 09:10:43 UTC (rev 10839) +++ trunk/tests/concurrent-tests/pom.xml 2011-06-17 12:12:03 UTC (rev 10840) @@ -88,8 +88,8 @@ <artifactId>log4j</artifactId> </dependency> <dependency> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-transaction-api</artifactId> + <groupId>org.jboss.spec.javax.transaction</groupId> + <artifactId>jboss-transaction-api_1.1_spec</artifactId> </dependency> <!--this specifically for the JMS Bridge--> <dependency> @@ -101,8 +101,8 @@ <artifactId>jboss-jaspi-api</artifactId> </dependency> <dependency> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-jms-api</artifactId> + <groupId>org.jboss.spec.javax.jms</groupId> + <artifactId>jboss-jms-api_1.1_spec</artifactId> </dependency> </dependencies> Property changes on: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/AckBatchSizeTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/AcknowledgeTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/AutogroupIdTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/CommitRollbackTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerCloseTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerRoundRobinTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/DeliveryOrderTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageCounterTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageHandlerTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/MessageRateTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ProducerCloseTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/QueueBrowserTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ReceiveTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/RequestorTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/RoutingTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCloseTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCreateAndDeleteQueueTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCreateConsumerTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionCreateProducerTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionFactoryTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionSendAcknowledgementHandlerTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionStopStartTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/TransactionalSendTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/NIOJournalCompactTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/management/SecurityManagementTestBase.java ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: trunk/tests/jms-tests/pom.xml =================================================================== --- trunk/tests/jms-tests/pom.xml 2011-06-17 09:10:43 UTC (rev 10839) +++ trunk/tests/jms-tests/pom.xml 2011-06-17 12:12:03 UTC (rev 10840) @@ -67,8 +67,8 @@ <artifactId>log4j</artifactId> </dependency> <dependency> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-transaction-api</artifactId> + <groupId>org.jboss.spec.javax.transaction</groupId> + <artifactId>jboss-transaction-api_1.1_spec</artifactId> </dependency> <!--this specifically for the JMS Bridge --> <dependency> @@ -80,8 +80,8 @@ <artifactId>jboss-jaspi-api</artifactId> </dependency> <dependency> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-jms-api</artifactId> + <groupId>org.jboss.spec.javax.jms</groupId> + <artifactId>jboss-jms-api_1.1_spec</artifactId> </dependency> </dependencies> Property changes on: trunk/tests/jms-tests/src/test/resources/hornetq-beans.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/jms-tests/src/test/resources/hornetq-configuration.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/jms-tests/src/test/resources/hornetq-jms.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/jms-tests/src/test/resources/hornetq-queues.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/jms-tests/src/test/resources/hornetq-users.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/jms-tests/src/test/resources/jndi.properties ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: trunk/tests/joram-tests/pom.xml =================================================================== --- trunk/tests/joram-tests/pom.xml 2011-06-17 09:10:43 UTC (rev 10839) +++ trunk/tests/joram-tests/pom.xml 2011-06-17 12:12:03 UTC (rev 10840) @@ -88,8 +88,8 @@ <artifactId>log4j</artifactId> </dependency> <dependency> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-transaction-api</artifactId> + <groupId>org.jboss.spec.javax.transaction</groupId> + <artifactId>jboss-transaction-api_1.1_spec</artifactId> </dependency> <!--this specifically for the JMS Bridge--> <dependency> @@ -101,8 +101,8 @@ <artifactId>jboss-jaspi-api</artifactId> </dependency> <dependency> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-jms-api</artifactId> + <groupId>org.jboss.spec.javax.jms</groupId> + <artifactId>jboss-jms-api_1.1_spec</artifactId> </dependency> </dependencies> Modified: trunk/tests/performance-tests/pom.xml =================================================================== --- trunk/tests/performance-tests/pom.xml 2011-06-17 09:10:43 UTC (rev 10839) +++ trunk/tests/performance-tests/pom.xml 2011-06-17 12:12:03 UTC (rev 10840) @@ -88,8 +88,8 @@ <artifactId>log4j</artifactId> </dependency> <dependency> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-transaction-api</artifactId> + <groupId>org.jboss.spec.javax.transaction</groupId> + <artifactId>jboss-transaction-api_1.1_spec</artifactId> </dependency> <!--this specifically for the JMS Bridge--> <dependency> @@ -101,8 +101,8 @@ <artifactId>jboss-jaspi-api</artifactId> </dependency> <dependency> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-jms-api</artifactId> + <groupId>org.jboss.spec.javax.jms</groupId> + <artifactId>jboss-jms-api_1.1_spec</artifactId> </dependency> </dependencies> Modified: trunk/tests/soak-tests/pom.xml =================================================================== --- trunk/tests/soak-tests/pom.xml 2011-06-17 09:10:43 UTC (rev 10839) +++ trunk/tests/soak-tests/pom.xml 2011-06-17 12:12:03 UTC (rev 10840) @@ -95,8 +95,8 @@ <artifactId>log4j</artifactId> </dependency> <dependency> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-transaction-api</artifactId> + <groupId>org.jboss.spec.javax.transaction</groupId> + <artifactId>jboss-transaction-api_1.1_spec</artifactId> </dependency> <!--this specifically for the JMS Bridge--> <dependency> @@ -108,8 +108,8 @@ <artifactId>jboss-jaspi-api</artifactId> </dependency> <dependency> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-jms-api</artifactId> + <groupId>org.jboss.spec.javax.jms</groupId> + <artifactId>jboss-jms-api_1.1_spec</artifactId> </dependency> </dependencies> Modified: trunk/tests/stress-tests/pom.xml =================================================================== --- trunk/tests/stress-tests/pom.xml 2011-06-17 09:10:43 UTC (rev 10839) +++ trunk/tests/stress-tests/pom.xml 2011-06-17 12:12:03 UTC (rev 10840) @@ -95,8 +95,8 @@ <artifactId>log4j</artifactId> </dependency> <dependency> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-transaction-api</artifactId> + <groupId>org.jboss.spec.javax.transaction</groupId> + <artifactId>jboss-transaction-api_1.1_spec</artifactId> </dependency> <!--this specifically for the JMS Bridge--> <dependency> @@ -108,8 +108,8 @@ <artifactId>jboss-jaspi-api</artifactId> </dependency> <dependency> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-jms-api</artifactId> + <groupId>org.jboss.spec.javax.jms</groupId> + <artifactId>jboss-jms-api_1.1_spec</artifactId> </dependency> </dependencies> Property changes on: trunk/tests/stress-tests/src/test/java/org/hornetq/tests/stress/paging/PageStressTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: trunk/tests/timing-tests/pom.xml =================================================================== --- trunk/tests/timing-tests/pom.xml 2011-06-17 09:10:43 UTC (rev 10839) +++ trunk/tests/timing-tests/pom.xml 2011-06-17 12:12:03 UTC (rev 10840) @@ -95,8 +95,8 @@ <artifactId>log4j</artifactId> </dependency> <dependency> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-transaction-api</artifactId> + <groupId>org.jboss.spec.javax.transaction</groupId> + <artifactId>jboss-transaction-api_1.1_spec</artifactId> </dependency> <!--this specifically for the JMS Bridge--> <dependency> @@ -108,8 +108,8 @@ <artifactId>jboss-jaspi-api</artifactId> </dependency> <dependency> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-jms-api</artifactId> + <groupId>org.jboss.spec.javax.jms</groupId> + <artifactId>jboss-jms-api_1.1_spec</artifactId> </dependency> </dependencies> Property changes on: trunk/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/asyncio/AsynchronousFileTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/asyncio/MultiThreadAsynchronousFileTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/config/impl/DefaultsFileConfigurationTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/paging/impl/PagingManagerImplTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/tests/unit-tests/src/test/resources/ConfigurationTest-defaults.xml ___________________________________________________________________ Deleted: svn:mergeinfo -