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/12/06 18:27:50 UTC
svn commit: r887719 - in /activemq/sandbox/activemq-apollo-actor:
activemq-broker/src/main/java/org/apache/activemq/apollo/broker/
activemq-broker/src/test/java/org/apache/activemq/broker/
activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/...
Author: chirino
Date: Sun Dec 6 17:27:48 2009
New Revision: 887719
URL: http://svn.apache.org/viewvc?rev=887719&view=rev
Log:
better Dispatcher config/factory setup.
Added:
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatcherConfig.java
Removed:
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatcherFactory.java
Modified:
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Broker.java
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/BrokerTestBase.java
activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSystem.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Dispatcher.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatcher.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleDispatcher.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/DispatchSystemTest.java
activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/internal/advanced/DispatcherPoolTest.java
activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/DispatcherXml.java
activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java
activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBroker.java
activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBrokerTest.java
activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockClient.java
Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Broker.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Broker.java?rev=887719&r1=887718&r2=887719&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Broker.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Broker.java Sun Dec 6 17:27:48 2009
@@ -26,7 +26,7 @@
import org.apache.activemq.Service;
import org.apache.activemq.apollo.Connection;
import org.apache.activemq.dispatch.Dispatcher;
-import org.apache.activemq.dispatch.DispatcherFactory;
+import org.apache.activemq.dispatch.DispatcherConfig;
import org.apache.activemq.dispatch.DispatcherAware;
import org.apache.activemq.transport.Transport;
import org.apache.activemq.transport.TransportAcceptListener;
@@ -129,7 +129,7 @@
// apply some default configuration to this broker instance before it's started.
if( dispatcher == null ) {
int threads = Runtime.getRuntime().availableProcessors();
- dispatcher = DispatcherFactory.create(getName(), threads);
+ dispatcher = DispatcherConfig.create(getName(), threads);
}
Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/BrokerTestBase.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/BrokerTestBase.java?rev=887719&r1=887718&r2=887719&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/BrokerTestBase.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/BrokerTestBase.java Sun Dec 6 17:27:48 2009
@@ -31,7 +31,7 @@
import org.apache.activemq.broker.store.Store;
import org.apache.activemq.broker.store.StoreFactory;
import org.apache.activemq.dispatch.Dispatcher;
-import org.apache.activemq.dispatch.DispatcherFactory;
+import org.apache.activemq.dispatch.DispatcherConfig;
import org.apache.activemq.metric.MetricAggregator;
import org.apache.activemq.metric.Period;
import org.apache.activemq.transport.TransportFactory;
@@ -135,7 +135,7 @@
protected abstract String getRemoteWireFormat();
protected Dispatcher createDispatcher() {
- return DispatcherFactory.create("test", asyncThreadPoolSize);
+ return DispatcherConfig.create("test", asyncThreadPoolSize);
}
@Test
Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java?rev=887719&r1=887718&r2=887719&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java Sun Dec 6 17:27:48 2009
@@ -27,7 +27,7 @@
import org.apache.activemq.broker.store.Store;
import org.apache.activemq.broker.store.StoreFactory;
import org.apache.activemq.dispatch.Dispatcher;
-import org.apache.activemq.dispatch.DispatcherFactory;
+import org.apache.activemq.dispatch.DispatcherConfig;
import org.apache.activemq.queue.IQueue;
/**
@@ -47,7 +47,7 @@
protected ArrayList<IQueue<Long, MessageDelivery>> queues = new ArrayList<IQueue<Long, MessageDelivery>>();
protected Dispatcher createDispatcher() {
- return DispatcherFactory.create("test", Runtime.getRuntime().availableProcessors());
+ return DispatcherConfig.create("test", Runtime.getRuntime().availableProcessors());
}
protected int consumerStartDelay = 0;
Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSystem.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSystem.java?rev=887719&r1=887718&r2=887719&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSystem.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatchSystem.java Sun Dec 6 17:27:48 2009
@@ -18,8 +18,6 @@
import java.nio.channels.SelectableChannel;
-import org.apache.activemq.dispatch.internal.simple.SimpleDispatcher;
-
/**
*
* @author <a href="http://hiramchirino.com">Hiram Chirino</a>
@@ -29,7 +27,7 @@
final private static Dispatcher dispatcher = create();
private static Dispatcher create() {
- return new SimpleDispatcher("system", Runtime.getRuntime().availableProcessors());
+ return new DispatcherConfig().createDispatcher();
}
static DispatchQueue getMainQueue() {
Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Dispatcher.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Dispatcher.java?rev=887719&r1=887718&r2=887719&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Dispatcher.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/Dispatcher.java Sun Dec 6 17:27:48 2009
@@ -21,7 +21,7 @@
public interface Dispatcher extends Retained {
-
+
public DispatchQueue getGlobalQueue();
public DispatchQueue getGlobalQueue(DispatchPriority priority);
@@ -33,5 +33,6 @@
public DispatchQueue getCurrentQueue();
public DispatchSource createSource(SelectableChannel channel, int interestOps, DispatchQueue queue);
+
}
\ No newline at end of file
Added: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatcherConfig.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatcherConfig.java?rev=887719&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatcherConfig.java (added)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/DispatcherConfig.java Sun Dec 6 17:27:48 2009
@@ -0,0 +1,67 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.dispatch;
+
+import org.apache.activemq.dispatch.internal.advanced.DispatchObserver;
+import org.apache.activemq.dispatch.internal.simple.SimpleDispatcher;
+
+/**
+ *
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
+ */
+public class DispatcherConfig {
+
+ private String label="default";
+ private int threads=Runtime.getRuntime().availableProcessors();
+ private DispatchObserver observer;
+
+ public static Dispatcher create(String name, int threads) {
+ DispatcherConfig config = new DispatcherConfig();
+ config.label=name;
+ config.threads=threads;
+ return config.createDispatcher();
+ }
+
+ public Dispatcher createDispatcher() {
+ return new SimpleDispatcher(this);
+ }
+
+ public String getLabel() {
+ return label;
+ }
+
+ public void setLabel(String name) {
+ this.label = name;
+ }
+
+ public int getThreads() {
+ return threads;
+ }
+
+ public void setThreads(int threads) {
+ this.threads = threads;
+ }
+
+ public DispatchObserver getObserver() {
+ return observer;
+ }
+
+ public void setObserver(DispatchObserver observer) {
+ this.observer = observer;
+ }
+
+}
Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatcher.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatcher.java?rev=887719&r1=887718&r2=887719&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatcher.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/advanced/AdvancedDispatcher.java Sun Dec 6 17:27:48 2009
@@ -28,6 +28,7 @@
import org.apache.activemq.dispatch.DispatchPriority;
import org.apache.activemq.dispatch.DispatchQueue;
import org.apache.activemq.dispatch.DispatchSource;
+import org.apache.activemq.dispatch.DispatcherConfig;
import org.apache.activemq.dispatch.internal.BaseRetained;
import org.apache.activemq.dispatch.internal.SerialDispatchQueue;
@@ -50,15 +51,13 @@
protected LoadBalancer loadBalancer;
- public AdvancedDispatcher(int size, int numPriorities) {
- this.size = size;
- this.numPriorities = numPriorities;
-
+ public AdvancedDispatcher(DispatcherConfig config) {
+ this.size = config.getThreads();
+ this.numPriorities = 3;
globalQueues = new GlobalDispatchQueue[3];
for (int i = 0; i < 3; i++) {
globalQueues[i] = new GlobalDispatchQueue(this, DispatchPriority.values()[i]);
}
-
loadBalancer = new SimpleLoadBalancer();
}
Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleDispatcher.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleDispatcher.java?rev=887719&r1=887718&r2=887719&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleDispatcher.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/main/java/org/apache/activemq/dispatch/internal/simple/SimpleDispatcher.java Sun Dec 6 17:27:48 2009
@@ -26,6 +26,7 @@
import org.apache.activemq.dispatch.DispatchPriority;
import org.apache.activemq.dispatch.Dispatcher;
import org.apache.activemq.dispatch.DispatchSource;
+import org.apache.activemq.dispatch.DispatcherConfig;
import org.apache.activemq.dispatch.internal.BaseRetained;
import org.apache.activemq.dispatch.internal.SerialDispatchQueue;
@@ -52,13 +53,13 @@
private final String label;
TimerThread timerThread;
- public SimpleDispatcher(String label, int size) {
- this.label = label;
+ public SimpleDispatcher(DispatcherConfig config) {
+ this.label = config.getLabel();
globalQueues = new GlobalDispatchQueue[3];
for (int i = 0; i < 3; i++) {
globalQueues[i] = new GlobalDispatchQueue(this, DispatchPriority.values()[i] );
}
- dispatchers = new DispatcherThread[size];
+ dispatchers = new DispatcherThread[config.getThreads()];
}
public DispatchQueue getMainQueue() {
Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java?rev=887719&r1=887718&r2=887719&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/actor/ActorTest.java Sun Dec 6 17:27:48 2009
@@ -14,6 +14,7 @@
import org.apache.activemq.dispatch.DispatchQueue;
import org.apache.activemq.dispatch.Dispatcher;
+import org.apache.activemq.dispatch.DispatcherConfig;
import org.apache.activemq.dispatch.internal.advanced.AdvancedDispatcher;
@@ -45,7 +46,7 @@
public void testActorInvocation() throws Exception
{
- Dispatcher advancedSystem = new AdvancedDispatcher(Runtime.getRuntime().availableProcessors(), 3);
+ Dispatcher advancedSystem = new AdvancedDispatcher(new DispatcherConfig());
advancedSystem.retain();
DispatchQueue queue = advancedSystem.createSerialQueue("test");
Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/DispatchSystemTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/DispatchSystemTest.java?rev=887719&r1=887718&r2=887719&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/DispatchSystemTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/DispatchSystemTest.java Sun Dec 6 17:27:48 2009
@@ -33,7 +33,7 @@
public class DispatchSystemTest {
public static void main(String[] args) throws Exception {
- Dispatcher advancedSystem = new AdvancedDispatcher(Runtime.getRuntime().availableProcessors(), 3);
+ Dispatcher advancedSystem = new AdvancedDispatcher(new DispatcherConfig());
advancedSystem.retain();
benchmark("advanced global queue", advancedSystem, advancedSystem.getGlobalQueue(DEFAULT));
benchmark("advanced private serial queue", advancedSystem, advancedSystem.createSerialQueue("test"));
@@ -43,7 +43,7 @@
advancedSystem.release();
latch.await();
- Dispatcher simpleSystem = new SimpleDispatcher("test", Runtime.getRuntime().availableProcessors());
+ Dispatcher simpleSystem = new SimpleDispatcher(new DispatcherConfig());
simpleSystem.retain();
benchmark("simple global queue", simpleSystem, simpleSystem.getGlobalQueue(DEFAULT));
Modified: activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/internal/advanced/DispatcherPoolTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/internal/advanced/DispatcherPoolTest.java?rev=887719&r1=887718&r2=887719&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/internal/advanced/DispatcherPoolTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-dispatcher/src/test/java/org/apache/activemq/dispatch/internal/advanced/DispatcherPoolTest.java Sun Dec 6 17:27:48 2009
@@ -19,6 +19,7 @@
import java.util.concurrent.CountDownLatch;
import org.apache.activemq.dispatch.DispatchQueue;
+import org.apache.activemq.dispatch.DispatcherConfig;
import static java.lang.String.*;
@@ -30,7 +31,7 @@
public class DispatcherPoolTest {
public static void main(String[] args) throws Exception {
- AdvancedDispatcher dispatcher = new AdvancedDispatcher(Runtime.getRuntime().availableProcessors(), 3);
+ AdvancedDispatcher dispatcher = new AdvancedDispatcher(new DispatcherConfig());
dispatcher.retain();
// warm the JIT up..
Modified: activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/DispatcherXml.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/DispatcherXml.java?rev=887719&r1=887718&r2=887719&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/DispatcherXml.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/DispatcherXml.java Sun Dec 6 17:27:48 2009
@@ -23,7 +23,7 @@
import org.apache.activemq.apollo.broker.Broker;
import org.apache.activemq.dispatch.Dispatcher;
-import org.apache.activemq.dispatch.DispatcherFactory;
+import org.apache.activemq.dispatch.DispatcherConfig;
@XmlRootElement(name="dispatcher")
@XmlAccessorType(XmlAccessType.FIELD)
@@ -40,7 +40,7 @@
if( name == null ) {
name = "broker";
}
- return DispatcherFactory.create(name, threads);
+ return DispatcherConfig.create(name, threads);
}
}
Modified: activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java?rev=887719&r1=887718&r2=887719&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java Sun Dec 6 17:27:48 2009
@@ -41,7 +41,7 @@
import org.apache.activemq.dispatch.Dispatcher;
import org.apache.activemq.dispatch.DispatchPriority;
import org.apache.activemq.dispatch.DispatchQueue;
-import org.apache.activemq.dispatch.DispatcherFactory;
+import org.apache.activemq.dispatch.DispatcherConfig;
import org.apache.activemq.flow.AbstractLimitedFlowResource;
import org.apache.activemq.flow.Flow;
import org.apache.activemq.flow.FlowController;
@@ -83,7 +83,7 @@
protected ArrayList<IQueue<Long, MessageDelivery>> queues = new ArrayList<IQueue<Long, MessageDelivery>>();
protected Dispatcher createDispatcher() {
- return DispatcherFactory.create("pref-test", THREAD_POOL_SIZE);
+ return DispatcherConfig.create("pref-test", THREAD_POOL_SIZE);
}
protected int consumerStartDelay = 0;
Modified: activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBroker.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBroker.java?rev=887719&r1=887718&r2=887719&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBroker.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBroker.java Sun Dec 6 17:27:48 2009
@@ -22,7 +22,7 @@
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.activemq.dispatch.Dispatcher;
-import org.apache.activemq.dispatch.DispatcherFactory;
+import org.apache.activemq.dispatch.DispatcherConfig;
import org.apache.activemq.dispatch.DispatcherAware;
import org.apache.activemq.flow.IFlowSink;
import org.apache.activemq.flow.Commands.Destination;
@@ -189,7 +189,7 @@
protected void createDispatcher() {
if (dispatcher == null) {
- dispatcher = DispatcherFactory.create("mock-broker", Runtime.getRuntime().availableProcessors());
+ dispatcher = DispatcherConfig.create("mock-broker", Runtime.getRuntime().availableProcessors());
}
}
Modified: activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBrokerTest.java?rev=887719&r1=887718&r2=887719&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBrokerTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBrokerTest.java Sun Dec 6 17:27:48 2009
@@ -21,7 +21,7 @@
import junit.framework.TestCase;
import org.apache.activemq.dispatch.Dispatcher;
-import org.apache.activemq.dispatch.DispatcherFactory;
+import org.apache.activemq.dispatch.DispatcherConfig;
import org.apache.activemq.flow.Commands.Destination;
import org.apache.activemq.flow.Commands.Destination.DestinationBean;
import org.apache.activemq.flow.Commands.Destination.DestinationBuffer;
@@ -95,7 +95,7 @@
}
protected Dispatcher createDispatcher(String name) {
- return DispatcherFactory.create("test", threadsPerDispatcher);
+ return DispatcherConfig.create("test", threadsPerDispatcher);
}
public void test_1_1_0() throws Exception {
Modified: activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockClient.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockClient.java?rev=887719&r1=887718&r2=887719&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockClient.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockClient.java Sun Dec 6 17:27:48 2009
@@ -8,7 +8,7 @@
import java.util.concurrent.atomic.AtomicLong;
import org.apache.activemq.dispatch.Dispatcher;
-import org.apache.activemq.dispatch.DispatcherFactory;
+import org.apache.activemq.dispatch.DispatcherConfig;
import org.apache.activemq.flow.Commands.Destination;
import org.apache.activemq.flow.Commands.Destination.DestinationBean;
import org.apache.activemq.flow.Commands.Destination.DestinationBuffer;
@@ -280,7 +280,7 @@
protected Dispatcher createDispatcher() {
if (dispatcher == null) {
- dispatcher = DispatcherFactory.create("client", threadsPerDispatcher);
+ dispatcher = DispatcherConfig.create("client", threadsPerDispatcher);
}
return dispatcher;
}