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 2009/06/10 15:02:56 UTC
svn commit: r783344 - in /activemq/sandbox/activemq-flow:
activemq-broker/src/main/java/org/apache/activemq/
activemq-broker/src/main/java/org/apache/activemq/apollo/
activemq-broker/src/main/java/org/apache/activemq/apollo/broker/
activemq-broker/src/...
Author: chirino
Date: Wed Jun 10 13:02:54 2009
New Revision: 783344
URL: http://svn.apache.org/viewvc?rev=783344&view=rev
Log:
refactoring the new bits into the apollo package
Added:
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/Connection.java
- copied, changed from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/Connection.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/WindowLimiter.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerConnection.java
- copied, changed from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerConnection.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerDatabase.java
- copied, changed from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerDatabase.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerMessageDelivery.java
- copied, changed from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerMessageDelivery.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerQueueStore.java
- copied, changed from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerQueueStore.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerSubscription.java
- copied, changed from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerSubscription.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/DeliveryTarget.java
- copied, changed from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/DeliveryTarget.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Destination.java
- copied, changed from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Destination.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Domain.java
- copied, changed from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Domain.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/DurableSubscription.java
- copied, changed from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/DurableSubscription.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/MessageBroker.java
- copied, changed from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/MessageBroker.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/MessageDelivery.java
- copied, changed from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/MessageDelivery.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/MessageDeliveryWrapper.java
- copied, changed from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/MessageDeliveryWrapper.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/MultiSubscription.java
- copied, changed from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/MultiSubscription.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Queue.java
- copied, changed from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Queue.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/QueueDomain.java
- copied, changed from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/QueueDomain.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Router.java
- copied, changed from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Router.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/TopicDomain.java
- copied, changed from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/TopicDomain.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/TopicSubscription.java
- copied, changed from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/TopicSubscription.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/VirtualHost.java
- copied, changed from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/VirtualHost.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/db/
- copied from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/db/
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/protocol/
- copied from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/protocol/
Removed:
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/Connection.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/WindowLimiter.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerConnection.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerDatabase.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerMessageDelivery.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerQueueStore.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerSubscription.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/DeliveryTarget.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Destination.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Domain.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/DurableSubscription.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/MessageBroker.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/MessageDelivery.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/MessageDeliveryWrapper.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/MultiSubscription.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Queue.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/QueueDomain.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Router.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/TopicDomain.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/TopicSubscription.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/VirtualHost.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/db/
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/protocol/
Modified:
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/protocol/ProtocolHandler.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/protocol/ProtocolHandlerFactory.java
activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/broker/BrokerTestBase.java
activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/broker/RemoteConsumer.java
activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/broker/RemoteProducer.java
activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java
activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenWireMessageDelivery.java
activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireProtocolHandler.java
activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/broker/SharedQueuePerfTest.java
activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/broker/stomp/FrameTranslator.java
activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/broker/stomp/LegacyFrameTranslator.java
activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/broker/stomp/StompMessageDelivery.java
activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/broker/stomp/StompProtocolHandler.java
activemq/sandbox/activemq-flow/activemq-stomp/src/test/java/org/apache/activemq/broker/openwire/stomp/StompRemoteConsumer.java
activemq/sandbox/activemq-flow/activemq-stomp/src/test/java/org/apache/activemq/broker/openwire/stomp/StompRemoteProducer.java
Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/Connection.java (from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/Connection.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/Connection.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/Connection.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/Connection.java&r1=783335&r2=783344&rev=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/Connection.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/Connection.java Wed Jun 10 13:02:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq;
+package org.apache.activemq.apollo;
import java.beans.ExceptionListener;
import java.io.IOException;
Added: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/WindowLimiter.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/WindowLimiter.java?rev=783344&view=auto
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/WindowLimiter.java (added)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/WindowLimiter.java Wed Jun 10 13:02:54 2009
@@ -0,0 +1,60 @@
+/**
+ *
+ */
+package org.apache.activemq.apollo;
+
+import org.apache.activemq.apollo.broker.MessageDelivery;
+import org.apache.activemq.flow.Flow;
+import org.apache.activemq.flow.SizeLimiter;
+
+public class WindowLimiter<E extends MessageDelivery> extends SizeLimiter<E> {
+ final Flow flow;
+ final boolean clientMode;
+ private int available;
+
+ public WindowLimiter(boolean clientMode, Flow flow, int capacity, int resumeThreshold) {
+ super(capacity, resumeThreshold);
+ this.clientMode = clientMode;
+ this.flow = flow;
+ }
+
+ @Override
+ public void reserve(E elem) {
+ super.reserve(elem);
+// if (!clientMode) {
+// System.out.println(name + " Reserved " + this);
+// }
+ }
+
+ /*
+ public void releaseReserved(E elem) {
+ super.reserve(elem);
+// if (!clientMode) {
+// System.out.println(name + " Released Reserved " + this);
+// }
+ }*/
+
+ @Override
+ public void remove(int count, long size) {
+ super.remove(count, size);
+ if (!clientMode) {
+ available += size;
+ if (available >= capacity - resumeThreshold) {
+ sendCredit(available);
+ available = 0;
+ }
+ }
+ }
+
+ protected void sendCredit(int credit) {
+ throw new UnsupportedOperationException("Please override this method to provide and implemenation.");
+ }
+
+ public void onProtocolCredit(int credit) {
+ remove(1, credit);
+ }
+
+ public int getElementSize(E m) {
+ return m.getFlowLimiterSize();
+ }
+ }
\ No newline at end of file
Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerConnection.java (from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerConnection.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerConnection.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerConnection.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerConnection.java&r1=783335&r2=783344&rev=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerConnection.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerConnection.java Wed Jun 10 13:02:54 2009
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.broker;
+package org.apache.activemq.apollo.broker;
import java.beans.ExceptionListener;
-import org.apache.activemq.Connection;
-import org.apache.activemq.broker.protocol.ProtocolHandler;
-import org.apache.activemq.broker.protocol.ProtocolHandlerFactory;
+import org.apache.activemq.apollo.Connection;
+import org.apache.activemq.apollo.broker.protocol.ProtocolHandler;
+import org.apache.activemq.apollo.broker.protocol.ProtocolHandlerFactory;
import org.apache.activemq.util.IOExceptionSupport;
import org.apache.activemq.wireformat.MultiWireFormatFactory.WireFormatConnected;
Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerDatabase.java (from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerDatabase.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerDatabase.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerDatabase.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerDatabase.java&r1=783335&r2=783344&rev=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerDatabase.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerDatabase.java Wed Jun 10 13:02:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.broker;
+package org.apache.activemq.apollo.broker;
import java.io.IOException;
import java.util.ArrayList;
@@ -27,8 +27,8 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.activemq.broker.protocol.ProtocolHandler;
-import org.apache.activemq.broker.protocol.ProtocolHandlerFactory;
+import org.apache.activemq.apollo.broker.protocol.ProtocolHandler;
+import org.apache.activemq.apollo.broker.protocol.ProtocolHandlerFactory;
import org.apache.activemq.broker.store.Store;
import org.apache.activemq.broker.store.Store.Callback;
import org.apache.activemq.broker.store.Store.FatalStoreException;
Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerMessageDelivery.java (from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerMessageDelivery.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerMessageDelivery.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerMessageDelivery.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerMessageDelivery.java&r1=783335&r2=783344&rev=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerMessageDelivery.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerMessageDelivery.java Wed Jun 10 13:02:54 2009
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.broker;
+package org.apache.activemq.apollo.broker;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
-import org.apache.activemq.broker.BrokerDatabase.OperationContext;
+import org.apache.activemq.apollo.broker.BrokerDatabase.OperationContext;
import org.apache.activemq.broker.store.Store.MessageRecord;
import org.apache.activemq.flow.ISourceController;
import org.apache.activemq.queue.QueueDescriptor;
Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerQueueStore.java (from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerQueueStore.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerQueueStore.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerQueueStore.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerQueueStore.java&r1=783335&r2=783344&rev=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerQueueStore.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerQueueStore.java Wed Jun 10 13:02:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.broker;
+package org.apache.activemq.apollo.broker;
import java.io.IOException;
import java.util.ArrayList;
Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerSubscription.java (from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerSubscription.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerSubscription.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerSubscription.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerSubscription.java&r1=783335&r2=783344&rev=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerSubscription.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerSubscription.java Wed Jun 10 13:02:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.broker;
+package org.apache.activemq.apollo.broker;
import org.apache.activemq.queue.Subscription;
Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/DeliveryTarget.java (from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/DeliveryTarget.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/DeliveryTarget.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/DeliveryTarget.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/DeliveryTarget.java&r1=783335&r2=783344&rev=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/DeliveryTarget.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/DeliveryTarget.java Wed Jun 10 13:02:54 2009
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.broker;
+package org.apache.activemq.apollo.broker;
-import org.apache.activemq.broker.MessageDelivery;
+import org.apache.activemq.apollo.broker.MessageDelivery;
import org.apache.activemq.flow.ISourceController;
public interface DeliveryTarget {
Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Destination.java (from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Destination.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Destination.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Destination.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Destination.java&r1=783335&r2=783344&rev=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Destination.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Destination.java Wed Jun 10 13:02:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.broker;
+package org.apache.activemq.apollo.broker;
import java.util.Collection;
import java.util.HashSet;
Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Domain.java (from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Domain.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Domain.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Domain.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Domain.java&r1=783335&r2=783344&rev=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Domain.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Domain.java Wed Jun 10 13:02:54 2009
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.broker;
+package org.apache.activemq.apollo.broker;
import java.util.Collection;
-import org.apache.activemq.broker.DeliveryTarget;
-import org.apache.activemq.broker.MessageDelivery;
+import org.apache.activemq.apollo.broker.DeliveryTarget;
+import org.apache.activemq.apollo.broker.MessageDelivery;
import org.apache.activemq.protobuf.AsciiBuffer;
/**
Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/DurableSubscription.java (from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/DurableSubscription.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/DurableSubscription.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/DurableSubscription.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/DurableSubscription.java&r1=783335&r2=783344&rev=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/DurableSubscription.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/DurableSubscription.java Wed Jun 10 13:02:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.broker;
+package org.apache.activemq.apollo.broker;
import org.apache.activemq.filter.BooleanExpression;
import org.apache.activemq.filter.FilterException;
Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/MessageBroker.java (from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/MessageBroker.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/MessageBroker.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/MessageBroker.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/MessageBroker.java&r1=783335&r2=783344&rev=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/MessageBroker.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/MessageBroker.java Wed Jun 10 13:02:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.broker;
+package org.apache.activemq.apollo.broker;
import java.net.URI;
import java.util.ArrayList;
@@ -22,7 +22,7 @@
import java.util.LinkedHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.activemq.Connection;
+import org.apache.activemq.apollo.Connection;
import org.apache.activemq.broker.store.Store;
import org.apache.activemq.dispatch.IDispatcher;
import org.apache.activemq.protobuf.AsciiBuffer;
Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/MessageDelivery.java (from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/MessageDelivery.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/MessageDelivery.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/MessageDelivery.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/MessageDelivery.java&r1=783335&r2=783344&rev=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/MessageDelivery.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/MessageDelivery.java Wed Jun 10 13:02:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.broker;
+package org.apache.activemq.apollo.broker;
import org.apache.activemq.broker.store.Store;
import org.apache.activemq.filter.MessageEvaluationContext;
Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/MessageDeliveryWrapper.java (from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/MessageDeliveryWrapper.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/MessageDeliveryWrapper.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/MessageDeliveryWrapper.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/MessageDeliveryWrapper.java&r1=783335&r2=783344&rev=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/MessageDeliveryWrapper.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/MessageDeliveryWrapper.java Wed Jun 10 13:02:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.broker;
+package org.apache.activemq.apollo.broker;
import org.apache.activemq.broker.store.Store.MessageRecord;
import org.apache.activemq.filter.MessageEvaluationContext;
@@ -35,7 +35,7 @@
/**
* (non-Javadoc)
*
- * @see org.apache.activemq.broker.MessageDelivery#persist(org.apache.activemq.queue.QueueStore.SaveableQueueElement,
+ * @see org.apache.activemq.apollo.broker.MessageDelivery#persist(org.apache.activemq.apollo.queue.QueueStore.SaveableQueueElement,
* org.apache.activemq.flow.ISourceController, boolean)
*/
public void acknowledge(QueueDescriptor queue) {
@@ -45,7 +45,7 @@
/**
* (non-Javadoc)
*
- * @see org.apache.activemq.broker.MessageDelivery#persist(org.apache.activemq.queue.QueueStore.SaveableQueueElement,
+ * @see org.apache.activemq.apollo.broker.MessageDelivery#persist(org.apache.activemq.apollo.queue.QueueStore.SaveableQueueElement,
* org.apache.activemq.flow.ISourceController, boolean)
*/
public <T> T asType(Class<T> type) {
@@ -55,7 +55,7 @@
/**
* (non-Javadoc)
*
- * @see org.apache.activemq.broker.MessageDelivery#persist(org.apache.activemq.queue.QueueStore.SaveableQueueElement,
+ * @see org.apache.activemq.apollo.broker.MessageDelivery#persist(org.apache.activemq.apollo.queue.QueueStore.SaveableQueueElement,
* org.apache.activemq.flow.ISourceController, boolean)
*/
public MessageRecord createMessageRecord() {
@@ -65,7 +65,7 @@
/**
* (non-Javadoc)
*
- * @see org.apache.activemq.broker.MessageDelivery#persist(org.apache.activemq.queue.QueueStore.SaveableQueueElement,
+ * @see org.apache.activemq.apollo.broker.MessageDelivery#persist(org.apache.activemq.apollo.queue.QueueStore.SaveableQueueElement,
* org.apache.activemq.flow.ISourceController, boolean)
*/
public Destination getDestination() {
@@ -75,7 +75,7 @@
/**
* (non-Javadoc)
*
- * @see org.apache.activemq.broker.MessageDelivery#persist(org.apache.activemq.queue.QueueStore.SaveableQueueElement,
+ * @see org.apache.activemq.apollo.broker.MessageDelivery#persist(org.apache.activemq.apollo.queue.QueueStore.SaveableQueueElement,
* org.apache.activemq.flow.ISourceController, boolean)
*/
public int getFlowLimiterSize() {
@@ -85,7 +85,7 @@
/**
* (non-Javadoc)
*
- * @see org.apache.activemq.broker.MessageDelivery#persist(org.apache.activemq.queue.QueueStore.SaveableQueueElement,
+ * @see org.apache.activemq.apollo.broker.MessageDelivery#persist(org.apache.activemq.apollo.queue.QueueStore.SaveableQueueElement,
* org.apache.activemq.flow.ISourceController, boolean)
*/
public AsciiBuffer getMsgId() {
@@ -95,7 +95,7 @@
/**
* (non-Javadoc)
*
- * @see org.apache.activemq.broker.MessageDelivery#persist(org.apache.activemq.queue.QueueStore.SaveableQueueElement,
+ * @see org.apache.activemq.apollo.broker.MessageDelivery#persist(org.apache.activemq.apollo.queue.QueueStore.SaveableQueueElement,
* org.apache.activemq.flow.ISourceController, boolean)
*/
public int getPriority() {
@@ -105,7 +105,7 @@
/**
* (non-Javadoc)
*
- * @see org.apache.activemq.broker.MessageDelivery#persist(org.apache.activemq.queue.QueueStore.SaveableQueueElement,
+ * @see org.apache.activemq.apollo.broker.MessageDelivery#persist(org.apache.activemq.apollo.queue.QueueStore.SaveableQueueElement,
* org.apache.activemq.flow.ISourceController, boolean)
*/
public AsciiBuffer getProducerId() {
@@ -115,7 +115,7 @@
/**
* (non-Javadoc)
*
- * @see org.apache.activemq.broker.MessageDelivery#persist(org.apache.activemq.queue.QueueStore.SaveableQueueElement,
+ * @see org.apache.activemq.apollo.broker.MessageDelivery#persist(org.apache.activemq.apollo.queue.QueueStore.SaveableQueueElement,
* org.apache.activemq.flow.ISourceController, boolean)
*/
public long getStoreTracking() {
@@ -125,7 +125,7 @@
/**
* (non-Javadoc)
*
- * @see org.apache.activemq.broker.MessageDelivery#persist(org.apache.activemq.queue.QueueStore.SaveableQueueElement,
+ * @see org.apache.activemq.apollo.broker.MessageDelivery#persist(org.apache.activemq.apollo.queue.QueueStore.SaveableQueueElement,
* org.apache.activemq.flow.ISourceController, boolean)
*/
public Buffer getTransactionId() {
@@ -135,7 +135,7 @@
/**
* (non-Javadoc)
*
- * @see org.apache.activemq.broker.MessageDelivery#persist(org.apache.activemq.queue.QueueStore.SaveableQueueElement,
+ * @see org.apache.activemq.apollo.broker.MessageDelivery#persist(org.apache.activemq.apollo.queue.QueueStore.SaveableQueueElement,
* org.apache.activemq.flow.ISourceController, boolean)
*/
public boolean isFromStore() {
@@ -145,7 +145,7 @@
/**
* (non-Javadoc)
*
- * @see org.apache.activemq.broker.MessageDelivery#persist(org.apache.activemq.queue.QueueStore.SaveableQueueElement,
+ * @see org.apache.activemq.apollo.broker.MessageDelivery#persist(org.apache.activemq.apollo.queue.QueueStore.SaveableQueueElement,
* org.apache.activemq.flow.ISourceController, boolean)
*/
public boolean isPersistent() {
@@ -154,7 +154,7 @@
/** (non-Javadoc)
- * @see org.apache.activemq.broker.MessageDelivery#getExpiration()
+ * @see org.apache.activemq.apollo.broker.MessageDelivery#getExpiration()
*/
public long getExpiration() {
return delegate.getExpiration();
@@ -163,7 +163,7 @@
/**
* (non-Javadoc)
*
- * @see org.apache.activemq.broker.MessageDelivery#persist(org.apache.activemq.queue.QueueStore.SaveableQueueElement,
+ * @see org.apache.activemq.apollo.broker.MessageDelivery#persist(org.apache.activemq.apollo.queue.QueueStore.SaveableQueueElement,
* org.apache.activemq.flow.ISourceController, boolean)
*/
public boolean isResponseRequired() {
@@ -173,7 +173,7 @@
/**
* (non-Javadoc)
*
- * @see org.apache.activemq.broker.MessageDelivery#persist(org.apache.activemq.queue.QueueStore.SaveableQueueElement,
+ * @see org.apache.activemq.apollo.broker.MessageDelivery#persist(org.apache.activemq.apollo.queue.QueueStore.SaveableQueueElement,
* org.apache.activemq.flow.ISourceController, boolean)
*/
public void onMessagePersisted() {
@@ -183,7 +183,7 @@
/**
* (non-Javadoc)
*
- * @see org.apache.activemq.broker.MessageDelivery#persist(org.apache.activemq.queue.QueueStore.SaveableQueueElement,
+ * @see org.apache.activemq.apollo.broker.MessageDelivery#persist(org.apache.activemq.apollo.queue.QueueStore.SaveableQueueElement,
* org.apache.activemq.flow.ISourceController, boolean)
*/
public void persist(SaveableQueueElement<MessageDelivery> elem, ISourceController<?> controller, boolean delayable) {
@@ -197,7 +197,7 @@
/**
* (non-Javadoc)
*
- * @see org.apache.activemq.broker.MessageDelivery#persist(org.apache.activemq.queue.QueueStore.SaveableQueueElement,
+ * @see org.apache.activemq.apollo.broker.MessageDelivery#persist(org.apache.activemq.apollo.queue.QueueStore.SaveableQueueElement,
* org.apache.activemq.flow.ISourceController, boolean)
*/
MessageDeliveryWrapper(MessageDelivery delivery) {
Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/MultiSubscription.java (from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/MultiSubscription.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/MultiSubscription.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/MultiSubscription.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/MultiSubscription.java&r1=783335&r2=783344&rev=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/MultiSubscription.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/MultiSubscription.java Wed Jun 10 13:02:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.broker;
+package org.apache.activemq.apollo.broker;
import org.apache.activemq.filter.BooleanExpression;
import org.apache.activemq.filter.FilterException;
Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Queue.java (from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Queue.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Queue.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Queue.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Queue.java&r1=783335&r2=783344&rev=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Queue.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Queue.java Wed Jun 10 13:02:54 2009
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.broker;
+package org.apache.activemq.apollo.broker;
-import org.apache.activemq.broker.DeliveryTarget;
-import org.apache.activemq.broker.Destination;
-import org.apache.activemq.broker.MessageDelivery;
+import org.apache.activemq.apollo.broker.DeliveryTarget;
+import org.apache.activemq.apollo.broker.Destination;
+import org.apache.activemq.apollo.broker.MessageDelivery;
import org.apache.activemq.flow.ISourceController;
import org.apache.activemq.queue.IQueue;
import org.apache.activemq.queue.Subscription;
Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/QueueDomain.java (from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/QueueDomain.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/QueueDomain.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/QueueDomain.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/QueueDomain.java&r1=783335&r2=783344&rev=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/QueueDomain.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/QueueDomain.java Wed Jun 10 13:02:54 2009
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.broker;
+package org.apache.activemq.apollo.broker;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
-import org.apache.activemq.broker.DeliveryTarget;
-import org.apache.activemq.broker.Domain;
-import org.apache.activemq.broker.MessageDelivery;
-import org.apache.activemq.broker.Queue;
+import org.apache.activemq.apollo.broker.DeliveryTarget;
+import org.apache.activemq.apollo.broker.Domain;
+import org.apache.activemq.apollo.broker.MessageDelivery;
+import org.apache.activemq.apollo.broker.Queue;
import org.apache.activemq.protobuf.AsciiBuffer;
public class QueueDomain implements Domain {
Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Router.java (from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Router.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Router.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Router.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Router.java&r1=783335&r2=783344&rev=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Router.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Router.java Wed Jun 10 13:02:54 2009
@@ -14,19 +14,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.broker;
+package org.apache.activemq.apollo.broker;
import java.io.IOException;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
-import org.apache.activemq.broker.DeliveryTarget;
-import org.apache.activemq.broker.Destination;
-import org.apache.activemq.broker.Domain;
-import org.apache.activemq.broker.MessageDelivery;
-import org.apache.activemq.broker.QueueDomain;
-import org.apache.activemq.broker.TopicDomain;
+import org.apache.activemq.apollo.broker.DeliveryTarget;
+import org.apache.activemq.apollo.broker.Destination;
+import org.apache.activemq.apollo.broker.Domain;
+import org.apache.activemq.apollo.broker.MessageDelivery;
+import org.apache.activemq.apollo.broker.QueueDomain;
+import org.apache.activemq.apollo.broker.TopicDomain;
import org.apache.activemq.flow.ISourceController;
import org.apache.activemq.protobuf.AsciiBuffer;
Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/TopicDomain.java (from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/TopicDomain.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/TopicDomain.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/TopicDomain.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/TopicDomain.java&r1=783335&r2=783344&rev=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/TopicDomain.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/TopicDomain.java Wed Jun 10 13:02:54 2009
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.broker;
+package org.apache.activemq.apollo.broker;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
-import org.apache.activemq.broker.DeliveryTarget;
-import org.apache.activemq.broker.Domain;
-import org.apache.activemq.broker.MessageDelivery;
+import org.apache.activemq.apollo.broker.DeliveryTarget;
+import org.apache.activemq.apollo.broker.Domain;
+import org.apache.activemq.apollo.broker.MessageDelivery;
import org.apache.activemq.protobuf.AsciiBuffer;
public class TopicDomain implements Domain {
Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/TopicSubscription.java (from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/TopicSubscription.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/TopicSubscription.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/TopicSubscription.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/TopicSubscription.java&r1=783335&r2=783344&rev=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/TopicSubscription.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/TopicSubscription.java Wed Jun 10 13:02:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.broker;
+package org.apache.activemq.apollo.broker;
import org.apache.activemq.filter.BooleanExpression;
import org.apache.activemq.filter.FilterException;
Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/VirtualHost.java (from r783335, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/VirtualHost.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/VirtualHost.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/VirtualHost.java&p1=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/VirtualHost.java&r1=783335&r2=783344&rev=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/VirtualHost.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/VirtualHost.java Wed Jun 10 13:02:54 2009
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.broker;
+package org.apache.activemq.apollo.broker;
import java.util.ArrayList;
import java.util.HashMap;
import org.apache.activemq.Service;
-import org.apache.activemq.broker.protocol.ProtocolHandler.ConsumerContext;
+import org.apache.activemq.apollo.broker.protocol.ProtocolHandler.ConsumerContext;
import org.apache.activemq.protobuf.AsciiBuffer;
import org.apache.activemq.queue.AbstractFlowQueue;
import org.apache.activemq.queue.ExclusivePersistentQueue;
Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/protocol/ProtocolHandler.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/protocol/ProtocolHandler.java?rev=783344&r1=783335&r2=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/protocol/ProtocolHandler.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/protocol/ProtocolHandler.java Wed Jun 10 13:02:54 2009
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.broker.protocol;
+package org.apache.activemq.apollo.broker.protocol;
import java.io.IOException;
import org.apache.activemq.Service;
-import org.apache.activemq.broker.BrokerConnection;
-import org.apache.activemq.broker.BrokerMessageDelivery;
-import org.apache.activemq.broker.Destination;
-import org.apache.activemq.broker.MessageDelivery;
+import org.apache.activemq.apollo.broker.BrokerConnection;
+import org.apache.activemq.apollo.broker.BrokerMessageDelivery;
+import org.apache.activemq.apollo.broker.Destination;
+import org.apache.activemq.apollo.broker.MessageDelivery;
import org.apache.activemq.broker.store.Store.MessageRecord;
import org.apache.activemq.filter.BooleanExpression;
import org.apache.activemq.flow.IFlowSink;
Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/protocol/ProtocolHandlerFactory.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/protocol/ProtocolHandlerFactory.java?rev=783344&r1=783335&r2=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/protocol/ProtocolHandlerFactory.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/protocol/ProtocolHandlerFactory.java Wed Jun 10 13:02:54 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.broker.protocol;
+package org.apache.activemq.apollo.broker.protocol;
import java.io.IOException;
Modified: activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/broker/BrokerTestBase.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/broker/BrokerTestBase.java?rev=783344&r1=783343&r2=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/broker/BrokerTestBase.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/broker/BrokerTestBase.java Wed Jun 10 13:02:54 2009
@@ -27,9 +27,9 @@
import junit.framework.TestCase;
-import org.apache.activemq.broker.Destination;
-import org.apache.activemq.broker.MessageBroker;
-import org.apache.activemq.broker.Router;
+import org.apache.activemq.apollo.broker.Destination;
+import org.apache.activemq.apollo.broker.MessageBroker;
+import org.apache.activemq.apollo.broker.Router;
import org.apache.activemq.broker.store.Store;
import org.apache.activemq.broker.store.StoreFactory;
import org.apache.activemq.dispatch.IDispatcher;
Modified: activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/broker/RemoteConsumer.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/broker/RemoteConsumer.java?rev=783344&r1=783343&r2=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/broker/RemoteConsumer.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/broker/RemoteConsumer.java Wed Jun 10 13:02:54 2009
@@ -3,9 +3,9 @@
import java.net.URI;
import java.util.concurrent.TimeUnit;
-import org.apache.activemq.Connection;
-import org.apache.activemq.broker.Destination;
-import org.apache.activemq.broker.MessageDelivery;
+import org.apache.activemq.apollo.Connection;
+import org.apache.activemq.apollo.broker.Destination;
+import org.apache.activemq.apollo.broker.MessageDelivery;
import org.apache.activemq.flow.ISourceController;
import org.apache.activemq.metric.MetricAggregator;
import org.apache.activemq.metric.MetricCounter;
Modified: activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/broker/RemoteProducer.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/broker/RemoteProducer.java?rev=783344&r1=783343&r2=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/broker/RemoteProducer.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/broker/RemoteProducer.java Wed Jun 10 13:02:54 2009
@@ -3,9 +3,9 @@
import java.net.URI;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.activemq.Connection;
-import org.apache.activemq.broker.Destination;
-import org.apache.activemq.broker.MessageDelivery;
+import org.apache.activemq.apollo.Connection;
+import org.apache.activemq.apollo.broker.Destination;
+import org.apache.activemq.apollo.broker.MessageDelivery;
import org.apache.activemq.dispatch.IDispatcher.DispatchContext;
import org.apache.activemq.dispatch.IDispatcher.Dispatchable;
import org.apache.activemq.flow.IFlowController;
Modified: activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java?rev=783344&r1=783343&r2=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java Wed Jun 10 13:02:54 2009
@@ -19,6 +19,10 @@
import java.io.File;
import java.util.ArrayList;
+import org.apache.activemq.apollo.broker.BrokerDatabase;
+import org.apache.activemq.apollo.broker.BrokerQueueStore;
+import org.apache.activemq.apollo.broker.MessageBroker;
+import org.apache.activemq.apollo.broker.MessageDelivery;
import org.apache.activemq.broker.store.Store;
import org.apache.activemq.broker.store.StoreFactory;
import org.apache.activemq.dispatch.IDispatcher;
Modified: activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenWireMessageDelivery.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenWireMessageDelivery.java?rev=783344&r1=783343&r2=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenWireMessageDelivery.java (original)
+++ activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenWireMessageDelivery.java Wed Jun 10 13:02:54 2009
@@ -18,8 +18,8 @@
import java.io.IOException;
-import org.apache.activemq.broker.BrokerMessageDelivery;
-import org.apache.activemq.broker.Destination;
+import org.apache.activemq.apollo.broker.BrokerMessageDelivery;
+import org.apache.activemq.apollo.broker.Destination;
import org.apache.activemq.broker.store.Store.MessageRecord;
import org.apache.activemq.command.Message;
import org.apache.activemq.filter.MessageEvaluationContext;
Modified: activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireProtocolHandler.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireProtocolHandler.java?rev=783344&r1=783343&r2=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireProtocolHandler.java (original)
+++ activemq/sandbox/activemq-flow/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireProtocolHandler.java Wed Jun 10 13:02:54 2009
@@ -21,17 +21,17 @@
import java.util.HashMap;
import java.util.LinkedList;
-import org.apache.activemq.WindowLimiter;
-import org.apache.activemq.broker.BrokerConnection;
-import org.apache.activemq.broker.BrokerMessageDelivery;
-import org.apache.activemq.broker.BrokerSubscription;
-import org.apache.activemq.broker.Destination;
-import org.apache.activemq.broker.MessageDelivery;
-import org.apache.activemq.broker.Router;
-import org.apache.activemq.broker.VirtualHost;
-import org.apache.activemq.broker.BrokerSubscription.UserAlreadyConnectedException;
+import org.apache.activemq.apollo.WindowLimiter;
+import org.apache.activemq.apollo.broker.BrokerConnection;
+import org.apache.activemq.apollo.broker.BrokerMessageDelivery;
+import org.apache.activemq.apollo.broker.BrokerSubscription;
+import org.apache.activemq.apollo.broker.Destination;
+import org.apache.activemq.apollo.broker.MessageDelivery;
+import org.apache.activemq.apollo.broker.Router;
+import org.apache.activemq.apollo.broker.VirtualHost;
+import org.apache.activemq.apollo.broker.BrokerSubscription.UserAlreadyConnectedException;
+import org.apache.activemq.apollo.broker.protocol.ProtocolHandler;
import org.apache.activemq.broker.openwire.OpenWireMessageDelivery.PersistListener;
-import org.apache.activemq.broker.protocol.ProtocolHandler;
import org.apache.activemq.broker.store.Store.MessageRecord;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.BrokerId;
Modified: activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/broker/SharedQueuePerfTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/broker/SharedQueuePerfTest.java?rev=783344&r1=783343&r2=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/broker/SharedQueuePerfTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/broker/SharedQueuePerfTest.java Wed Jun 10 13:02:54 2009
@@ -24,6 +24,10 @@
import javax.jms.JMSException;
+import org.apache.activemq.apollo.broker.BrokerDatabase;
+import org.apache.activemq.apollo.broker.BrokerQueueStore;
+import org.apache.activemq.apollo.broker.MessageBroker;
+import org.apache.activemq.apollo.broker.MessageDelivery;
import org.apache.activemq.broker.openwire.OpenWireMessageDelivery;
import org.apache.activemq.broker.store.Store;
import org.apache.activemq.broker.store.StoreFactory;
Modified: activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/broker/stomp/FrameTranslator.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/broker/stomp/FrameTranslator.java?rev=783344&r1=783343&r2=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/broker/stomp/FrameTranslator.java (original)
+++ activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/broker/stomp/FrameTranslator.java Wed Jun 10 13:02:54 2009
@@ -22,7 +22,7 @@
import javax.jms.JMSException;
-import org.apache.activemq.broker.Destination;
+import org.apache.activemq.apollo.broker.Destination;
import org.apache.activemq.broker.stomp.FrameTranslator;
import org.apache.activemq.broker.stomp.StompProtocolHandler;
import org.apache.activemq.command.ActiveMQDestination;
Modified: activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/broker/stomp/LegacyFrameTranslator.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/broker/stomp/LegacyFrameTranslator.java?rev=783344&r1=783343&r2=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/broker/stomp/LegacyFrameTranslator.java (original)
+++ activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/broker/stomp/LegacyFrameTranslator.java Wed Jun 10 13:02:54 2009
@@ -22,8 +22,8 @@
import javax.jms.JMSException;
-import org.apache.activemq.broker.Destination;
-import org.apache.activemq.broker.Router;
+import org.apache.activemq.apollo.broker.Destination;
+import org.apache.activemq.apollo.broker.Router;
import org.apache.activemq.broker.stomp.FrameTranslator;
import org.apache.activemq.broker.stomp.StompProtocolHandler;
import org.apache.activemq.command.ActiveMQBytesMessage;
Modified: activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/broker/stomp/StompMessageDelivery.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/broker/stomp/StompMessageDelivery.java?rev=783344&r1=783343&r2=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/broker/stomp/StompMessageDelivery.java (original)
+++ activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/broker/stomp/StompMessageDelivery.java Wed Jun 10 13:02:54 2009
@@ -16,8 +16,8 @@
*/
package org.apache.activemq.broker.stomp;
-import org.apache.activemq.broker.BrokerMessageDelivery;
-import org.apache.activemq.broker.Destination;
+import org.apache.activemq.apollo.broker.BrokerMessageDelivery;
+import org.apache.activemq.apollo.broker.Destination;
import org.apache.activemq.broker.store.Store.MessageRecord;
import org.apache.activemq.filter.MessageEvaluationContext;
import org.apache.activemq.protobuf.AsciiBuffer;
Modified: activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/broker/stomp/StompProtocolHandler.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/broker/stomp/StompProtocolHandler.java?rev=783344&r1=783343&r2=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/broker/stomp/StompProtocolHandler.java (original)
+++ activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/broker/stomp/StompProtocolHandler.java Wed Jun 10 13:02:54 2009
@@ -26,14 +26,14 @@
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.activemq.WindowLimiter;
-import org.apache.activemq.broker.BrokerConnection;
-import org.apache.activemq.broker.BrokerMessageDelivery;
-import org.apache.activemq.broker.BrokerSubscription;
-import org.apache.activemq.broker.Destination;
-import org.apache.activemq.broker.MessageDelivery;
-import org.apache.activemq.broker.Router;
-import org.apache.activemq.broker.protocol.ProtocolHandler;
+import org.apache.activemq.apollo.WindowLimiter;
+import org.apache.activemq.apollo.broker.BrokerConnection;
+import org.apache.activemq.apollo.broker.BrokerMessageDelivery;
+import org.apache.activemq.apollo.broker.BrokerSubscription;
+import org.apache.activemq.apollo.broker.Destination;
+import org.apache.activemq.apollo.broker.MessageDelivery;
+import org.apache.activemq.apollo.broker.Router;
+import org.apache.activemq.apollo.broker.protocol.ProtocolHandler;
import org.apache.activemq.broker.store.Store.MessageRecord;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.filter.BooleanExpression;
Modified: activemq/sandbox/activemq-flow/activemq-stomp/src/test/java/org/apache/activemq/broker/openwire/stomp/StompRemoteConsumer.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-stomp/src/test/java/org/apache/activemq/broker/openwire/stomp/StompRemoteConsumer.java?rev=783344&r1=783343&r2=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-stomp/src/test/java/org/apache/activemq/broker/openwire/stomp/StompRemoteConsumer.java (original)
+++ activemq/sandbox/activemq-flow/activemq-stomp/src/test/java/org/apache/activemq/broker/openwire/stomp/StompRemoteConsumer.java Wed Jun 10 13:02:54 2009
@@ -3,9 +3,9 @@
import java.io.IOException;
import java.util.HashMap;
-import org.apache.activemq.broker.MessageDelivery;
+import org.apache.activemq.apollo.broker.MessageDelivery;
+import org.apache.activemq.apollo.broker.Router;
import org.apache.activemq.broker.RemoteConsumer;
-import org.apache.activemq.broker.Router;
import org.apache.activemq.broker.stomp.StompMessageDelivery;
import org.apache.activemq.flow.Flow;
import org.apache.activemq.flow.FlowController;
Modified: activemq/sandbox/activemq-flow/activemq-stomp/src/test/java/org/apache/activemq/broker/openwire/stomp/StompRemoteProducer.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-stomp/src/test/java/org/apache/activemq/broker/openwire/stomp/StompRemoteProducer.java?rev=783344&r1=783343&r2=783344&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-stomp/src/test/java/org/apache/activemq/broker/openwire/stomp/StompRemoteProducer.java (original)
+++ activemq/sandbox/activemq-flow/activemq-stomp/src/test/java/org/apache/activemq/broker/openwire/stomp/StompRemoteProducer.java Wed Jun 10 13:02:54 2009
@@ -3,9 +3,9 @@
import java.io.IOException;
import java.util.HashMap;
-import org.apache.activemq.broker.MessageDelivery;
+import org.apache.activemq.apollo.broker.MessageDelivery;
+import org.apache.activemq.apollo.broker.Router;
import org.apache.activemq.broker.RemoteProducer;
-import org.apache.activemq.broker.Router;
import org.apache.activemq.broker.stomp.StompMessageDelivery;
import org.apache.activemq.flow.Flow;
import org.apache.activemq.flow.ISourceController;