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 06:01:21 UTC
svn commit: r1406466 [10/11] - in /activemq/trunk: ./
activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/
activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/
activemq-camel/src/main/java/org/apache/activemq/camel/component/ acti...
Copied: activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/ServiceListener.java (from r1406463, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/ServiceListener.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/ServiceListener.java?p2=activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/ServiceListener.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/ServiceListener.java&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/ServiceStopper.java (from r1406463, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/ServiceStopper.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/ServiceStopper.java?p2=activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/ServiceStopper.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/ServiceStopper.java&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/ServiceSupport.java (from r1406463, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/ServiceSupport.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/ServiceSupport.java?p2=activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/ServiceSupport.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/ServiceSupport.java&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/StopWatch.java (from r1406463, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/StopWatch.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/StopWatch.java?p2=activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/StopWatch.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/StopWatch.java&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/StringArrayConverter.java (from r1406463, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/StringArrayConverter.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/StringArrayConverter.java?p2=activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/StringArrayConverter.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/StringArrayConverter.java&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/StringToListOfActiveMQDestinationConverter.java (from r1406463, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/StringToListOfActiveMQDestinationConverter.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/StringToListOfActiveMQDestinationConverter.java?p2=activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/StringToListOfActiveMQDestinationConverter.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/StringToListOfActiveMQDestinationConverter.java&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/ThreadPoolUtils.java (from r1406463, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/ThreadPoolUtils.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/ThreadPoolUtils.java?p2=activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/ThreadPoolUtils.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/ThreadPoolUtils.java&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/TimeUtils.java (from r1406463, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/TimeUtils.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/TimeUtils.java?p2=activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/TimeUtils.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/TimeUtils.java&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/TypeConversionSupport.java (from r1406463, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/TypeConversionSupport.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/TypeConversionSupport.java?p2=activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/TypeConversionSupport.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/TypeConversionSupport.java&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/URISupport.java (from r1406463, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/URISupport.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/URISupport.java?p2=activemq/trunk/activemq-client/src/main/java/org/apache/activemq/util/URISupport.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/URISupport.java&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormat.java (from r1406463, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormat.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormat.java?p2=activemq/trunk/activemq-client/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormat.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormat.java&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/java/org/apache/activemq/wireformat/WireFormat.java (from r1406463, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/wireformat/WireFormat.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/java/org/apache/activemq/wireformat/WireFormat.java?p2=activemq/trunk/activemq-client/src/main/java/org/apache/activemq/wireformat/WireFormat.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/wireformat/WireFormat.java&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/java/org/apache/activemq/wireformat/WireFormatFactory.java (from r1406463, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/wireformat/WireFormatFactory.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/java/org/apache/activemq/wireformat/WireFormatFactory.java?p2=activemq/trunk/activemq-client/src/main/java/org/apache/activemq/wireformat/WireFormatFactory.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/wireformat/WireFormatFactory.java&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/java/org/apache/activemq/wireformat/package.html (from r1406463, activemq/trunk/activemq-core/src/main/java/org/apache/activemq/wireformat/package.html)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/java/org/apache/activemq/wireformat/package.html?p2=activemq/trunk/activemq-client/src/main/java/org/apache/activemq/wireformat/package.html&p1=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/wireformat/package.html&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discovery (from r1406463, activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discovery)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discovery?p2=activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discovery&p1=activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discovery&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/masterslave (from r1406463, activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/masterslave)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/masterslave?p2=activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/masterslave&p1=activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/masterslave&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/multicast (from r1406463, activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/multicast)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/multicast?p2=activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/multicast&p1=activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/multicast&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/simple (from r1406463, activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/simple)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/simple?p2=activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/simple&p1=activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/simple&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/static (from r1406463, activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/static)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/static?p2=activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/static&p1=activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/static&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/zeroconf (from r1406463, activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/zeroconf)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/zeroconf?p2=activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/zeroconf&p1=activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/discoveryagent/zeroconf&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/failover (from r1406463, activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/failover)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/failover?p2=activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/failover&p1=activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/failover&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/fanout (from r1406463, activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/fanout)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/fanout?p2=activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/fanout&p1=activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/fanout&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/mock (from r1406463, activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/mock)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/mock?p2=activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/mock&p1=activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/mock&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/multicast (from r1406463, activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/multicast)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/multicast?p2=activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/multicast&p1=activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/multicast&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/nio (from r1406463, activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/nio)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/nio?p2=activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/nio&p1=activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/nio&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/nio+ssl (from r1406463, activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/nio+ssl)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/nio%2Bssl?p2=activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/nio%2Bssl&p1=activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/nio%2Bssl&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/ssl (from r1406463, activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/ssl)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/ssl?p2=activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/ssl&p1=activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/ssl&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/tcp (from r1406463, activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/tcp)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/tcp?p2=activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/tcp&p1=activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/tcp&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/udp (from r1406463, activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/udp)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/udp?p2=activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/transport/udp&p1=activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/udp&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/wireformat/default (from r1406463, activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/wireformat/default)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/wireformat/default?p2=activemq/trunk/activemq-client/src/main/resources/META-INF/services/org/apache/activemq/wireformat/default&p1=activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/wireformat/default&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/test/java/org/apache/activemq/broker/scheduler/CronParserTest.java (from r1406463, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/scheduler/CronParserTest.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/test/java/org/apache/activemq/broker/scheduler/CronParserTest.java?p2=activemq/trunk/activemq-client/src/test/java/org/apache/activemq/broker/scheduler/CronParserTest.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/scheduler/CronParserTest.java&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/test/java/org/apache/activemq/util/BitArrayBinTest.java (from r1406463, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/BitArrayBinTest.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/test/java/org/apache/activemq/util/BitArrayBinTest.java?p2=activemq/trunk/activemq-client/src/test/java/org/apache/activemq/util/BitArrayBinTest.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/BitArrayBinTest.java&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/test/java/org/apache/activemq/util/DataByteArrayInputStreamTest.java (from r1406463, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/DataByteArrayInputStreamTest.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/test/java/org/apache/activemq/util/DataByteArrayInputStreamTest.java?p2=activemq/trunk/activemq-client/src/test/java/org/apache/activemq/util/DataByteArrayInputStreamTest.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/DataByteArrayInputStreamTest.java&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/test/java/org/apache/activemq/util/DataByteArrayOutputStreamTest.java (from r1406463, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/DataByteArrayOutputStreamTest.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/test/java/org/apache/activemq/util/DataByteArrayOutputStreamTest.java?p2=activemq/trunk/activemq-client/src/test/java/org/apache/activemq/util/DataByteArrayOutputStreamTest.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/DataByteArrayOutputStreamTest.java&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/test/java/org/apache/activemq/util/LRUCacheTest.java (from r1406463, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/LRUCacheTest.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/test/java/org/apache/activemq/util/LRUCacheTest.java?p2=activemq/trunk/activemq-client/src/test/java/org/apache/activemq/util/LRUCacheTest.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/LRUCacheTest.java&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Copied: activemq/trunk/activemq-client/src/test/java/org/apache/activemq/util/StringArrayConverterTest.java (from r1406463, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/StringArrayConverterTest.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/test/java/org/apache/activemq/util/StringArrayConverterTest.java?p2=activemq/trunk/activemq-client/src/test/java/org/apache/activemq/util/StringArrayConverterTest.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/StringArrayConverterTest.java&r1=1406463&r2=1406466&rev=1406466&view=diff
==============================================================================
(empty)
Modified: activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/store/amq/reader/AMQIterator.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/store/amq/reader/AMQIterator.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/store/amq/reader/AMQIterator.java (original)
+++ activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/store/amq/reader/AMQIterator.java Wed Nov 7 05:00:17 2012
@@ -17,7 +17,6 @@
package org.apache.activemq.console.command.store.amq.reader;
import java.util.Iterator;
-import javax.jms.InvalidSelectorException;
import javax.jms.Message;
import org.apache.activemq.broker.region.MessageReference;
import org.apache.activemq.filter.BooleanExpression;
Modified: activemq/trunk/activemq-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/pom.xml?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/pom.xml (original)
+++ activemq/trunk/activemq-core/pom.xml Wed Nov 7 05:00:17 2012
@@ -95,6 +95,10 @@
<groupId>org.fusesource.mqtt-client</groupId>
<artifactId>mqtt-client</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-client</artifactId>
+ </dependency>
<!-- =============================== -->
<!-- Optional Dependencies -->
@@ -553,57 +557,6 @@
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
- <artifactId>javacc-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <configuration>
- <sourceDirectory>${basedir}/src/main/grammar</sourceDirectory>
- <outputDirectory>${basedir}/target/generated-javacc</outputDirectory>
- <packageName>org.apache.activemq.selector</packageName>
- </configuration>
- <goals>
- <goal>javacc</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!-- disabled until the xbean 3.11.2 plugin is released -->
- <!--
- <plugin>
- <groupId>org.apache.xbean</groupId>
- <artifactId>maven-xbean-plugin</artifactId>
- <version>${xbean-version}</version>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <configuration>
- <includes>
- <include>${basedir}/../activemq-leveldb/src/main/scala</include>
- </includes>
- <strictXsdOrder>false</strictXsdOrder>
- <namespace>http://activemq.apache.org/schema/core</namespace>
- <schema>${basedir}/target/classes/activemq.xsd</schema>
- <outputDir>${basedir}/target/classes</outputDir>
- <generateSpringSchemasFile>false</generateSpringSchemasFile>
- <excludedClasses>org.apache.activemq.broker.jmx.AnnotatedMBean,org.apache.activemq.broker.jmx.DestinationViewMBean</excludedClasses>
- </configuration>
- <goals>
- <goal>mapping</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>com.thoughtworks.qdox</groupId>
- <artifactId>qdox</artifactId>
- <version>1.12</version>
- </dependency>
- </dependencies>
- </plugin>
- -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<configuration>
<check>
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/AbstractLocker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/AbstractLocker.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/AbstractLocker.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/AbstractLocker.java Wed Nov 7 05:00:17 2012
@@ -16,7 +16,6 @@
*/
package org.apache.activemq.broker;
-import org.apache.activemq.broker.Locker;
import org.apache.activemq.util.ServiceSupport;
import java.io.IOException;
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java Wed Nov 7 05:00:17 2012
@@ -48,7 +48,7 @@ import org.apache.activemq.store.Persist
import org.apache.activemq.store.memory.MemoryPersistenceAdapter;
import org.apache.activemq.thread.Scheduler;
import org.apache.activemq.thread.TaskRunnerFactory;
-import org.apache.activemq.transport.TransportFactory;
+import org.apache.activemq.transport.TransportFactorySupport;
import org.apache.activemq.transport.TransportServer;
import org.apache.activemq.transport.stomp.ProtocolConverter;
import org.apache.activemq.transport.vm.VMTransportFactory;
@@ -2203,7 +2203,7 @@ public class BrokerService implements Se
}
protected TransportConnector createTransportConnector(URI brokerURI) throws Exception {
- TransportServer transport = TransportFactory.bind(this, brokerURI);
+ TransportServer transport = TransportFactorySupport.bind(this, brokerURI);
return new TransportConnector(transport);
}
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/SslBrokerService.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/SslBrokerService.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/SslBrokerService.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/SslBrokerService.java Wed Nov 7 05:00:17 2012
@@ -26,6 +26,7 @@ import javax.net.ssl.KeyManager;
import javax.net.ssl.TrustManager;
import org.apache.activemq.transport.TransportFactory;
+import org.apache.activemq.transport.TransportFactorySupport;
import org.apache.activemq.transport.TransportServer;
import org.apache.activemq.transport.tcp.SslTransportFactory;
@@ -101,7 +102,7 @@ public class SslBrokerService extends Br
} else {
// Else, business as usual.
- return TransportFactory.bind(this, brokerURI);
+ return TransportFactorySupport.bind(this, brokerURI);
}
}
}
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java Wed Nov 7 05:00:17 2012
@@ -33,10 +33,7 @@ import org.apache.activemq.command.Broke
import org.apache.activemq.command.ConnectionControl;
import org.apache.activemq.security.MessageAuthorizationPolicy;
import org.apache.activemq.thread.TaskRunnerFactory;
-import org.apache.activemq.transport.Transport;
-import org.apache.activemq.transport.TransportAcceptListener;
-import org.apache.activemq.transport.TransportFactory;
-import org.apache.activemq.transport.TransportServer;
+import org.apache.activemq.transport.*;
import org.apache.activemq.transport.discovery.DiscoveryAgent;
import org.apache.activemq.transport.discovery.DiscoveryAgentFactory;
import org.apache.activemq.util.ServiceStopper;
@@ -307,7 +304,7 @@ public class TransportConnector implemen
throw new IllegalArgumentException(
"You must specify the brokerService property. Maybe this connector should be added to a broker?");
}
- return TransportFactory.bind(brokerService, uri);
+ return TransportFactorySupport.bind(brokerService, uri);
}
public DiscoveryAgent getDiscoveryAgent() throws IOException {
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java Wed Nov 7 05:00:17 2012
@@ -176,7 +176,8 @@ public abstract class AbstractSubscripti
boolean result = false;
MessageEvaluationContext msgContext = context.getMessageEvaluationContext();
try {
- msgContext.setDestination(message.getRegionDestination().getActiveMQDestination());
+ Destination regionDestination = (Destination) message.getRegionDestination();
+ msgContext.setDestination(regionDestination.getActiveMQDestination());
msgContext.setMessageReference(message);
result = matches(message, msgContext);
if (result) {
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Destination.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Destination.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Destination.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Destination.java Wed Nov 7 05:00:17 2012
@@ -37,7 +37,7 @@ import org.apache.activemq.usage.Usage;
/**
*
*/
-public interface Destination extends Service, Task {
+public interface Destination extends Service, Task, Message.MessageDestination {
public static final DeadLetterStrategy DEFAULT_DEAD_LETTER_STRATEGY = new SharedDeadLetterStrategy();
public static final long DEFAULT_BLOCKED_PRODUCER_WARNING_INTERVAL = 30000;
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java Wed Nov 7 05:00:17 2012
@@ -91,7 +91,8 @@ public class DurableTopicSubscription ex
MessageAck ack = new MessageAck();
ack.setAckType(MessageAck.UNMATCHED_ACK_TYPE);
ack.setMessageID(node.getMessageId());
- node.getRegionDestination().acknowledge(this.getContext(), this, ack, node);
+ Destination regionDestination = (Destination) node.getRegionDestination();
+ regionDestination.acknowledge(this.getContext(), this, ack, node);
}
@Override
@@ -284,7 +285,8 @@ public class DurableTopicSubscription ex
}
protected void acknowledge(ConnectionContext context, MessageAck ack, MessageReference node) throws IOException {
- node.getRegionDestination().acknowledge(context, this, ack, node);
+ Destination regionDestination = (Destination) node.getRegionDestination();
+ regionDestination.acknowledge(context, this, ack, node);
redeliveredMessages.remove(node.getMessageId());
node.decrementReferenceCount();
}
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/IndirectMessageReference.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/IndirectMessageReference.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/IndirectMessageReference.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/IndirectMessageReference.java Wed Nov 7 05:00:17 2012
@@ -114,7 +114,7 @@ public class IndirectMessageReference im
return message.getMessageId();
}
- public Destination getRegionDestination() {
+ public Message.MessageDestination getRegionDestination() {
return message.getRegionDestination();
}
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java Wed Nov 7 05:00:17 2012
@@ -220,7 +220,7 @@ public abstract class PrefetchSubscripti
// Don't remove the nodes until we are committed.
if (!context.isInTransaction()) {
dequeueCounter++;
- node.getRegionDestination().getDestinationStatistics().getInflight().decrement();
+ ((Destination)node.getRegionDestination()).getDestinationStatistics().getInflight().decrement();
removeList.add(node);
} else {
registerRemoveSync(context, node);
@@ -248,7 +248,7 @@ public abstract class PrefetchSubscripti
}
}
}
- destination = node.getRegionDestination();
+ destination = (Destination) node.getRegionDestination();
callDispatchMatched = true;
break;
}
@@ -272,7 +272,7 @@ public abstract class PrefetchSubscripti
// Don't remove the nodes until we are committed - immediateAck option
if (!context.isInTransaction()) {
dequeueCounter++;
- node.getRegionDestination().getDestinationStatistics().getInflight().decrement();
+ ((Destination)node.getRegionDestination()).getDestinationStatistics().getInflight().decrement();
dispatched.remove(node);
} else {
registerRemoveSync(context, node);
@@ -287,7 +287,7 @@ public abstract class PrefetchSubscripti
}
}
acknowledge(context, ack, node);
- destination = node.getRegionDestination();
+ destination = (Destination) node.getRegionDestination();
callDispatchMatched = true;
break;
}
@@ -298,12 +298,14 @@ public abstract class PrefetchSubscripti
int index = 0;
for (Iterator<MessageReference> iter = dispatched.iterator(); iter.hasNext(); index++) {
final MessageReference node = iter.next();
+ Destination nodeDest = (Destination) node.getRegionDestination();
if (node.isExpired()) {
if (broker.isExpired(node)) {
- node.getRegionDestination().messageExpired(context, this, node);
+ Destination regionDestination = (Destination) nodeDest;
+ regionDestination.messageExpired(context, this, node);
}
iter.remove();
- node.getRegionDestination().getDestinationStatistics().getInflight().decrement();
+ nodeDest.getDestinationStatistics().getInflight().decrement();
}
if (ack.getLastMessageId().equals(node.getMessageId())) {
if (usePrefetchExtension) {
@@ -315,7 +317,7 @@ public abstract class PrefetchSubscripti
}
}
}
- destination = node.getRegionDestination();
+ destination = nodeDest;
callDispatchMatched = true;
break;
}
@@ -337,7 +339,7 @@ public abstract class PrefetchSubscripti
}
if (inAckRange) {
if (ack.getLastMessageId().equals(messageId)) {
- destination = node.getRegionDestination();
+ destination = (Destination) node.getRegionDestination();
callDispatchMatched = true;
break;
}
@@ -371,7 +373,8 @@ public abstract class PrefetchSubscripti
ack.getPoisonCause().toString());
}
sendToDLQ(context, node);
- node.getRegionDestination().getDestinationStatistics()
+ Destination nodeDest = (Destination) node.getRegionDestination();
+ nodeDest.getDestinationStatistics()
.getInflight().decrement();
removeList.add(node);
dequeueCounter++;
@@ -385,7 +388,7 @@ public abstract class PrefetchSubscripti
break;
}
}
- destination = node.getRegionDestination();
+ destination = nodeDest;
callDispatchMatched = true;
break;
}
@@ -426,12 +429,13 @@ public abstract class PrefetchSubscripti
@Override
public void afterCommit()
throws Exception {
+ Destination nodeDest = (Destination) node.getRegionDestination();
synchronized(dispatchLock) {
dequeueCounter++;
dispatched.remove(node);
- node.getRegionDestination().getDestinationStatistics().getInflight().decrement();
+ nodeDest.getDestinationStatistics().getInflight().decrement();
}
- node.getRegionDestination().wakeup();
+ nodeDest.wakeup();
dispatchPending();
}
@@ -439,7 +443,7 @@ public abstract class PrefetchSubscripti
public void afterRollback() throws Exception {
synchronized(dispatchLock) {
if (isSlave()) {
- node.getRegionDestination().getDestinationStatistics().getInflight().decrement();
+ ((Destination)node.getRegionDestination()).getDestinationStatistics().getInflight().decrement();
} else {
// poisionAck will decrement - otherwise still inflight on client
}
@@ -637,7 +641,7 @@ public abstract class PrefetchSubscripti
//increment number to dispatch
numberToDispatch++;
if (broker.isExpired(node)) {
- node.getRegionDestination().messageExpired(context, this, node);
+ ((Destination)node.getRegionDestination()).messageExpired(context, this, node);
}
continue;
}
@@ -712,10 +716,11 @@ public abstract class PrefetchSubscripti
}
protected void onDispatch(final MessageReference node, final Message message) {
- if (node.getRegionDestination() != null) {
+ Destination nodeDest = (Destination) node.getRegionDestination();
+ if (nodeDest != null) {
if (node != QueueMessageReference.NULL_MESSAGE) {
- node.getRegionDestination().getDestinationStatistics().getDispatched().increment();
- node.getRegionDestination().getDestinationStatistics().getInflight().increment();
+ nodeDest.getDestinationStatistics().getDispatched().increment();
+ nodeDest.getDestinationStatistics().getInflight().increment();
if (LOG.isTraceEnabled()) {
LOG.trace(info.getConsumerId() + " dispatched: " + message.getMessageId() + " - "
+ message.getDestination() + ", dispatched: " + dispatchCounter + ", inflight: " + dispatched.size());
@@ -759,7 +764,8 @@ public abstract class PrefetchSubscripti
md.setMessage(null);
md.setDestination(null);
} else {
- md.setDestination(node.getRegionDestination().getActiveMQDestination());
+ Destination regionDestination = (Destination) node.getRegionDestination();
+ md.setDestination(regionDestination.getActiveMQDestination());
md.setMessage(message);
md.setRedeliveryCounter(node.getRedeliveryCounter());
}
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueDispatchSelector.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueDispatchSelector.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueDispatchSelector.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueDispatchSelector.java Wed Nov 7 05:00:17 2012
@@ -16,17 +16,8 @@
*/
package org.apache.activemq.broker.region;
-import java.io.IOException;
-import java.util.List;
-
-import javax.jms.JMSException;
-
-import org.apache.activemq.broker.region.group.MessageGroupMap;
import org.apache.activemq.broker.region.policy.SimpleDispatchSelector;
import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.command.ActiveMQMessage;
-import org.apache.activemq.command.ConsumerId;
-import org.apache.activemq.command.Message;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java Wed Nov 7 05:00:17 2012
@@ -45,7 +45,7 @@ public class QueueSubscription extends P
* @throws IOException
*/
protected void acknowledge(final ConnectionContext context, final MessageAck ack, final MessageReference n) throws IOException {
- final Destination q = n.getRegionDestination();
+ final Destination q = (Destination) n.getRegionDestination();
final QueueMessageReference node = (QueueMessageReference)n;
final Queue queue = (Queue)q;
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java Wed Nov 7 05:00:17 2012
@@ -665,7 +665,7 @@ public class RegionBroker extends EmptyB
message.setBrokerOutTime(endTime);
if (getBrokerService().isEnableStatistics()) {
long totalTime = endTime - message.getBrokerInTime();
- message.getRegionDestination().getDestinationStatistics().getProcessTime().addTime(totalTime);
+ ((Destination)message.getRegionDestination()).getDestinationStatistics().getProcessTime().addTime(totalTime);
}
}
}
@@ -805,8 +805,8 @@ public class RegionBroker extends EmptyB
if(node!=null){
Message message=node.getMessage();
if(message!=null && node.getRegionDestination()!=null){
- DeadLetterStrategy deadLetterStrategy=node
- .getRegionDestination().getDeadLetterStrategy();
+ DeadLetterStrategy deadLetterStrategy=((Destination)node
+ .getRegionDestination()).getDeadLetterStrategy();
if(deadLetterStrategy!=null){
if(deadLetterStrategy.isSendToDeadLetterQueue(message)){
// message may be inflight to other subscriptions so do not modify
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java Wed Nov 7 05:00:17 2012
@@ -223,7 +223,7 @@ public class TopicSubscription extends A
matched.remove();
dispatchedCounter.incrementAndGet();
node.decrementReferenceCount();
- node.getRegionDestination().getDestinationStatistics().getExpired().increment();
+ ((Destination)node.getRegionDestination()).getDestinationStatistics().getExpired().increment();
broker.messageExpired(getContext(), node, this);
break;
}
@@ -549,12 +549,12 @@ public class TopicSubscription extends A
md.setMessage(message);
md.setConsumerId(info.getConsumerId());
if (node != null) {
- md.setDestination(node.getRegionDestination().getActiveMQDestination());
+ md.setDestination(((Destination)node.getRegionDestination()).getActiveMQDestination());
dispatchedCounter.incrementAndGet();
// Keep track if this subscription is receiving messages from a single destination.
if (singleDestination) {
if (destination == null) {
- destination = node.getRegionDestination();
+ destination = (Destination)node.getRegionDestination();
} else {
if (destination != node.getRegionDestination()) {
singleDestination = false;
@@ -567,8 +567,9 @@ public class TopicSubscription extends A
md.setTransmitCallback(new Runnable() {
@Override
public void run() {
- node.getRegionDestination().getDestinationStatistics().getDispatched().increment();
- node.getRegionDestination().getDestinationStatistics().getInflight().increment();
+ Destination regionDestination = (Destination) node.getRegionDestination();
+ regionDestination.getDestinationStatistics().getDispatched().increment();
+ regionDestination.getDestinationStatistics().getInflight().increment();
node.decrementReferenceCount();
}
});
@@ -577,8 +578,9 @@ public class TopicSubscription extends A
} else {
context.getConnection().dispatchSync(md);
if (node != null) {
- node.getRegionDestination().getDestinationStatistics().getDispatched().increment();
- node.getRegionDestination().getDestinationStatistics().getInflight().increment();
+ Destination regionDestination = (Destination) node.getRegionDestination();
+ regionDestination.getDestinationStatistics().getDispatched().increment();
+ regionDestination.getDestinationStatistics().getInflight().increment();
node.decrementReferenceCount();
}
}
@@ -594,7 +596,7 @@ public class TopicSubscription extends A
if (LOG.isDebugEnabled()) {
LOG.debug(this + ", discarding message " + message);
}
- Destination dest = message.getRegionDestination();
+ Destination dest = (Destination) message.getRegionDestination();
if (dest != null) {
dest.messageDiscarded(getContext(), this, message);
}
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursor.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursor.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursor.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursor.java Wed Nov 7 05:00:17 2012
@@ -206,7 +206,7 @@ public class FilePendingMessageCursor ex
public synchronized boolean tryAddMessageLast(MessageReference node, long maxWaitTime) throws Exception {
if (!node.isExpired()) {
try {
- regionDestination = node.getMessage().getRegionDestination();
+ regionDestination = (Destination) node.getMessage().getRegionDestination();
if (isDiskListEmpty()) {
if (hasSpace() || this.store == null) {
memoryList.addMessageLast(node);
@@ -254,7 +254,7 @@ public class FilePendingMessageCursor ex
public synchronized void addMessageFirst(MessageReference node) {
if (!node.isExpired()) {
try {
- regionDestination = node.getMessage().getRegionDestination();
+ regionDestination = (Destination) node.getMessage().getRegionDestination();
if (isDiskListEmpty()) {
if (hasSpace()) {
memoryList.addMessageFirst(node);
@@ -473,7 +473,7 @@ public class FilePendingMessageCursor ex
if (broker.isExpired(reference)) {
ConnectionContext context = new ConnectionContext(new NonCachedMessageEvaluationContext());
context.setBroker(broker);
- reference.getRegionDestination().messageExpired(context, null, new IndirectMessageReference(reference.getMessage()));
+ ((Destination)reference.getRegionDestination()).messageExpired(context, null, new IndirectMessageReference(reference.getMessage()));
}
}
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/StoreDurableSubscriberCursor.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/StoreDurableSubscriberCursor.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/StoreDurableSubscriberCursor.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/StoreDurableSubscriberCursor.java Wed Nov 7 05:00:17 2012
@@ -192,7 +192,7 @@ public class StoreDurableSubscriberCurso
}
}
if (msg.isPersistent()) {
- Destination dest = msg.getRegionDestination();
+ Destination dest = (Destination) msg.getRegionDestination();
TopicStorePrefetch tsp = topics.get(dest);
if (tsp != null) {
tsp.addMessageLast(node);
@@ -225,7 +225,7 @@ public class StoreDurableSubscriberCurso
if (!msg.isPersistent()) {
nonPersistent.addMessageFirst(node);
} else {
- Destination dest = msg.getRegionDestination();
+ Destination dest = (Destination) msg.getRegionDestination();
TopicStorePrefetch tsp = topics.get(dest);
if (tsp != null) {
tsp.addMessageFirst(node);
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/AbstractDeadLetterStrategy.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/AbstractDeadLetterStrategy.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/AbstractDeadLetterStrategy.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/AbstractDeadLetterStrategy.java Wed Nov 7 05:00:17 2012
@@ -17,9 +17,6 @@
package org.apache.activemq.broker.region.policy;
import org.apache.activemq.ActiveMQMessageAudit;
-import org.apache.activemq.broker.region.MessageReference;
-import org.apache.activemq.broker.region.Subscription;
-import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.Message;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/DeadLetterStrategy.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/DeadLetterStrategy.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/DeadLetterStrategy.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/DeadLetterStrategy.java Wed Nov 7 05:00:17 2012
@@ -16,7 +16,6 @@
*/
package org.apache.activemq.broker.region.policy;
-import org.apache.activemq.broker.region.MessageReference;
import org.apache.activemq.broker.region.Subscription;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.Message;
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/IndividualDeadLetterStrategy.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/IndividualDeadLetterStrategy.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/IndividualDeadLetterStrategy.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/IndividualDeadLetterStrategy.java Wed Nov 7 05:00:17 2012
@@ -16,6 +16,7 @@
*/
package org.apache.activemq.broker.region.policy;
+import org.apache.activemq.broker.region.Destination;
import org.apache.activemq.broker.region.DurableTopicSubscription;
import org.apache.activemq.broker.region.Subscription;
import org.apache.activemq.command.ActiveMQDestination;
@@ -142,11 +143,12 @@ public class IndividualDeadLetterStrateg
Subscription subscription ) {
String name = null;
- if (message.getRegionDestination() != null
- && message.getRegionDestination().getActiveMQDestination() != null
- && message.getRegionDestination().getActiveMQDestination().getPhysicalName() != null
- && !message.getRegionDestination().getActiveMQDestination().getPhysicalName().isEmpty()){
- name = prefix + message.getRegionDestination().getActiveMQDestination().getPhysicalName();
+ Destination regionDestination = (Destination) message.getRegionDestination();
+ if (regionDestination != null
+ && regionDestination.getActiveMQDestination() != null
+ && regionDestination.getActiveMQDestination().getPhysicalName() != null
+ && !regionDestination.getActiveMQDestination().getPhysicalName().isEmpty()){
+ name = prefix + regionDestination.getActiveMQDestination().getPhysicalName();
} else {
name = prefix + message.getDestination().getPhysicalName();
}
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/UniquePropertyMessageEvictionStrategy.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/UniquePropertyMessageEvictionStrategy.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/UniquePropertyMessageEvictionStrategy.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/UniquePropertyMessageEvictionStrategy.java Wed Nov 7 05:00:17 2012
@@ -21,7 +21,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandAgent.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandAgent.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandAgent.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandAgent.java Wed Nov 7 05:00:17 2012
@@ -28,7 +28,6 @@ import javax.jms.Session;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.Service;
import org.apache.activemq.advisory.AdvisorySupport;
-import org.apache.activemq.util.ServiceStopper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/RedeliveryPlugin.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/RedeliveryPlugin.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/RedeliveryPlugin.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/RedeliveryPlugin.java Wed Nov 7 05:00:17 2012
@@ -23,6 +23,7 @@ import org.apache.activemq.broker.Broker
import org.apache.activemq.broker.BrokerPluginSupport;
import org.apache.activemq.broker.ConnectionContext;
import org.apache.activemq.broker.ProducerBrokerExchange;
+import org.apache.activemq.broker.region.Destination;
import org.apache.activemq.broker.region.MessageReference;
import org.apache.activemq.broker.region.Subscription;
import org.apache.activemq.broker.region.policy.RedeliveryPolicyMap;
@@ -33,7 +34,6 @@ import org.apache.activemq.command.Messa
import org.apache.activemq.command.ProducerInfo;
import org.apache.activemq.filter.AnyDestination;
import org.apache.activemq.state.ProducerState;
-import org.apache.activemq.util.BrokerSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -132,7 +132,8 @@ public class RedeliveryPlugin extends Br
super.sendToDeadLetterQueue(context, messageReference, subscription);
} else {
try {
- final RedeliveryPolicy redeliveryPolicy = redeliveryPolicyMap.getEntryFor(messageReference.getRegionDestination().getActiveMQDestination());
+ Destination regionDestination = (Destination) messageReference.getRegionDestination();
+ final RedeliveryPolicy redeliveryPolicy = redeliveryPolicyMap.getEntryFor(regionDestination.getActiveMQDestination());
if (redeliveryPolicy != null) {
int redeliveryCount = messageReference.getRedeliveryCounter();
if (redeliveryCount < redeliveryPolicy.getMaximumRedeliveries()) {
@@ -150,7 +151,7 @@ public class RedeliveryPlugin extends Br
} else if (isFallbackToDeadLetter()) {
super.sendToDeadLetterQueue(context, messageReference, subscription);
} else {
- LOG.debug("Ignoring dlq request for:" + messageReference.getMessageId() + ", RedeliveryPolicy not found (and no fallback) for: " + messageReference.getRegionDestination().getActiveMQDestination());
+ LOG.debug("Ignoring dlq request for:" + messageReference.getMessageId() + ", RedeliveryPolicy not found (and no fallback) for: " + regionDestination.getActiveMQDestination());
}
} catch (Exception exception) {
// abort the ack, will be effective if client use transactions or individual ack with sync send
@@ -163,8 +164,9 @@ public class RedeliveryPlugin extends Br
private void scheduleRedelivery(ConnectionContext context, MessageReference messageReference, long delay, int redeliveryCount) throws Exception {
if (LOG.isTraceEnabled()) {
+ Destination regionDestination = (Destination) messageReference.getRegionDestination();
LOG.trace("redelivery #" + redeliveryCount + " of: " + messageReference.getMessageId() + " with delay: "
- + delay + ", dest: " + messageReference.getRegionDestination().getActiveMQDestination());
+ + delay + ", dest: " + regionDestination.getActiveMQDestination());
}
final Message old = messageReference.getMessage();
Message message = old.copy();
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/TimeStampingBrokerPlugin.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/TimeStampingBrokerPlugin.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/TimeStampingBrokerPlugin.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/TimeStampingBrokerPlugin.java Wed Nov 7 05:00:17 2012
@@ -18,6 +18,7 @@ package org.apache.activemq.broker.util;
import org.apache.activemq.broker.BrokerPluginSupport;
import org.apache.activemq.broker.ProducerBrokerExchange;
+import org.apache.activemq.broker.region.Destination;
import org.apache.activemq.broker.region.policy.DeadLetterStrategy;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQMessage;
@@ -136,13 +137,14 @@ public class TimeStampingBrokerPlugin ex
DeadLetterStrategy deadLetterStrategy;
Message tmp;
- if (message != null && message.getRegionDestination() != null) {
- deadLetterStrategy = message.getRegionDestination().getDeadLetterStrategy();
+ Destination regionDestination = (Destination) message.getRegionDestination();
+ if (message != null && regionDestination != null) {
+ deadLetterStrategy = regionDestination.getDeadLetterStrategy();
if (deadLetterStrategy != null) {
// Cheap copy, since we only need two fields
tmp = new ActiveMQMessage();
tmp.setDestination(message.getOriginalDestination());
- tmp.setRegionDestination(message.getRegionDestination());
+ tmp.setRegionDestination(regionDestination);
// Determine if we are headed for a DLQ
ActiveMQDestination deadLetterDestination = deadLetterStrategy.getDeadLetterQueueFor(tmp, null);
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/async/ReadOnlyAsyncDataManager.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/async/ReadOnlyAsyncDataManager.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/async/ReadOnlyAsyncDataManager.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/async/ReadOnlyAsyncDataManager.java Wed Nov 7 05:00:17 2012
@@ -23,8 +23,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.activemq.thread.Scheduler;
-import org.apache.activemq.util.ByteSequence;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/ConditionalNetworkBridgeFilterFactory.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/ConditionalNetworkBridgeFilterFactory.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/ConditionalNetworkBridgeFilterFactory.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/ConditionalNetworkBridgeFilterFactory.java Wed Nov 7 05:00:17 2012
@@ -18,6 +18,7 @@ package org.apache.activemq.network;
import java.util.List;
+import org.apache.activemq.broker.region.Destination;
import org.apache.activemq.broker.region.Subscription;
import org.apache.activemq.command.BrokerId;
import org.apache.activemq.command.ConsumerInfo;
@@ -131,7 +132,8 @@ public class ConditionalNetworkBridgeFil
}
private boolean hasNoLocalConsumers(final Message message, final MessageEvaluationContext mec) {
- List<Subscription> consumers = mec.getMessageReference().getRegionDestination().getConsumers();
+ Destination regionDestination = (Destination) mec.getMessageReference().getRegionDestination();
+ List<Subscription> consumers = regionDestination.getConsumers();
for (Subscription sub : consumers) {
if (!sub.getConsumerInfo().isNetworkSubscription() && !sub.getConsumerInfo().isBrowser()) {
if (LOG.isTraceEnabled()) {
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java Wed Nov 7 05:00:17 2012
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.io.RandomAccessFile;
import java.nio.channels.FileLock;
import java.util.Date;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java Wed Nov 7 05:00:17 2012
@@ -40,7 +40,6 @@ import org.apache.activemq.store.Persist
import org.apache.activemq.store.AbstractMessageStore;
import org.apache.activemq.transaction.Synchronization;
import org.apache.activemq.usage.MemoryUsage;
-import org.apache.activemq.usage.SystemUsage;
import org.apache.activemq.util.Callback;
import org.apache.activemq.util.TransactionTemplate;
import org.slf4j.Logger;
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaMessageStore.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaMessageStore.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaMessageStore.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaMessageStore.java Wed Nov 7 05:00:17 2012
@@ -25,10 +25,7 @@ import org.apache.activemq.command.Messa
import org.apache.activemq.kaha.MapContainer;
import org.apache.activemq.kaha.StoreEntry;
import org.apache.activemq.store.MessageRecoveryListener;
-import org.apache.activemq.store.MessageStore;
import org.apache.activemq.store.AbstractMessageStore;
-import org.apache.activemq.usage.MemoryUsage;
-import org.apache.activemq.usage.SystemUsage;
/**
* An implementation of {@link org.apache.activemq.store.MessageStore} which
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/scheduler/JobImpl.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/scheduler/JobImpl.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/scheduler/JobImpl.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/scheduler/JobImpl.java Wed Nov 7 05:00:17 2012
@@ -16,10 +16,6 @@
*/
package org.apache.activemq.store.kahadb.scheduler;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
import org.apache.activemq.broker.scheduler.Job;
import org.apache.activemq.broker.scheduler.JobSupport;
import org.apache.activemq.util.ByteSequence;
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java Wed Nov 7 05:00:17 2012
@@ -29,10 +29,7 @@ import org.apache.activemq.command.Messa
import org.apache.activemq.command.MessageAck;
import org.apache.activemq.command.MessageId;
import org.apache.activemq.store.MessageRecoveryListener;
-import org.apache.activemq.store.MessageStore;
import org.apache.activemq.store.AbstractMessageStore;
-import org.apache.activemq.usage.MemoryUsage;
-import org.apache.activemq.usage.SystemUsage;
/**
* An implementation of {@link org.apache.activemq.store.MessageStore} which
Added: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportFactorySupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportFactorySupport.java?rev=1406466&view=auto
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportFactorySupport.java (added)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportFactorySupport.java Wed Nov 7 05:00:17 2012
@@ -0,0 +1,30 @@
+package org.apache.activemq.transport;
+
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.BrokerServiceAware;
+import org.apache.activemq.broker.SslContext;
+
+import java.io.IOException;
+import java.net.URI;
+
+/**
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
+ */
+public class TransportFactorySupport {
+
+ public static TransportServer bind(BrokerService brokerService, URI location) throws IOException {
+ TransportFactory tf = TransportFactory.findTransportFactory(location);
+ if( brokerService!=null && tf instanceof BrokerServiceAware) {
+ ((BrokerServiceAware)tf).setBrokerService(brokerService);
+ }
+ try {
+ if( brokerService!=null ) {
+ SslContext.setCurrentSslContext(brokerService.getSslContext());
+ }
+ return tf.doBind(location);
+ } finally {
+ SslContext.setCurrentSslContext(null);
+ }
+ }
+
+}
Added: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerFactorySPI.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerFactorySPI.java?rev=1406466&view=auto
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerFactorySPI.java (added)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerFactorySPI.java Wed Nov 7 05:00:17 2012
@@ -0,0 +1,20 @@
+package org.apache.activemq.transport;
+
+import org.apache.activemq.TransportLoggerSupport;
+
+import java.io.IOException;
+
+/**
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
+ */
+public class TransportLoggerFactorySPI implements TransportLoggerSupport.SPI {
+ @Override
+ public Transport createTransportLogger(Transport transport) throws IOException {
+ return TransportLoggerFactory.getInstance().createTransportLogger(transport);
+ }
+
+ @Override
+ public Transport createTransportLogger(Transport transport, String logWriterName, boolean dynamicManagement, boolean startLogging, int jmxPort) throws IOException {
+ return TransportLoggerFactory.getInstance().createTransportLogger(transport, logWriterName, dynamicManagement, startLogging, jmxPort);
+ }
+}
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerView.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerView.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerView.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportLoggerView.java Wed Nov 7 05:00:17 2012
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
*
* @author David Martin Clavo david(dot)martin(dot)clavo(at)gmail.com
*
- * @see TransportLoggerViewMBean.
+ * @see TransportLoggerViewMBean
*/
public class TransportLoggerView implements TransportLoggerViewMBean {
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/RemoveDestinationTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/RemoveDestinationTest.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/RemoveDestinationTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/RemoveDestinationTest.java Wed Nov 7 05:00:17 2012
@@ -28,7 +28,6 @@ import javax.jms.Topic;
import javax.jms.TextMessage;
import javax.management.ObjectName;
-import org.apache.activemq.ActiveMQConnection;
import org.apache.activemq.advisory.DestinationSource;
import org.apache.activemq.broker.BrokerFactory;
import org.apache.activemq.broker.BrokerService;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/advisory/ConsumerListenerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/advisory/ConsumerListenerTest.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/advisory/ConsumerListenerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/advisory/ConsumerListenerTest.java Wed Nov 7 05:00:17 2012
@@ -28,7 +28,6 @@ import javax.jms.MessageListener;
import javax.jms.Session;
import org.apache.activemq.EmbeddedBrokerTestSupport;
-import org.apache.activemq.ReconnectWithSameClientIDTest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/Main.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/Main.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/Main.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/Main.java Wed Nov 7 05:00:17 2012
@@ -17,7 +17,6 @@
package org.apache.activemq.broker;
import javax.jms.Connection;
-import javax.jms.MessageConsumer;
import javax.jms.Session;
import org.apache.activemq.ActiveMQConnectionFactory;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/advisory/AdvisoryBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/advisory/AdvisoryBrokerTest.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/advisory/AdvisoryBrokerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/advisory/AdvisoryBrokerTest.java Wed Nov 7 05:00:17 2012
@@ -30,10 +30,6 @@ import org.apache.activemq.command.Produ
import org.apache.activemq.command.RemoveInfo;
import org.apache.activemq.command.SessionInfo;
-import javax.management.remote.JMXConnector;
-import javax.management.remote.JMXConnectorFactory;
-import javax.management.remote.JMXServiceURL;
-
public class AdvisoryBrokerTest extends BrokerTestSupport {
public void testConnectionAdvisories() throws Exception {
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/advisory/AdvisoryJmxTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/advisory/AdvisoryJmxTest.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/advisory/AdvisoryJmxTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/advisory/AdvisoryJmxTest.java Wed Nov 7 05:00:17 2012
@@ -16,12 +16,10 @@
*/
package org.apache.activemq.broker.advisory;
-import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.EmbeddedBrokerTestSupport;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.jmx.BrokerViewMBean;
import org.apache.activemq.broker.jmx.ManagementContext;
-import org.apache.activemq.broker.jmx.QueueViewMBean;
import org.apache.activemq.command.ActiveMQMessage;
import org.apache.activemq.command.DestinationInfo;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/NoConsumerDeadLetterTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/NoConsumerDeadLetterTest.java?rev=1406466&r1=1406465&r2=1406466&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/NoConsumerDeadLetterTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/NoConsumerDeadLetterTest.java Wed Nov 7 05:00:17 2012
@@ -32,7 +32,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.ActiveMQDestination;
-import org.apache.activemq.command.ActiveMQQueue;
/**
*