activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1406726 - in /activemq/trunk: ./ activemq-broker/src/test/ activemq-broker/src/test/java/ activemq-broker/src/test/java/org/ activemq-broker/src/test/java/org/apache/ activemq-broker/src/test/java/org/apache/activemq/ activemq-broker/src/t...
Date Wed, 07 Nov 2012 17:26:37 GMT
Author: chirino
Date: Wed Nov  7 17:26:31 2012
New Revision: 1406726

URL: http://svn.apache.org/viewvc?rev=1406726&view=rev
Log:
rename the activemq-leveldb module to activemq-leveldb-store to be consistent with other store modules.  Move more spring/xbean support bits into the activemq-spring module.

Added:
    activemq/trunk/activemq-broker/src/test/
    activemq/trunk/activemq-broker/src/test/java/
    activemq/trunk/activemq-broker/src/test/java/org/
    activemq/trunk/activemq-broker/src/test/java/org/apache/
    activemq/trunk/activemq-broker/src/test/java/org/apache/activemq/
    activemq/trunk/activemq-broker/src/test/java/org/apache/activemq/JmsQueueTransactionTest.java
      - copied, changed from r1406686, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsQueueTransactionTest.java
    activemq/trunk/activemq-broker/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java
      - copied, changed from r1406686, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java
    activemq/trunk/activemq-broker/src/test/java/org/apache/activemq/store/
    activemq/trunk/activemq-broker/src/test/java/org/apache/activemq/store/PersistenceAdapterTestSupport.java
      - copied, changed from r1406686, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/PersistenceAdapterTestSupport.java
    activemq/trunk/activemq-broker/src/test/java/org/apache/activemq/test/
    activemq/trunk/activemq-broker/src/test/java/org/apache/activemq/test/JmsResourceProvider.java
      - copied, changed from r1406686, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/JmsResourceProvider.java
    activemq/trunk/activemq-broker/src/test/java/org/apache/activemq/test/TestSupport.java
      - copied, changed from r1406686, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/TestSupport.java
    activemq/trunk/activemq-broker/src/test/java/org/apache/activemq/util/
    activemq/trunk/activemq-broker/src/test/java/org/apache/activemq/util/SocketProxy.java
      - copied, changed from r1406686, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/SocketProxy.java
    activemq/trunk/activemq-broker/src/test/java/org/apache/activemq/util/Wait.java
      - copied, changed from r1406686, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/Wait.java
    activemq/trunk/activemq-console/src/test/java/org/apache/activemq/leveldb/
    activemq/trunk/activemq-console/src/test/java/org/apache/activemq/leveldb/IDERunner.scala
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/IDERunner.scala
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/leveldb/
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/leveldb/LevelDBStoreBrokerTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/leveldb/LevelDBXARecoveryBrokerTest.java
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/LevelDBXARecoveryBrokerTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/pool/
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/pool/JmsSendReceiveTwoConnectionsWithSenderUsingPoolTest.java
      - copied, changed from r1406686, activemq/trunk/activemq-pool/src/test/java/org/apache/activemq/pool/JmsSendReceiveTwoConnectionsWithSenderUsingPoolTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/leveldb/LevelDBStoreBrokerTest.java
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/src/test/java/org/apache/activemq/store/leveldb/LevelDBStoreBrokerTest.java
    activemq/trunk/activemq-leveldb-store/
    activemq/trunk/activemq-leveldb-store/kahadb-vs-leveldb.png
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/kahadb-vs-leveldb.png
    activemq/trunk/activemq-leveldb-store/pom.xml
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/pom.xml
    activemq/trunk/activemq-leveldb-store/readme.md
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/readme.md
    activemq/trunk/activemq-leveldb-store/src/
    activemq/trunk/activemq-leveldb-store/src/main/
    activemq/trunk/activemq-leveldb-store/src/main/java/
    activemq/trunk/activemq-leveldb-store/src/main/java/org/
    activemq/trunk/activemq-leveldb-store/src/main/java/org/apache/
    activemq/trunk/activemq-leveldb-store/src/main/java/org/apache/activemq/
    activemq/trunk/activemq-leveldb-store/src/main/java/org/apache/activemq/store/
    activemq/trunk/activemq-leveldb-store/src/main/java/org/apache/activemq/store/leveldb/
    activemq/trunk/activemq-leveldb-store/src/main/java/org/apache/activemq/store/leveldb/LevelDBPersistenceAdapter.java
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/src/main/java/org/apache/activemq/store/leveldb/LevelDBPersistenceAdapter.java
    activemq/trunk/activemq-leveldb-store/src/main/proto/
    activemq/trunk/activemq-leveldb-store/src/main/proto/records.proto
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/src/main/proto/records.proto
    activemq/trunk/activemq-leveldb-store/src/main/scala/
    activemq/trunk/activemq-leveldb-store/src/main/scala/org/
    activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/
    activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/
    activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/
    activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb.scala
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb.scala
    activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/DBManager.scala
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/DBManager.scala
    activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/HALevelDBClient.scala
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/HALevelDBClient.scala
    activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/HALevelDBStore.scala
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/HALevelDBStore.scala
    activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/IndexManifestDTO.java
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/IndexManifestDTO.java
    activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala
    activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
    activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStoreViewMBean.java
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/LevelDBStoreViewMBean.java
    activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/RecordLog.scala
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/RecordLog.scala
    activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/
    activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/FileSupport.scala
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/util/FileSupport.scala
    activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/Log.scala
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/util/Log.scala
    activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/LongCounter.scala
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/util/LongCounter.scala
    activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/RetrySupport.scala
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/util/RetrySupport.scala
    activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/TimeMetric.scala
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/util/TimeMetric.scala
    activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/store/
    activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/store/leveldb/
    activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/store/leveldb/package.html
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/store/leveldb/package.html
    activemq/trunk/activemq-leveldb-store/src/test/
    activemq/trunk/activemq-leveldb-store/src/test/resources/
    activemq/trunk/activemq-leveldb-store/src/test/resources/log4j.properties
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/src/test/resources/log4j.properties
    activemq/trunk/activemq-leveldb-store/src/test/scala/
    activemq/trunk/activemq-leveldb-store/src/test/scala/org/
    activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/
    activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/
    activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/
    activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/ActiveMQScenario.scala
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/ActiveMQScenario.scala
    activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/EnqueueRateScenariosTest.scala
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/EnqueueRateScenariosTest.scala
    activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/HALevelDBFastEnqueueTest.scala
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/HALevelDBFastEnqueueTest.scala
    activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/HALevelDBStoreTest.scala
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/HALevelDBStoreTest.scala
    activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/JMSClientScenario.scala
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/JMSClientScenario.scala
    activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/LevelDBFastEnqueueTest.scala
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/LevelDBFastEnqueueTest.scala
    activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/LevelDBStoreTest.scala
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/LevelDBStoreTest.scala
    activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/Scenario.scala
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/Scenario.scala
    activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/TestingHDFSServer.scala
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/TestingHDFSServer.scala
    activemq/trunk/activemq-spring/src/main/resources/META-INF/
    activemq/trunk/activemq-spring/src/main/resources/META-INF/services/
    activemq/trunk/activemq-spring/src/main/resources/META-INF/services/org/
    activemq/trunk/activemq-spring/src/main/resources/META-INF/services/org/apache/
    activemq/trunk/activemq-spring/src/main/resources/META-INF/services/org/apache/xbean/
    activemq/trunk/activemq-spring/src/main/resources/META-INF/services/org/apache/xbean/spring/
    activemq/trunk/activemq-spring/src/main/resources/META-INF/services/org/apache/xbean/spring/http/
    activemq/trunk/activemq-spring/src/main/resources/META-INF/services/org/apache/xbean/spring/http/activemq.apache.org/
    activemq/trunk/activemq-spring/src/main/resources/META-INF/services/org/apache/xbean/spring/http/activemq.apache.org/schema/
    activemq/trunk/activemq-spring/src/main/resources/META-INF/services/org/apache/xbean/spring/http/activemq.apache.org/schema/core
      - copied, changed from r1406686, activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/xbean/spring/http/activemq.apache.org/schema/core
    activemq/trunk/activemq-spring/src/main/resources/META-INF/spring.handlers
      - copied, changed from r1406686, activemq/trunk/activemq-core/src/main/resources/META-INF/spring.handlers
    activemq/trunk/activemq-spring/src/main/resources/META-INF/spring.schemas
      - copied, changed from r1406686, activemq/trunk/activemq-core/src/main/resources/META-INF/spring.schemas
    activemq/trunk/activemq-spring/src/main/resources/activemq.xsd
      - copied, changed from r1406686, activemq/trunk/activemq-core/src/main/resources/activemq.xsd
    activemq/trunk/activemq-spring/src/main/resources/activemq.xsd.html
      - copied, changed from r1406686, activemq/trunk/activemq-core/src/main/resources/activemq.xsd.html
    activemq/trunk/activemq-spring/src/main/resources/activemq.xsd.wiki
      - copied, changed from r1406686, activemq/trunk/activemq-core/src/main/resources/activemq.xsd.wiki
    activemq/trunk/activemq-spring/src/test/java/org/apache/activemq/store/
    activemq/trunk/activemq-spring/src/test/java/org/apache/activemq/store/leveldb/
    activemq/trunk/activemq-spring/src/test/java/org/apache/activemq/store/leveldb/LevelDBConfigTest.java
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/src/test/java/org/apache/activemq/store/leveldb/LevelDBConfigTest.java
    activemq/trunk/activemq-spring/src/test/resources/org/apache/activemq/
    activemq/trunk/activemq-spring/src/test/resources/org/apache/activemq/store/
    activemq/trunk/activemq-spring/src/test/resources/org/apache/activemq/store/leveldb/
    activemq/trunk/activemq-spring/src/test/resources/org/apache/activemq/store/leveldb/leveldb.xml
      - copied, changed from r1406686, activemq/trunk/activemq-leveldb/src/test/resources/org/apache/activemq/store/leveldb/leveldb.xml
Removed:
    activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/xbean/spring/http/activemq.apache.org/schema/core
    activemq/trunk/activemq-core/src/main/resources/META-INF/spring.handlers
    activemq/trunk/activemq-core/src/main/resources/META-INF/spring.schemas
    activemq/trunk/activemq-core/src/main/resources/activemq.xsd
    activemq/trunk/activemq-core/src/main/resources/activemq.xsd.html
    activemq/trunk/activemq-core/src/main/resources/activemq.xsd.wiki
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsQueueTransactionTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/PersistenceAdapterTestSupport.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/JmsResourceProvider.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/TestSupport.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/SocketProxy.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/Wait.java
    activemq/trunk/activemq-leveldb/kahadb-vs-leveldb.png
    activemq/trunk/activemq-leveldb/pom.xml
    activemq/trunk/activemq-leveldb/readme.md
    activemq/trunk/activemq-leveldb/src/main/java/org/apache/activemq/store/leveldb/LevelDBPersistenceAdapter.java
    activemq/trunk/activemq-leveldb/src/main/proto/records.proto
    activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb.scala
    activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/DBManager.scala
    activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/HALevelDBClient.scala
    activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/HALevelDBStore.scala
    activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/IndexManifestDTO.java
    activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala
    activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
    activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/LevelDBStoreViewMBean.java
    activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/RecordLog.scala
    activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/util/FileSupport.scala
    activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/util/Log.scala
    activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/util/LongCounter.scala
    activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/util/RetrySupport.scala
    activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/util/TimeMetric.scala
    activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/store/leveldb/package.html
    activemq/trunk/activemq-leveldb/src/test/java/org/apache/activemq/store/leveldb/LevelDBConfigTest.java
    activemq/trunk/activemq-leveldb/src/test/java/org/apache/activemq/store/leveldb/LevelDBStoreBrokerTest.java
    activemq/trunk/activemq-leveldb/src/test/resources/log4j.properties
    activemq/trunk/activemq-leveldb/src/test/resources/org/apache/activemq/store/leveldb/leveldb.xml
    activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/ActiveMQScenario.scala
    activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/EnqueueRateScenariosTest.scala
    activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/HALevelDBFastEnqueueTest.scala
    activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/HALevelDBStoreTest.scala
    activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/IDERunner.scala
    activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/JMSClientScenario.scala
    activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/LevelDBFastEnqueueTest.scala
    activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/LevelDBStoreBrokerTest.scala
    activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/LevelDBStoreTest.scala
    activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/LevelDBXARecoveryBrokerTest.java
    activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/Scenario.scala
    activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/TestingHDFSServer.scala
    activemq/trunk/activemq-pool/src/test/java/org/apache/activemq/pool/JmsSendReceiveTwoConnectionsWithSenderUsingPoolTest.java
Modified:
    activemq/trunk/activemq-camel/pom.xml
    activemq/trunk/activemq-client/pom.xml
    activemq/trunk/activemq-console/pom.xml
    activemq/trunk/activemq-core/pom.xml
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTempDestinationTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1936Test.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/CompressionOverNetworkTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/NetworkBrokerDetachTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/MessagePriorityTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/nio/NIOSSLLoadTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionSelectorTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ExpiredMessagesTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/RequestReplyNoAdvisoryNetworkTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerTempQueueAdvisoryTest.java
    activemq/trunk/activemq-fileserver/pom.xml
    activemq/trunk/activemq-itests-spring31/pom.xml
    activemq/trunk/activemq-optional/pom.xml
    activemq/trunk/activemq-pool/pom.xml
    activemq/trunk/activemq-ra/pom.xml
    activemq/trunk/activemq-spring/pom.xml
    activemq/trunk/activemq-web-demo/pom.xml
    activemq/trunk/activemq-xmpp/pom.xml
    activemq/trunk/assembly/pom.xml
    activemq/trunk/pom.xml

Copied: activemq/trunk/activemq-broker/src/test/java/org/apache/activemq/JmsQueueTransactionTest.java (from r1406686, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsQueueTransactionTest.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/test/java/org/apache/activemq/JmsQueueTransactionTest.java?p2=activemq/trunk/activemq-broker/src/test/java/org/apache/activemq/JmsQueueTransactionTest.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsQueueTransactionTest.java&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-broker/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java (from r1406686, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java?p2=activemq/trunk/activemq-broker/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-broker/src/test/java/org/apache/activemq/store/PersistenceAdapterTestSupport.java (from r1406686, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/PersistenceAdapterTestSupport.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/test/java/org/apache/activemq/store/PersistenceAdapterTestSupport.java?p2=activemq/trunk/activemq-broker/src/test/java/org/apache/activemq/store/PersistenceAdapterTestSupport.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/PersistenceAdapterTestSupport.java&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-broker/src/test/java/org/apache/activemq/test/JmsResourceProvider.java (from r1406686, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/JmsResourceProvider.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/test/java/org/apache/activemq/test/JmsResourceProvider.java?p2=activemq/trunk/activemq-broker/src/test/java/org/apache/activemq/test/JmsResourceProvider.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/JmsResourceProvider.java&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-broker/src/test/java/org/apache/activemq/test/TestSupport.java (from r1406686, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/TestSupport.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/test/java/org/apache/activemq/test/TestSupport.java?p2=activemq/trunk/activemq-broker/src/test/java/org/apache/activemq/test/TestSupport.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/TestSupport.java&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-broker/src/test/java/org/apache/activemq/util/SocketProxy.java (from r1406686, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/SocketProxy.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/test/java/org/apache/activemq/util/SocketProxy.java?p2=activemq/trunk/activemq-broker/src/test/java/org/apache/activemq/util/SocketProxy.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/SocketProxy.java&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/SocketProxy.java (original)
+++ activemq/trunk/activemq-broker/src/test/java/org/apache/activemq/util/SocketProxy.java Wed Nov  7 17:26:31 2012
@@ -33,7 +33,6 @@ import java.util.concurrent.CountDownLat
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-import javax.net.ssl.SSLServerSocket;
 import javax.net.ssl.SSLServerSocketFactory;
 import javax.net.ssl.SSLSocketFactory;
 import org.slf4j.Logger;

Copied: activemq/trunk/activemq-broker/src/test/java/org/apache/activemq/util/Wait.java (from r1406686, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/Wait.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/test/java/org/apache/activemq/util/Wait.java?p2=activemq/trunk/activemq-broker/src/test/java/org/apache/activemq/util/Wait.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/Wait.java&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Modified: activemq/trunk/activemq-camel/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-camel/pom.xml?rev=1406726&r1=1406725&r2=1406726&view=diff
==============================================================================
--- activemq/trunk/activemq-camel/pom.xml (original)
+++ activemq/trunk/activemq-camel/pom.xml Wed Nov  7 17:26:31 2012
@@ -91,6 +91,12 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>activemq-broker</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-test</artifactId>
       <scope>test</scope>

Modified: activemq/trunk/activemq-client/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/pom.xml?rev=1406726&r1=1406725&r2=1406726&view=diff
==============================================================================
--- activemq/trunk/activemq-client/pom.xml (original)
+++ activemq/trunk/activemq-client/pom.xml Wed Nov  7 17:26:31 2012
@@ -437,7 +437,7 @@
             <phase>generate-sources</phase>
             <configuration>
               <sourceDirectory>${basedir}/src/main/grammar</sourceDirectory>
-              <outputDirectory>${basedir}/target/generated-javacc</outputDirectory>
+              <outputDirectory>${basedir}/target/generated-sources/javacc</outputDirectory>
               <packageName>org.apache.activemq.selector</packageName>
             </configuration>
             <goals>

Modified: activemq/trunk/activemq-console/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-console/pom.xml?rev=1406726&r1=1406725&r2=1406726&view=diff
==============================================================================
--- activemq/trunk/activemq-console/pom.xml (original)
+++ activemq/trunk/activemq-console/pom.xml Wed Nov  7 17:26:31 2012
@@ -49,18 +49,21 @@
     <!-- activemq related dependencies -->
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>activemq-core</artifactId>
+      <artifactId>activemq-spring</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>activemq-core</artifactId>
-      <type>test-jar</type>
+      <artifactId>activemq-amq-store</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>activemq-kahadb-store</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>activeio-core</artifactId>
     </dependency>
-        
+
     <!-- geronimo -->
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
@@ -100,6 +103,13 @@
     </dependency>
 
 
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>activemq-broker</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+
     <!-- needed for TestPurgeCommand, but not for compile. -->
     <dependency>
       <groupId>org.springframework</groupId>
@@ -108,11 +118,6 @@
     </dependency>    
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>
     </dependency>

Copied: activemq/trunk/activemq-console/src/test/java/org/apache/activemq/leveldb/IDERunner.scala (from r1406686, activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/IDERunner.scala)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-console/src/test/java/org/apache/activemq/leveldb/IDERunner.scala?p2=activemq/trunk/activemq-console/src/test/java/org/apache/activemq/leveldb/IDERunner.scala&p1=activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/IDERunner.scala&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
--- activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/IDERunner.scala (original)
+++ activemq/trunk/activemq-console/src/test/java/org/apache/activemq/leveldb/IDERunner.scala Wed Nov  7 17:26:31 2012
@@ -18,6 +18,8 @@
 package org.apache.activemq.leveldb
 
 import org.apache.activemq.console.Main
+import scala.Array
+import scala.Predef._
 
 object IDERunner {
   def main(args:Array[String]) ={

Modified: activemq/trunk/activemq-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/pom.xml?rev=1406726&r1=1406725&r2=1406726&view=diff
==============================================================================
--- activemq/trunk/activemq-core/pom.xml (original)
+++ activemq/trunk/activemq-core/pom.xml Wed Nov  7 17:26:31 2012
@@ -76,7 +76,7 @@
     <!-- =============================== -->
     <dependency>
       <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-broker</artifactId>
+      <artifactId>activemq-spring</artifactId>
     </dependency>
 
     <dependency>
@@ -91,6 +91,10 @@
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-amq-store</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-leveldb-store</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.apache.activemq</groupId>
@@ -201,6 +205,13 @@
     <!-- Testing Dependencies            -->
     <!-- =============================== -->
     <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>activemq-broker</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTempDestinationTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTempDestinationTest.java?rev=1406726&r1=1406725&r2=1406726&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTempDestinationTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTempDestinationTest.java Wed Nov  7 17:26:31 2012
@@ -17,11 +17,9 @@
 package org.apache.activemq;
 
 import java.io.IOException;
-import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1936Test.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1936Test.java?rev=1406726&r1=1406725&r2=1406726&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1936Test.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1936Test.java Wed Nov  7 17:26:31 2012
@@ -22,8 +22,6 @@ import org.apache.activemq.broker.Broker
 import org.apache.activemq.util.Wait;
 import org.apache.log4j.Logger;
 
-import java.util.Map;
-import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.LinkedBlockingQueue;

Added: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/leveldb/LevelDBStoreBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/leveldb/LevelDBStoreBrokerTest.java?rev=1406726&view=auto
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/leveldb/LevelDBStoreBrokerTest.java (added)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/leveldb/LevelDBStoreBrokerTest.java Wed Nov  7 17:26:31 2012
@@ -0,0 +1,45 @@
+package org.apache.activemq.leveldb;
+
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.BrokerTest;
+import org.apache.activemq.store.PersistenceAdapter;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
+ */
+public class LevelDBStoreBrokerTest extends BrokerTest {
+
+//    def suite: Test = {
+//      return new TestSuite(classOf[LevelDBStoreBrokerTest])
+//    }
+//
+//    def main(args: Array[String]): Unit = {
+//      junit.textui.TestRunner.run(suite)
+//    }
+
+    @Override
+    protected BrokerService createBroker() throws Exception {
+        BrokerService broker = new BrokerService();
+        broker.setPersistenceAdapter(createPersistenceAdapter(true));
+        return broker;
+    }
+
+    protected PersistenceAdapter createPersistenceAdapter(boolean delete) {
+        LevelDBStore store  = new LevelDBStore();
+        store.setDirectory(new File("target/activemq-data/leveldb"));
+        if (delete) {
+          store.deleteAllMessages();
+        }
+        return store;
+      }
+
+      protected BrokerService createRestartedBroker() throws IOException {
+        BrokerService broker = new BrokerService();
+        broker.setPersistenceAdapter(createPersistenceAdapter(false));
+        return broker;
+      }
+
+}

Copied: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/leveldb/LevelDBXARecoveryBrokerTest.java (from r1406686, activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/LevelDBXARecoveryBrokerTest.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/leveldb/LevelDBXARecoveryBrokerTest.java?p2=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/leveldb/LevelDBXARecoveryBrokerTest.java&p1=activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/LevelDBXARecoveryBrokerTest.java&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/CompressionOverNetworkTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/CompressionOverNetworkTest.java?rev=1406726&r1=1406725&r2=1406726&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/CompressionOverNetworkTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/CompressionOverNetworkTest.java Wed Nov  7 17:26:31 2012
@@ -28,7 +28,6 @@ import java.util.concurrent.ConcurrentHa
 import javax.jms.BytesMessage;
 import javax.jms.Connection;
 import javax.jms.DeliveryMode;
-import javax.jms.Destination;
 import javax.jms.MapMessage;
 import javax.jms.Message;
 import javax.jms.MessageConsumer;
@@ -43,7 +42,6 @@ import org.apache.activemq.command.Activ
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQMapMessage;
 import org.apache.activemq.command.ActiveMQObjectMessage;
-import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.command.ActiveMQStreamMessage;
 import org.apache.activemq.command.ActiveMQTextMessage;
 import org.apache.activemq.command.ActiveMQTopic;

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/NetworkBrokerDetachTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/NetworkBrokerDetachTest.java?rev=1406726&r1=1406725&r2=1406726&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/NetworkBrokerDetachTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/NetworkBrokerDetachTest.java Wed Nov  7 17:26:31 2012
@@ -31,7 +31,6 @@ import javax.jms.Message;
 import javax.jms.MessageListener;
 import javax.jms.Session;
 import javax.jms.TopicSubscriber;
-import javax.management.InstanceNotFoundException;
 import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
 import javax.management.remote.JMXConnector;

Copied: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/pool/JmsSendReceiveTwoConnectionsWithSenderUsingPoolTest.java (from r1406686, activemq/trunk/activemq-pool/src/test/java/org/apache/activemq/pool/JmsSendReceiveTwoConnectionsWithSenderUsingPoolTest.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/pool/JmsSendReceiveTwoConnectionsWithSenderUsingPoolTest.java?p2=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/pool/JmsSendReceiveTwoConnectionsWithSenderUsingPoolTest.java&p1=activemq/trunk/activemq-pool/src/test/java/org/apache/activemq/pool/JmsSendReceiveTwoConnectionsWithSenderUsingPoolTest.java&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/MessagePriorityTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/MessagePriorityTest.java?rev=1406726&r1=1406725&r2=1406726&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/MessagePriorityTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/MessagePriorityTest.java Wed Nov  7 17:26:31 2012
@@ -31,7 +31,6 @@ import org.apache.activemq.ActiveMQConne
 import org.apache.activemq.ActiveMQPrefetchPolicy;
 import org.apache.activemq.CombinationTestSupport;
 import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.region.policy.PendingDurableSubscriberMessageStoragePolicy;
 import org.apache.activemq.broker.region.policy.PolicyEntry;
 import org.apache.activemq.broker.region.policy.PolicyMap;
 import org.apache.activemq.broker.region.policy.SharedDeadLetterStrategy;

Copied: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/leveldb/LevelDBStoreBrokerTest.java (from r1406686, activemq/trunk/activemq-leveldb/src/test/java/org/apache/activemq/store/leveldb/LevelDBStoreBrokerTest.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/leveldb/LevelDBStoreBrokerTest.java?p2=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/leveldb/LevelDBStoreBrokerTest.java&p1=activemq/trunk/activemq-leveldb/src/test/java/org/apache/activemq/store/leveldb/LevelDBStoreBrokerTest.java&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/nio/NIOSSLLoadTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/nio/NIOSSLLoadTest.java?rev=1406726&r1=1406725&r2=1406726&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/nio/NIOSSLLoadTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/nio/NIOSSLLoadTest.java Wed Nov  7 17:26:31 2012
@@ -20,11 +20,9 @@ import junit.framework.TestCase;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.TransportConnector;
-import org.apache.activemq.broker.region.Destination;
 import org.apache.activemq.util.ConsumerThread;
 import org.apache.activemq.util.ProducerThread;
 import org.apache.activemq.util.Wait;
-import org.omg.CORBA.PUBLIC_MEMBER;
 
 import javax.jms.Connection;
 import javax.jms.Queue;

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java?rev=1406726&r1=1406725&r2=1406726&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java Wed Nov  7 17:26:31 2012
@@ -23,7 +23,6 @@ import javax.jms.TextMessage;
 
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.broker.BrokerRegistry;
-import org.apache.activemq.broker.policy.IndividualDeadLetterViaXmlTest;
 import org.apache.activemq.broker.region.DestinationStatistics;
 import org.apache.activemq.broker.region.RegionBroker;
 import org.apache.activemq.util.Wait;

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionSelectorTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionSelectorTest.java?rev=1406726&r1=1406725&r2=1406726&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionSelectorTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionSelectorTest.java Wed Nov  7 17:26:31 2012
@@ -34,8 +34,6 @@ import org.apache.activemq.broker.Broker
 import org.apache.activemq.broker.region.policy.PolicyEntry;
 import org.apache.activemq.broker.region.policy.PolicyMap;
 import org.apache.activemq.command.ActiveMQTopic;
-import org.apache.activemq.store.PersistenceAdapter;
-import org.apache.activemq.store.jdbc.JDBCPersistenceAdapter;
 import org.apache.activemq.util.Wait;
 
 public class DurableSubscriptionSelectorTest extends org.apache.activemq.TestSupport {

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ExpiredMessagesTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ExpiredMessagesTest.java?rev=1406726&r1=1406725&r2=1406726&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ExpiredMessagesTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ExpiredMessagesTest.java Wed Nov  7 17:26:31 2012
@@ -33,7 +33,6 @@ import org.apache.activemq.ActiveMQConne
 import org.apache.activemq.CombinationTestSupport;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.region.DestinationStatistics;
-import org.apache.activemq.broker.region.RegionBroker;
 import org.apache.activemq.broker.region.policy.PolicyEntry;
 import org.apache.activemq.broker.region.policy.PolicyMap;
 import org.apache.activemq.broker.region.policy.VMPendingQueueMessageStoragePolicy;

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/RequestReplyNoAdvisoryNetworkTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/RequestReplyNoAdvisoryNetworkTest.java?rev=1406726&r1=1406725&r2=1406726&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/RequestReplyNoAdvisoryNetworkTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/RequestReplyNoAdvisoryNetworkTest.java Wed Nov  7 17:26:31 2012
@@ -34,7 +34,6 @@ import javax.jms.TextMessage;
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.ActiveMQSession;
-import org.apache.activemq.CombinationTestSupport;
 import org.apache.activemq.JmsMultipleBrokersTestSupport;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.TransportConnector;

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerTempQueueAdvisoryTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerTempQueueAdvisoryTest.java?rev=1406726&r1=1406725&r2=1406726&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerTempQueueAdvisoryTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerTempQueueAdvisoryTest.java Wed Nov  7 17:26:31 2012
@@ -45,7 +45,6 @@ import org.apache.activemq.ActiveMQConne
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.ActiveMQMessageConsumer;
 import org.apache.activemq.JmsMultipleBrokersTestSupport;
-import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.TransportConnector;
 import org.apache.activemq.broker.jmx.DestinationViewMBean;
 import org.apache.activemq.command.ActiveMQDestination;

Modified: activemq/trunk/activemq-fileserver/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-fileserver/pom.xml?rev=1406726&r1=1406725&r2=1406726&view=diff
==============================================================================
--- activemq/trunk/activemq-fileserver/pom.xml (original)
+++ activemq/trunk/activemq-fileserver/pom.xml Wed Nov  7 17:26:31 2012
@@ -92,6 +92,12 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>activemq-broker</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty.aggregate</groupId>

Modified: activemq/trunk/activemq-itests-spring31/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-itests-spring31/pom.xml?rev=1406726&r1=1406725&r2=1406726&view=diff
==============================================================================
--- activemq/trunk/activemq-itests-spring31/pom.xml (original)
+++ activemq/trunk/activemq-itests-spring31/pom.xml Wed Nov  7 17:26:31 2012
@@ -21,7 +21,7 @@
 
   <parent>
     <groupId>org.apache.activemq</groupId>
-    <artifactId>tests</artifactId>
+    <artifactId>activemq-parent</artifactId>
     <version>5.8-SNAPSHOT</version>
   </parent>
 

Copied: activemq/trunk/activemq-leveldb-store/kahadb-vs-leveldb.png (from r1406686, activemq/trunk/activemq-leveldb/kahadb-vs-leveldb.png)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/kahadb-vs-leveldb.png?p2=activemq/trunk/activemq-leveldb-store/kahadb-vs-leveldb.png&p1=activemq/trunk/activemq-leveldb/kahadb-vs-leveldb.png&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-leveldb-store/pom.xml (from r1406686, activemq/trunk/activemq-leveldb/pom.xml)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/pom.xml?p2=activemq/trunk/activemq-leveldb-store/pom.xml&p1=activemq/trunk/activemq-leveldb/pom.xml&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
--- activemq/trunk/activemq-leveldb/pom.xml (original)
+++ activemq/trunk/activemq-leveldb-store/pom.xml Wed Nov  7 17:26:31 2012
@@ -25,11 +25,11 @@
     <version>5.8-SNAPSHOT</version>
   </parent>
 
-  <artifactId>activemq-leveldb</artifactId>
+  <artifactId>activemq-leveldb-store</artifactId>
   <packaging>jar</packaging>
 
-  <name>ActiveMQ :: LevelDB</name>
-  <description>ActiveMQ LevelDB based store</description>
+  <name>ActiveMQ :: LevelDB Store</name>
+  <description>ActiveMQ LevelDB Store Implementation</description>
 
   <dependencies>
 
@@ -43,7 +43,7 @@
 
     <dependency>
       <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-core</artifactId>
+      <artifactId>activemq-broker</artifactId>
       <scope>provided</scope>
     </dependency>
 
@@ -194,13 +194,14 @@
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-core</artifactId>
+      <artifactId>activemq-broker</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-console</artifactId>
+      <artifactId>activemq-kahadb-store</artifactId>
       <scope>test</scope>
     </dependency>
 
@@ -334,6 +335,7 @@
           <failIfNoTests>false</failIfNoTests>
           <excludes>
             <exclude>**/EnqueueRateScenariosTest.*</exclude>
+            <exclude>**/HALevelDB*.*</exclude>
           </excludes>
         </configuration>
       </plugin>

Copied: activemq/trunk/activemq-leveldb-store/readme.md (from r1406686, activemq/trunk/activemq-leveldb/readme.md)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/readme.md?p2=activemq/trunk/activemq-leveldb-store/readme.md&p1=activemq/trunk/activemq-leveldb/readme.md&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-leveldb-store/src/main/java/org/apache/activemq/store/leveldb/LevelDBPersistenceAdapter.java (from r1406686, activemq/trunk/activemq-leveldb/src/main/java/org/apache/activemq/store/leveldb/LevelDBPersistenceAdapter.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/main/java/org/apache/activemq/store/leveldb/LevelDBPersistenceAdapter.java?p2=activemq/trunk/activemq-leveldb-store/src/main/java/org/apache/activemq/store/leveldb/LevelDBPersistenceAdapter.java&p1=activemq/trunk/activemq-leveldb/src/main/java/org/apache/activemq/store/leveldb/LevelDBPersistenceAdapter.java&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-leveldb-store/src/main/proto/records.proto (from r1406686, activemq/trunk/activemq-leveldb/src/main/proto/records.proto)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/main/proto/records.proto?p2=activemq/trunk/activemq-leveldb-store/src/main/proto/records.proto&p1=activemq/trunk/activemq-leveldb/src/main/proto/records.proto&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb.scala (from r1406686, activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb.scala)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb.scala?p2=activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb.scala&p1=activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb.scala&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/DBManager.scala (from r1406686, activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/DBManager.scala)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/DBManager.scala?p2=activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/DBManager.scala&p1=activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/DBManager.scala&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/HALevelDBClient.scala (from r1406686, activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/HALevelDBClient.scala)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/HALevelDBClient.scala?p2=activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/HALevelDBClient.scala&p1=activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/HALevelDBClient.scala&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/HALevelDBStore.scala (from r1406686, activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/HALevelDBStore.scala)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/HALevelDBStore.scala?p2=activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/HALevelDBStore.scala&p1=activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/HALevelDBStore.scala&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/IndexManifestDTO.java (from r1406686, activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/IndexManifestDTO.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/IndexManifestDTO.java?p2=activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/IndexManifestDTO.java&p1=activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/IndexManifestDTO.java&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala (from r1406686, activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala?p2=activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala&p1=activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala (from r1406686, activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala?p2=activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala&p1=activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStoreViewMBean.java (from r1406686, activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/LevelDBStoreViewMBean.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStoreViewMBean.java?p2=activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStoreViewMBean.java&p1=activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/LevelDBStoreViewMBean.java&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/RecordLog.scala (from r1406686, activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/RecordLog.scala)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/RecordLog.scala?p2=activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/RecordLog.scala&p1=activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/RecordLog.scala&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/FileSupport.scala (from r1406686, activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/util/FileSupport.scala)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/FileSupport.scala?p2=activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/FileSupport.scala&p1=activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/util/FileSupport.scala&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/Log.scala (from r1406686, activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/util/Log.scala)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/Log.scala?p2=activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/Log.scala&p1=activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/util/Log.scala&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/LongCounter.scala (from r1406686, activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/util/LongCounter.scala)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/LongCounter.scala?p2=activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/LongCounter.scala&p1=activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/util/LongCounter.scala&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/RetrySupport.scala (from r1406686, activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/util/RetrySupport.scala)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/RetrySupport.scala?p2=activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/RetrySupport.scala&p1=activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/util/RetrySupport.scala&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/TimeMetric.scala (from r1406686, activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/util/TimeMetric.scala)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/TimeMetric.scala?p2=activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/TimeMetric.scala&p1=activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/util/TimeMetric.scala&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/store/leveldb/package.html (from r1406686, activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/store/leveldb/package.html)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/store/leveldb/package.html?p2=activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/store/leveldb/package.html&p1=activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/store/leveldb/package.html&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-leveldb-store/src/test/resources/log4j.properties (from r1406686, activemq/trunk/activemq-leveldb/src/test/resources/log4j.properties)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/test/resources/log4j.properties?p2=activemq/trunk/activemq-leveldb-store/src/test/resources/log4j.properties&p1=activemq/trunk/activemq-leveldb/src/test/resources/log4j.properties&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/ActiveMQScenario.scala (from r1406686, activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/ActiveMQScenario.scala)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/ActiveMQScenario.scala?p2=activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/ActiveMQScenario.scala&p1=activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/ActiveMQScenario.scala&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/EnqueueRateScenariosTest.scala (from r1406686, activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/EnqueueRateScenariosTest.scala)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/EnqueueRateScenariosTest.scala?p2=activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/EnqueueRateScenariosTest.scala&p1=activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/EnqueueRateScenariosTest.scala&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/HALevelDBFastEnqueueTest.scala (from r1406686, activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/HALevelDBFastEnqueueTest.scala)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/HALevelDBFastEnqueueTest.scala?p2=activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/HALevelDBFastEnqueueTest.scala&p1=activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/HALevelDBFastEnqueueTest.scala&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/HALevelDBStoreTest.scala (from r1406686, activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/HALevelDBStoreTest.scala)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/HALevelDBStoreTest.scala?p2=activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/HALevelDBStoreTest.scala&p1=activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/HALevelDBStoreTest.scala&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/JMSClientScenario.scala (from r1406686, activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/JMSClientScenario.scala)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/JMSClientScenario.scala?p2=activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/JMSClientScenario.scala&p1=activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/JMSClientScenario.scala&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/LevelDBFastEnqueueTest.scala (from r1406686, activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/LevelDBFastEnqueueTest.scala)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/LevelDBFastEnqueueTest.scala?p2=activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/LevelDBFastEnqueueTest.scala&p1=activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/LevelDBFastEnqueueTest.scala&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/LevelDBStoreTest.scala (from r1406686, activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/LevelDBStoreTest.scala)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/LevelDBStoreTest.scala?p2=activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/LevelDBStoreTest.scala&p1=activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/LevelDBStoreTest.scala&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/Scenario.scala (from r1406686, activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/Scenario.scala)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/Scenario.scala?p2=activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/Scenario.scala&p1=activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/Scenario.scala&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/TestingHDFSServer.scala (from r1406686, activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/TestingHDFSServer.scala)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/TestingHDFSServer.scala?p2=activemq/trunk/activemq-leveldb-store/src/test/scala/org/apache/activemq/leveldb/TestingHDFSServer.scala&p1=activemq/trunk/activemq-leveldb/src/test/scala/org/apache/activemq/leveldb/TestingHDFSServer.scala&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Modified: activemq/trunk/activemq-optional/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/pom.xml?rev=1406726&r1=1406725&r2=1406726&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/pom.xml (original)
+++ activemq/trunk/activemq-optional/pom.xml Wed Nov  7 17:26:31 2012
@@ -48,6 +48,12 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>activemq-broker</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activeio-core</artifactId>
     </dependency>
     <dependency>

Modified: activemq/trunk/activemq-pool/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-pool/pom.xml?rev=1406726&r1=1406725&r2=1406726&view=diff
==============================================================================
--- activemq/trunk/activemq-pool/pom.xml (original)
+++ activemq/trunk/activemq-pool/pom.xml Wed Nov  7 17:26:31 2012
@@ -53,7 +53,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>activemq-core</artifactId>
+      <artifactId>activemq-client</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -80,7 +80,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>activemq-core</artifactId>
+      <artifactId>activemq-broker</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>

Modified: activemq/trunk/activemq-ra/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-ra/pom.xml?rev=1406726&r1=1406725&r2=1406726&view=diff
==============================================================================
--- activemq/trunk/activemq-ra/pom.xml (original)
+++ activemq/trunk/activemq-ra/pom.xml Wed Nov  7 17:26:31 2012
@@ -45,7 +45,11 @@
     <!-- activemq -->
     <dependency>
       <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-core</artifactId>
+      <artifactId>activemq-broker</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-kahadb-store</artifactId>
     </dependency>
 
     <dependency>
@@ -54,7 +58,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-core</artifactId>
+      <artifactId>activemq-broker</artifactId>
       <version>${project.version}</version>
       <classifier>tests</classifier>
       <scope>test</scope>

Modified: activemq/trunk/activemq-spring/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/pom.xml?rev=1406726&r1=1406725&r2=1406726&view=diff
==============================================================================
--- activemq/trunk/activemq-spring/pom.xml (original)
+++ activemq/trunk/activemq-spring/pom.xml Wed Nov  7 17:26:31 2012
@@ -54,8 +54,38 @@
       <artifactId>slf4j-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>activemq-core</artifactId>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-broker</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-jdbc-store</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-kahadb-store</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-amq-store</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-leveldb-store</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-mqtt</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-stomp</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -89,7 +119,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>activemq-core</artifactId>
+      <artifactId>activemq-broker</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>

Copied: activemq/trunk/activemq-spring/src/main/resources/META-INF/services/org/apache/xbean/spring/http/activemq.apache.org/schema/core (from r1406686, activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/xbean/spring/http/activemq.apache.org/schema/core)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/main/resources/META-INF/services/org/apache/xbean/spring/http/activemq.apache.org/schema/core?p2=activemq/trunk/activemq-spring/src/main/resources/META-INF/services/org/apache/xbean/spring/http/activemq.apache.org/schema/core&p1=activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/xbean/spring/http/activemq.apache.org/schema/core&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-spring/src/main/resources/META-INF/spring.handlers (from r1406686, activemq/trunk/activemq-core/src/main/resources/META-INF/spring.handlers)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/main/resources/META-INF/spring.handlers?p2=activemq/trunk/activemq-spring/src/main/resources/META-INF/spring.handlers&p1=activemq/trunk/activemq-core/src/main/resources/META-INF/spring.handlers&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-spring/src/main/resources/META-INF/spring.schemas (from r1406686, activemq/trunk/activemq-core/src/main/resources/META-INF/spring.schemas)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/main/resources/META-INF/spring.schemas?p2=activemq/trunk/activemq-spring/src/main/resources/META-INF/spring.schemas&p1=activemq/trunk/activemq-core/src/main/resources/META-INF/spring.schemas&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-spring/src/main/resources/activemq.xsd (from r1406686, activemq/trunk/activemq-core/src/main/resources/activemq.xsd)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/main/resources/activemq.xsd?p2=activemq/trunk/activemq-spring/src/main/resources/activemq.xsd&p1=activemq/trunk/activemq-core/src/main/resources/activemq.xsd&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-spring/src/main/resources/activemq.xsd.html (from r1406686, activemq/trunk/activemq-core/src/main/resources/activemq.xsd.html)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/main/resources/activemq.xsd.html?p2=activemq/trunk/activemq-spring/src/main/resources/activemq.xsd.html&p1=activemq/trunk/activemq-core/src/main/resources/activemq.xsd.html&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-spring/src/main/resources/activemq.xsd.wiki (from r1406686, activemq/trunk/activemq-core/src/main/resources/activemq.xsd.wiki)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/main/resources/activemq.xsd.wiki?p2=activemq/trunk/activemq-spring/src/main/resources/activemq.xsd.wiki&p1=activemq/trunk/activemq-core/src/main/resources/activemq.xsd.wiki&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-spring/src/test/java/org/apache/activemq/store/leveldb/LevelDBConfigTest.java (from r1406686, activemq/trunk/activemq-leveldb/src/test/java/org/apache/activemq/store/leveldb/LevelDBConfigTest.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/test/java/org/apache/activemq/store/leveldb/LevelDBConfigTest.java?p2=activemq/trunk/activemq-spring/src/test/java/org/apache/activemq/store/leveldb/LevelDBConfigTest.java&p1=activemq/trunk/activemq-leveldb/src/test/java/org/apache/activemq/store/leveldb/LevelDBConfigTest.java&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-spring/src/test/resources/org/apache/activemq/store/leveldb/leveldb.xml (from r1406686, activemq/trunk/activemq-leveldb/src/test/resources/org/apache/activemq/store/leveldb/leveldb.xml)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/test/resources/org/apache/activemq/store/leveldb/leveldb.xml?p2=activemq/trunk/activemq-spring/src/test/resources/org/apache/activemq/store/leveldb/leveldb.xml&p1=activemq/trunk/activemq-leveldb/src/test/resources/org/apache/activemq/store/leveldb/leveldb.xml&r1=1406686&r2=1406726&rev=1406726&view=diff
==============================================================================
    (empty)

Modified: activemq/trunk/activemq-web-demo/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-demo/pom.xml?rev=1406726&r1=1406725&r2=1406726&view=diff
==============================================================================
--- activemq/trunk/activemq-web-demo/pom.xml (original)
+++ activemq/trunk/activemq-web-demo/pom.xml Wed Nov  7 17:26:31 2012
@@ -88,6 +88,12 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>activemq-broker</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activeio-core</artifactId>
     </dependency>
     <dependency>

Modified: activemq/trunk/activemq-xmpp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-xmpp/pom.xml?rev=1406726&r1=1406725&r2=1406726&view=diff
==============================================================================
--- activemq/trunk/activemq-xmpp/pom.xml (original)
+++ activemq/trunk/activemq-xmpp/pom.xml Wed Nov  7 17:26:31 2012
@@ -83,6 +83,13 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>activemq-broker</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
   <build>

Modified: activemq/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/pom.xml?rev=1406726&r1=1406725&r2=1406726&view=diff
==============================================================================
--- activemq/trunk/assembly/pom.xml (original)
+++ activemq/trunk/assembly/pom.xml Wed Nov  7 17:26:31 2012
@@ -43,6 +43,19 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>activeio-core</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>activemq-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>activemq-broker</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
     </dependency>
     <dependency>
@@ -50,16 +63,35 @@
       <artifactId>activemq-core</artifactId>
       <type>test-jar</type>
     </dependency>
+
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>activeio-core</artifactId>
+      <artifactId>activemq-leveldb-store</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>activemq-leveldb</artifactId>
+      <artifactId>activemq-amq-store</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>activemq-kahadb-store</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>activemq-jdbc-store</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>activemq-mqtt</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>activemq-stomp</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-console</artifactId>
     </dependency>
     <dependency>

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1406726&r1=1406725&r2=1406726&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Wed Nov  7 17:26:31 2012
@@ -204,6 +204,7 @@
     <module>activemq-kahadb-store</module>
     <module>activemq-amq-store</module>
     <module>activemq-jdbc-store</module>
+    <module>activemq-leveldb-store</module>
 
     <module>activemq-core</module>
     <module>activemq-all</module>
@@ -213,7 +214,6 @@
     <module>activemq-jaas</module>
     <module>activemq-blueprint</module>
     <module>activemq-karaf</module>
-    <module>activemq-leveldb</module>
     <module>activemq-openwire-generator</module>
     <module>activemq-optional</module>
     <module>activemq-pool</module>
@@ -257,6 +257,11 @@
         <artifactId>activemq-jdbc-store</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-leveldb-store</artifactId>
+        <version>${project.version}</version>
+      </dependency>
 
       <dependency>
         <groupId>org.apache.activemq</groupId>
@@ -303,27 +308,29 @@
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-jaas</artifactId>
+        <artifactId>activemq-broker</artifactId>
         <version>${project.version}</version>
+        <type>test-jar</type>
+        <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-pool</artifactId>
+        <artifactId>activemq-jaas</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-spring</artifactId>
+        <artifactId>activemq-pool</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-web</artifactId>
+        <artifactId>activemq-spring</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-leveldb</artifactId>
+        <artifactId>activemq-web</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>



Mime
View raw message