You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2012/11/07 14:38:17 UTC
svn commit: r1406629 [5/5] - in /activemq/trunk: ./ activemq-broker/
activemq-broker/src/ activemq-broker/src/main/
activemq-broker/src/main/java/ activemq-broker/src/main/java/org/
activemq-broker/src/main/java/org/apache/ activemq-broker/src/main/jav...
Copied: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/transport/vm/VMTransportFactory.java (from r1406466, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/vm/VMTransportFactory.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/transport/vm/VMTransportFactory.java?p2=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/transport/vm/VMTransportFactory.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/vm/VMTransportFactory.java&r1=1406466&r2=1406629&rev=1406629&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/transport/vm/VMTransportServer.java (from r1406466, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/vm/VMTransportServer.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/transport/vm/VMTransportServer.java?p2=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/transport/vm/VMTransportServer.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/vm/VMTransportServer.java&r1=1406466&r2=1406629&rev=1406629&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/transport/vm/package.html (from r1406466, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/vm/package.html)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/transport/vm/package.html?p2=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/transport/vm/package.html&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/vm/package.html&r1=1406466&r2=1406629&rev=1406629&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/usage/StoreUsage.java (from r1406466, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/usage/StoreUsage.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/usage/StoreUsage.java?p2=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/usage/StoreUsage.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/usage/StoreUsage.java&r1=1406466&r2=1406629&rev=1406629&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/usage/SystemUsage.java (from r1406466, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/usage/SystemUsage.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/usage/SystemUsage.java?p2=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/usage/SystemUsage.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/usage/SystemUsage.java&r1=1406466&r2=1406629&rev=1406629&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/usage/TempUsage.java (from r1406466, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/usage/TempUsage.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/usage/TempUsage.java?p2=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/usage/TempUsage.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/usage/TempUsage.java&r1=1406466&r2=1406629&rev=1406629&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/BooleanEditor.java (from r1406466, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/BooleanEditor.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/BooleanEditor.java?p2=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/BooleanEditor.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/BooleanEditor.java&r1=1406466&r2=1406629&rev=1406629&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/BrokerSupport.java (from r1406466, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/BrokerSupport.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/BrokerSupport.java?p2=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/BrokerSupport.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/BrokerSupport.java&r1=1406466&r2=1406629&rev=1406629&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/DefaultIOExceptionHandler.java (from r1406466, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/DefaultIOExceptionHandler.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/DefaultIOExceptionHandler.java?p2=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/DefaultIOExceptionHandler.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/DefaultIOExceptionHandler.java&r1=1406466&r2=1406629&rev=1406629&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/HexSupport.java (from r1406466, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/HexSupport.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/HexSupport.java?p2=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/HexSupport.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/HexSupport.java&r1=1406466&r2=1406629&rev=1406629&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/IOExceptionHandler.java (from r1406466, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/IOExceptionHandler.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/IOExceptionHandler.java?p2=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/IOExceptionHandler.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/IOExceptionHandler.java&r1=1406466&r2=1406629&rev=1406629&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/IOHelper.java (from r1406466, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/IOHelper.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/IOHelper.java?p2=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/IOHelper.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/IOHelper.java&r1=1406466&r2=1406629&rev=1406629&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/JMXSupport.java (from r1406466, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/JMXSupport.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/JMXSupport.java?p2=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/JMXSupport.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/JMXSupport.java&r1=1406466&r2=1406629&rev=1406629&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/LinkedNode.java (from r1406466, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/LinkedNode.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/LinkedNode.java?p2=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/LinkedNode.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/LinkedNode.java&r1=1406466&r2=1406629&rev=1406629&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/LockFile.java (from r1406466, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/LockFile.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/LockFile.java?p2=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/LockFile.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/LockFile.java&r1=1406466&r2=1406629&rev=1406629&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/LogWriterFinder.java (from r1406466, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/LogWriterFinder.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/LogWriterFinder.java?p2=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/LogWriterFinder.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/LogWriterFinder.java&r1=1406466&r2=1406629&rev=1406629&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/MemoryIntPropertyEditor.java (from r1406466, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/MemoryIntPropertyEditor.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/MemoryIntPropertyEditor.java?p2=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/MemoryIntPropertyEditor.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/MemoryIntPropertyEditor.java&r1=1406466&r2=1406629&rev=1406629&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/MemoryPropertyEditor.java (from r1406466, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/MemoryPropertyEditor.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/MemoryPropertyEditor.java?p2=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/MemoryPropertyEditor.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/MemoryPropertyEditor.java&r1=1406466&r2=1406629&rev=1406629&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/SubscriptionKey.java (from r1406466, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/SubscriptionKey.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/SubscriptionKey.java?p2=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/SubscriptionKey.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/SubscriptionKey.java&r1=1406466&r2=1406629&rev=1406629&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/ThreadTracker.java (from r1406466, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/ThreadTracker.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/ThreadTracker.java?p2=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/ThreadTracker.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/ThreadTracker.java&r1=1406466&r2=1406629&rev=1406629&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/TransactionTemplate.java (from r1406466, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/TransactionTemplate.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/TransactionTemplate.java?p2=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/TransactionTemplate.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/TransactionTemplate.java&r1=1406466&r2=1406629&rev=1406629&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/WrappedException.java (from r1406466, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/WrappedException.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/WrappedException.java?p2=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/WrappedException.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/WrappedException.java&r1=1406466&r2=1406629&rev=1406629&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/osgi/Activator.java (from r1406466, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/osgi/Activator.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/osgi/Activator.java?p2=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/util/osgi/Activator.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/osgi/Activator.java&r1=1406466&r2=1406629&rev=1406629&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/xbean/BrokerFactoryBean.java (from r1406466, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/xbean/BrokerFactoryBean.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/xbean/BrokerFactoryBean.java?p2=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/xbean/BrokerFactoryBean.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/xbean/BrokerFactoryBean.java&r1=1406466&r2=1406629&rev=1406629&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java (from r1406466, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java?p2=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java&r1=1406466&r2=1406629&rev=1406629&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java (from r1406466, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java?p2=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java&r1=1406466&r2=1406629&rev=1406629&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/xbean/package.html (from r1406466, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/xbean/package.html)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/xbean/package.html?p2=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/xbean/package.html&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/xbean/package.html&r1=1406466&r2=1406629&rev=1406629&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/filtered-resources/org/apache/activemq/version.txt (from r1406466, activemq/trunk/activemq-core/src/main/filtered-resources/org/apache/activemq/version.txt)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/filtered-resources/org/apache/activemq/version.txt?p2=activemq/trunk/activemq-client/src/main/filtered-resources/org/apache/activemq/version.txt&p1=activemq/trunk/activemq-core/src/main/filtered-resources/org/apache/activemq/version.txt&r1=1406466&r2=1406629&rev=1406629&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/java/org/apache/activemq/selector/package.html (from r1406466, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/selector/package.html)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/java/org/apache/activemq/selector/package.html?p2=activemq/trunk/activemq-client/src/main/java/org/apache/activemq/selector/package.html&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/selector/package.html&r1=1406466&r2=1406629&rev=1406629&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactory.java (from r1406466, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactory.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactory.java?p2=activemq/trunk/activemq-client/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactory.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactory.java&r1=1406466&r2=1406629&rev=1406629&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBean.java (from r1406466, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBean.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBean.java?p2=activemq/trunk/activemq-client/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBean.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/spring/ActiveMQConnectionFactoryFactoryBean.java&r1=1406466&r2=1406629&rev=1406629&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/java/org/apache/activemq/spring/ActiveMQXAConnectionFactory.java (from r1406466, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/spring/ActiveMQXAConnectionFactory.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/java/org/apache/activemq/spring/ActiveMQXAConnectionFactory.java?p2=activemq/trunk/activemq-client/src/main/java/org/apache/activemq/spring/ActiveMQXAConnectionFactory.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/spring/ActiveMQXAConnectionFactory.java&r1=1406466&r2=1406629&rev=1406629&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/java/org/apache/activemq/spring/package.html (from r1406466, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/spring/package.html)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/java/org/apache/activemq/spring/package.html?p2=activemq/trunk/activemq-client/src/main/java/org/apache/activemq/spring/package.html&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/spring/package.html&r1=1406466&r2=1406629&rev=1406629&view=diff
==============================================================================
(empty)
Modified: activemq/trunk/activemq-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/pom.xml?rev=1406629&r1=1406628&r2=1406629&view=diff
==============================================================================
--- activemq/trunk/activemq-core/pom.xml (original)
+++ activemq/trunk/activemq-core/pom.xml Wed Nov 7 13:37:50 2012
@@ -97,7 +97,7 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-client</artifactId>
+ <artifactId>activemq-broker</artifactId>
</dependency>
<!-- =============================== -->
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/ContainerId.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/ContainerId.java?rev=1406629&r1=1406628&r2=1406629&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/ContainerId.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/ContainerId.java Wed Nov 7 13:37:50 2012
@@ -21,8 +21,6 @@ import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import org.apache.activemq.util.IOHelper;
-
/**
* Used by RootContainers
*
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/async/ReadOnlyDataFile.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/async/ReadOnlyDataFile.java?rev=1406629&r1=1406628&r2=1406629&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/async/ReadOnlyDataFile.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/async/ReadOnlyDataFile.java Wed Nov 7 13:37:50 2012
@@ -20,8 +20,6 @@ import java.io.File;
import java.io.IOException;
import java.io.RandomAccessFile;
-import org.apache.activemq.util.IOHelper;
-
/**
* Allows you to open a data file in read only mode. Useful when working with
* archived data files.
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/MapContainerImpl.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/MapContainerImpl.java?rev=1406629&r1=1406628&r2=1406629&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/MapContainerImpl.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/MapContainerImpl.java Wed Nov 7 13:37:50 2012
@@ -39,7 +39,6 @@ import org.apache.activemq.kaha.impl.ind
import org.apache.activemq.kaha.impl.index.IndexManager;
import org.apache.activemq.kaha.impl.index.VMIndex;
import org.apache.activemq.kaha.impl.index.hash.HashIndex;
-import org.apache.activemq.util.IOHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerRestartTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerRestartTestSupport.java?rev=1406629&r1=1406628&r2=1406629&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerRestartTestSupport.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerRestartTestSupport.java Wed Nov 7 13:37:50 2012
@@ -19,9 +19,7 @@ package org.apache.activemq.broker;
import java.io.File;
import java.io.IOException;
import java.net.URISyntaxException;
-import org.apache.activemq.broker.region.policy.PolicyEntry;
-import org.apache.activemq.broker.region.policy.PolicyMap;
-import org.apache.activemq.store.PersistenceAdapter;
+
import org.apache.activemq.util.IOHelper;
public class BrokerRestartTestSupport extends BrokerTestSupport {
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/mKahaDBXARecoveryBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/mKahaDBXARecoveryBrokerTest.java?rev=1406629&r1=1406628&r2=1406629&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/mKahaDBXARecoveryBrokerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/mKahaDBXARecoveryBrokerTest.java Wed Nov 7 13:37:50 2012
@@ -18,29 +18,13 @@ package org.apache.activemq.broker;
import java.util.LinkedList;
import java.util.List;
-import javax.jms.JMSException;
-import javax.management.InstanceNotFoundException;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
+
import junit.framework.Test;
-import org.apache.activemq.broker.jmx.RecoveredXATransactionViewMBean;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.activemq.command.ConnectionInfo;
-import org.apache.activemq.command.ConsumerInfo;
-import org.apache.activemq.command.DataArrayResponse;
-import org.apache.activemq.command.Message;
-import org.apache.activemq.command.MessageAck;
-import org.apache.activemq.command.ProducerInfo;
-import org.apache.activemq.command.Response;
-import org.apache.activemq.command.SessionInfo;
-import org.apache.activemq.command.TransactionId;
-import org.apache.activemq.command.TransactionInfo;
-import org.apache.activemq.command.XATransactionId;
import org.apache.activemq.store.kahadb.FilteredKahaDBPersistenceAdapter;
import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
import org.apache.activemq.store.kahadb.MultiKahaDBPersistenceAdapter;
-import org.apache.activemq.util.JMXSupport;
public class mKahaDBXARecoveryBrokerTest extends XARecoveryBrokerTest {
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/DurableConsumerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/DurableConsumerTest.java?rev=1406629&r1=1406628&r2=1406629&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/DurableConsumerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/DurableConsumerTest.java Wed Nov 7 13:37:50 2012
@@ -48,7 +48,6 @@ import org.apache.activemq.ActiveMQConne
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.CombinationTestSupport;
import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.jmx.BrokerView;
import org.apache.activemq.broker.region.policy.PolicyEntry;
import org.apache.activemq.broker.region.policy.PolicyMap;
import org.apache.activemq.command.ActiveMQTopic;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/kaha/impl/index/IndexBenchmark.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/kaha/impl/index/IndexBenchmark.java?rev=1406629&r1=1406628&r2=1406629&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/kaha/impl/index/IndexBenchmark.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/kaha/impl/index/IndexBenchmark.java Wed Nov 7 13:37:50 2012
@@ -18,8 +18,6 @@ package org.apache.activemq.kaha.impl.in
import java.io.File;
import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/jdbc/JDBCMessagePriorityTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/jdbc/JDBCMessagePriorityTest.java?rev=1406629&r1=1406628&r2=1406629&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/jdbc/JDBCMessagePriorityTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/jdbc/JDBCMessagePriorityTest.java Wed Nov 7 13:37:50 2012
@@ -19,7 +19,6 @@ package org.apache.activemq.store.jdbc;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
-import java.sql.Statement;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Vector;
@@ -38,7 +37,6 @@ import org.apache.activemq.command.Activ
import org.apache.activemq.command.ActiveMQTopic;
import org.apache.activemq.store.MessagePriorityTest;
import org.apache.activemq.store.PersistenceAdapter;
-import org.apache.activemq.util.ThreadTracker;
import org.apache.activemq.util.Wait;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/KahaDBVersionTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/KahaDBVersionTest.java?rev=1406629&r1=1406628&r2=1406629&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/KahaDBVersionTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/KahaDBVersionTest.java Wed Nov 7 13:37:50 2012
@@ -19,16 +19,12 @@ package org.apache.activemq.store.kahadb
import junit.framework.TestCase;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.util.IOHelper;
import javax.jms.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.io.FileNotFoundException;
/**
* @author chirino
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubProcessConcurrentCommitActivateNoDuplicateTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubProcessConcurrentCommitActivateNoDuplicateTest.java?rev=1406629&r1=1406628&r2=1406629&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubProcessConcurrentCommitActivateNoDuplicateTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubProcessConcurrentCommitActivateNoDuplicateTest.java Wed Nov 7 13:37:50 2012
@@ -17,7 +17,6 @@
package org.apache.activemq.usecases;
import java.io.File;
-import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1406629&r1=1406628&r2=1406629&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Wed Nov 7 13:37:50 2012
@@ -196,6 +196,7 @@
<modules>
<module>activemq-all</module>
+ <module>activemq-broker</module>
<module>activemq-camel</module>
<module>activemq-console</module>
<module>activemq-client</module>
@@ -239,6 +240,11 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
<artifactId>activemq-all</artifactId>
<version>${project.version}</version>
</dependency>