DUBBO-568 - 配置项dispather单词拼写错误。

springpear · Aug 15, 2012 · 220aa6d · 220aa6d
1 parent 788f373
commit 220aa6d
Show file tree

Hide file tree

Showing 22 changed files with 47 additions and 46 deletions.
diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Dispatcher.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Dispatcher.java
@@ -19,7 +19,7 @@
 import com.alibaba.dubbo.common.URL;
 import com.alibaba.dubbo.common.extension.Adaptive;
 import com.alibaba.dubbo.common.extension.SPI;
-import com.alibaba.dubbo.remoting.transport.dispather.all.AllDispather;
+import com.alibaba.dubbo.remoting.transport.dispatcher.all.AllDispather;
 
 /**
  * ChannelHandlerWrapper (SPI, Singleton, ThreadSafe)
@@ -30,13 +30,13 @@
 public interface Dispatcher {
 
     /**
-     * dispath.
+     * dispatch the message to threadpool.
      * 
      * @param handler
      * @param url
      * @return channel handler
      */
     @Adaptive({Constants.DISPATCHER_KEY, "dispather", "channel.handler"}) // 后两个参数为兼容旧配置
-    ChannelHandler dispath(ChannelHandler handler, URL url);
+    ChannelHandler dispatch(ChannelHandler handler, URL url);
 
 }
diff --git a/...dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractClient.java b/...dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractClient.java
@@ -40,7 +40,7 @@
 import com.alibaba.dubbo.remoting.ChannelHandler;
 import com.alibaba.dubbo.remoting.Client;
 import com.alibaba.dubbo.remoting.RemotingException;
-import com.alibaba.dubbo.remoting.transport.dispather.ChannelHandlers;
+import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelHandlers;
 
 /**
  * AbstractClient

diff --git a/...dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractServer.java b/...dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractServer.java
@@ -30,7 +30,7 @@
 import com.alibaba.dubbo.remoting.ChannelHandler;
 import com.alibaba.dubbo.remoting.RemotingException;
 import com.alibaba.dubbo.remoting.Server;
-import com.alibaba.dubbo.remoting.transport.dispather.WrappedChannelHandler;
+import com.alibaba.dubbo.remoting.transport.dispatcher.WrappedChannelHandler;
 
 /**
  * AbstractServer

diff --git a/...sport/dispather/ChannelEventRunnable.java → ...port/dispatcher/ChannelEventRunnable.java b/...sport/dispather/ChannelEventRunnable.java → ...port/dispatcher/ChannelEventRunnable.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.dubbo.remoting.transport.dispather;
+package com.alibaba.dubbo.remoting.transport.dispatcher;
 
 import com.alibaba.dubbo.common.logger.Logger;
 import com.alibaba.dubbo.common.logger.LoggerFactory;

diff --git a/.../transport/dispather/ChannelHandlers.java → ...transport/dispatcher/ChannelHandlers.java b/.../transport/dispather/ChannelHandlers.java → ...transport/dispatcher/ChannelHandlers.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.dubbo.remoting.transport.dispather;
+package com.alibaba.dubbo.remoting.transport.dispatcher;
 
 
 import com.alibaba.dubbo.common.URL;
@@ -37,7 +37,7 @@ protected ChannelHandlers() {}
 
     protected ChannelHandler wrapInternal(ChannelHandler handler, URL url) {
         return new MultiMessageHandler(new HeartbeatHandler(ExtensionLoader.getExtensionLoader(Dispatcher.class)
-                                        .getAdaptiveExtension().dispath(handler, url)));
+                                        .getAdaptiveExtension().dispatch(handler, url)));
     }
 
     private static ChannelHandlers INSTANCE = new ChannelHandlers();

diff --git a/...port/dispather/WrappedChannelHandler.java → ...ort/dispatcher/WrappedChannelHandler.java b/...port/dispather/WrappedChannelHandler.java → ...ort/dispatcher/WrappedChannelHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.dubbo.remoting.transport.dispather;
+package com.alibaba.dubbo.remoting.transport.dispatcher;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;

diff --git a/...port/dispather/all/AllChannelHandler.java → ...ort/dispatcher/all/AllChannelHandler.java b/...port/dispather/all/AllChannelHandler.java → ...ort/dispatcher/all/AllChannelHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.dubbo.remoting.transport.dispather.all;
+package com.alibaba.dubbo.remoting.transport.dispatcher.all;
 
 import java.util.concurrent.ExecutorService;
 
@@ -22,9 +22,9 @@
 import com.alibaba.dubbo.remoting.ChannelHandler;
 import com.alibaba.dubbo.remoting.ExecutionException;
 import com.alibaba.dubbo.remoting.RemotingException;
-import com.alibaba.dubbo.remoting.transport.dispather.ChannelEventRunnable;
-import com.alibaba.dubbo.remoting.transport.dispather.ChannelEventRunnable.ChannelState;
-import com.alibaba.dubbo.remoting.transport.dispather.WrappedChannelHandler;
+import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelEventRunnable;
+import com.alibaba.dubbo.remoting.transport.dispatcher.WrappedChannelHandler;
+import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelEventRunnable.ChannelState;
 
 public class AllChannelHandler extends WrappedChannelHandler {
 

diff --git a/...transport/dispather/all/AllDispather.java → ...ransport/dispatcher/all/AllDispather.java b/...transport/dispather/all/AllDispather.java → ...ransport/dispatcher/all/AllDispather.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.dubbo.remoting.transport.dispather.all;
+package com.alibaba.dubbo.remoting.transport.dispatcher.all;
 
 import com.alibaba.dubbo.common.URL;
 import com.alibaba.dubbo.remoting.ChannelHandler;
@@ -28,7 +28,7 @@ public class AllDispather implements Dispatcher {
 
     public static final String NAME = "all";
 
-    public ChannelHandler dispath(ChannelHandler handler, URL url) {
+    public ChannelHandler dispatch(ChannelHandler handler, URL url) {
         return new AllChannelHandler(handler, url);
     }
 

diff --git a/...tion/ConnectionOrderedChannelHandler.java → ...tion/ConnectionOrderedChannelHandler.java b/...tion/ConnectionOrderedChannelHandler.java → ...tion/ConnectionOrderedChannelHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.dubbo.remoting.transport.dispather.connection;
+package com.alibaba.dubbo.remoting.transport.dispatcher.connection;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -28,9 +28,9 @@
 import com.alibaba.dubbo.remoting.ChannelHandler;
 import com.alibaba.dubbo.remoting.ExecutionException;
 import com.alibaba.dubbo.remoting.RemotingException;
-import com.alibaba.dubbo.remoting.transport.dispather.ChannelEventRunnable;
-import com.alibaba.dubbo.remoting.transport.dispather.ChannelEventRunnable.ChannelState;
-import com.alibaba.dubbo.remoting.transport.dispather.WrappedChannelHandler;
+import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelEventRunnable;
+import com.alibaba.dubbo.remoting.transport.dispatcher.WrappedChannelHandler;
+import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelEventRunnable.ChannelState;
 
 public class ConnectionOrderedChannelHandler extends WrappedChannelHandler {
 

diff --git a/...onnection/ConnectionOrderedDispather.java → ...onnection/ConnectionOrderedDispather.java b/...onnection/ConnectionOrderedDispather.java → ...onnection/ConnectionOrderedDispather.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.dubbo.remoting.transport.dispather.connection;
+package com.alibaba.dubbo.remoting.transport.dispatcher.connection;
 
 import com.alibaba.dubbo.common.URL;
 import com.alibaba.dubbo.remoting.ChannelHandler;
@@ -28,7 +28,7 @@ public class ConnectionOrderedDispather implements Dispatcher {
 
     public static final String NAME = "connection";
 
-    public ChannelHandler dispath(ChannelHandler handler, URL url) {
+    public ChannelHandler dispatch(ChannelHandler handler, URL url) {
         return new ConnectionOrderedChannelHandler(handler, url);
     }
 

diff --git a/...ort/dispather/direct/DirectDispather.java → ...rt/dispatcher/direct/DirectDispather.java b/...ort/dispather/direct/DirectDispather.java → ...rt/dispatcher/direct/DirectDispather.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.dubbo.remoting.transport.dispather.direct;
+package com.alibaba.dubbo.remoting.transport.dispatcher.direct;
 
 import com.alibaba.dubbo.common.URL;
 import com.alibaba.dubbo.remoting.ChannelHandler;
@@ -28,7 +28,7 @@ public class DirectDispather implements Dispatcher {
 
     public static final String NAME = "direct";
 
-    public ChannelHandler dispath(ChannelHandler handler, URL url) {
+    public ChannelHandler dispatch(ChannelHandler handler, URL url) {
         return handler;
     }
 

diff --git a/...er/execution/ExecutionChannelHandler.java → ...er/execution/ExecutionChannelHandler.java b/...er/execution/ExecutionChannelHandler.java → ...er/execution/ExecutionChannelHandler.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.dubbo.remoting.transport.dispather.execution;
+package com.alibaba.dubbo.remoting.transport.dispatcher.execution;
 
 import com.alibaba.dubbo.common.URL;
 import com.alibaba.dubbo.remoting.Channel;
 import com.alibaba.dubbo.remoting.ChannelHandler;
 import com.alibaba.dubbo.remoting.RemotingException;
-import com.alibaba.dubbo.remoting.transport.dispather.ChannelEventRunnable;
-import com.alibaba.dubbo.remoting.transport.dispather.ChannelEventRunnable.ChannelState;
-import com.alibaba.dubbo.remoting.transport.dispather.WrappedChannelHandler;
+import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelEventRunnable;
+import com.alibaba.dubbo.remoting.transport.dispatcher.WrappedChannelHandler;
+import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelEventRunnable.ChannelState;
 
 public class ExecutionChannelHandler extends WrappedChannelHandler {
 

diff --git a/...spather/execution/ExecutionDispather.java → ...patcher/execution/ExecutionDispather.java b/...spather/execution/ExecutionDispather.java → ...patcher/execution/ExecutionDispather.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.dubbo.remoting.transport.dispather.execution;
+package com.alibaba.dubbo.remoting.transport.dispatcher.execution;
 
 import com.alibaba.dubbo.common.URL;
 import com.alibaba.dubbo.remoting.ChannelHandler;
@@ -28,7 +28,7 @@ public class ExecutionDispather implements Dispatcher {
 
     public static final String NAME = "execution";
 
-    public ChannelHandler dispath(ChannelHandler handler, URL url) {
+    public ChannelHandler dispatch(ChannelHandler handler, URL url) {
         return new ExecutionChannelHandler(handler, url);
     }
 

diff --git a/...er/message/MessageOnlyChannelHandler.java → ...er/message/MessageOnlyChannelHandler.java b/...er/message/MessageOnlyChannelHandler.java → ...er/message/MessageOnlyChannelHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.dubbo.remoting.transport.dispather.message;
+package com.alibaba.dubbo.remoting.transport.dispatcher.message;
 
 import java.util.concurrent.ExecutorService;
 
@@ -22,9 +22,9 @@
 import com.alibaba.dubbo.remoting.ChannelHandler;
 import com.alibaba.dubbo.remoting.ExecutionException;
 import com.alibaba.dubbo.remoting.RemotingException;
-import com.alibaba.dubbo.remoting.transport.dispather.ChannelEventRunnable;
-import com.alibaba.dubbo.remoting.transport.dispather.ChannelEventRunnable.ChannelState;
-import com.alibaba.dubbo.remoting.transport.dispather.WrappedChannelHandler;
+import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelEventRunnable;
+import com.alibaba.dubbo.remoting.transport.dispatcher.WrappedChannelHandler;
+import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelEventRunnable.ChannelState;
 
 public class MessageOnlyChannelHandler extends WrappedChannelHandler {
 

diff --git a/...spather/message/MessageOnlyDispather.java → ...patcher/message/MessageOnlyDispather.java b/...spather/message/MessageOnlyDispather.java → ...patcher/message/MessageOnlyDispather.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.dubbo.remoting.transport.dispather.message;
+package com.alibaba.dubbo.remoting.transport.dispatcher.message;
 
 import com.alibaba.dubbo.common.URL;
 import com.alibaba.dubbo.remoting.ChannelHandler;
@@ -28,7 +28,7 @@ public class MessageOnlyDispather implements Dispatcher {
 
     public static final String NAME = "message";
 
-    public ChannelHandler dispath(ChannelHandler handler, URL url) {
+    public ChannelHandler dispatch(ChannelHandler handler, URL url) {
         return new MessageOnlyChannelHandler(handler, url);
     }
 

diff --git a/...ting-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Dispatcher b/...ting-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Dispatcher
@@ -1,5 +1,5 @@
-all=com.alibaba.dubbo.remoting.transport.dispather.all.AllDispather
-direct=com.alibaba.dubbo.remoting.transport.dispather.direct.DirectDispather
-message=com.alibaba.dubbo.remoting.transport.dispather.message.MessageOnlyDispather
-execution=com.alibaba.dubbo.remoting.transport.dispather.execution.ExecutionDispather
-connection=com.alibaba.dubbo.remoting.transport.dispather.connection.ConnectionOrderedDispather
+all=com.alibaba.dubbo.remoting.transport.dispatcher.all.AllDispather
+direct=com.alibaba.dubbo.remoting.transport.dispatcher.direct.DirectDispather
+message=com.alibaba.dubbo.remoting.transport.dispatcher.message.MessageOnlyDispather
+execution=com.alibaba.dubbo.remoting.transport.dispatcher.execution.ExecutionDispather
+connection=com.alibaba.dubbo.remoting.transport.dispatcher.connection.ConnectionOrderedDispather
diff --git a/...ng/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/PerformanceServerTest.java b/...ng/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/PerformanceServerTest.java
@@ -29,7 +29,7 @@
 import com.alibaba.dubbo.remoting.exchange.ExchangeServer;
 import com.alibaba.dubbo.remoting.exchange.Exchangers;
 import com.alibaba.dubbo.remoting.exchange.support.ExchangeHandlerAdapter;
-import com.alibaba.dubbo.remoting.transport.dispather.execution.ExecutionDispather;
+import com.alibaba.dubbo.remoting.transport.dispatcher.execution.ExecutionDispather;
 
 /**
  * PerformanceServer

diff --git a/...oting-api/src/test/java/com/alibaba/dubbo/remoting/handler/ConnectChannelHandlerTest.java b/...oting-api/src/test/java/com/alibaba/dubbo/remoting/handler/ConnectChannelHandlerTest.java
@@ -28,7 +28,7 @@
 import com.alibaba.dubbo.remoting.RemotingException;
 import com.alibaba.dubbo.remoting.exchange.Request;
 import com.alibaba.dubbo.remoting.exchange.Response;
-import com.alibaba.dubbo.remoting.transport.dispather.connection.ConnectionOrderedChannelHandler;
+import com.alibaba.dubbo.remoting.transport.dispatcher.connection.ConnectionOrderedChannelHandler;
 
 
 

diff --git a/...oting-api/src/test/java/com/alibaba/dubbo/remoting/handler/WrappedChannelHandlerTest.java b/...oting-api/src/test/java/com/alibaba/dubbo/remoting/handler/WrappedChannelHandlerTest.java
@@ -28,7 +28,7 @@
 import com.alibaba.dubbo.common.URL;
 import com.alibaba.dubbo.remoting.Channel;
 import com.alibaba.dubbo.remoting.RemotingException;
-import com.alibaba.dubbo.remoting.transport.dispather.WrappedChannelHandler;
+import com.alibaba.dubbo.remoting.transport.dispatcher.WrappedChannelHandler;
 
 public class WrappedChannelHandlerTest {
     WrappedChannelHandler handler ;

diff --git a/...bbo-remoting-mina/src/main/java/com/alibaba/dubbo/remoting/transport/mina/MinaServer.java b/...bbo-remoting-mina/src/main/java/com/alibaba/dubbo/remoting/transport/mina/MinaServer.java
@@ -37,7 +37,7 @@
 import com.alibaba.dubbo.remoting.ChannelHandler;
 import com.alibaba.dubbo.remoting.RemotingException;
 import com.alibaba.dubbo.remoting.transport.AbstractServer;
-import com.alibaba.dubbo.remoting.transport.dispather.ChannelHandlers;
+import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelHandlers;
 
 /**
  * MinaServer

diff --git a/...-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyServer.java b/...-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyServer.java
@@ -41,7 +41,7 @@
 import com.alibaba.dubbo.remoting.RemotingException;
 import com.alibaba.dubbo.remoting.Server;
 import com.alibaba.dubbo.remoting.transport.AbstractServer;
-import com.alibaba.dubbo.remoting.transport.dispather.ChannelHandlers;
+import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelHandlers;
 
 /**
  * NettyServer

diff --git a/...tty/src/test/java/com/alibaba/dubbo/remoting/transport/dispather/FakeChannelHandlers.java b/...tty/src/test/java/com/alibaba/dubbo/remoting/transport/dispather/FakeChannelHandlers.java
@@ -20,6 +20,7 @@
 import com.alibaba.dubbo.common.extension.ExtensionLoader;
 import com.alibaba.dubbo.remoting.ChannelHandler;
 import com.alibaba.dubbo.remoting.Dispatcher;
+import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelHandlers;
 
 /**
  * @author <a href="mailto:gang.lvg@alibaba-inc.com">kimi</a>
@@ -33,7 +34,7 @@ public FakeChannelHandlers() {
     @Override
     protected ChannelHandler wrapInternal(ChannelHandler handler, URL url) {
         return ExtensionLoader.getExtensionLoader(Dispatcher.class)
-            .getAdaptiveExtension().dispath(handler, url);
+            .getAdaptiveExtension().dispatch(handler, url);
     }
 
     public static void setTestingChannelHandlers() {