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

jiwliu · Aug 15, 2012 · 0cdf517 · 0cdf517
1 parent 4838587
commit 0cdf517
Show file tree

Hide file tree

Showing 13 changed files with 53 additions and 25 deletions.
diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ProtocolConfig.java b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ProtocolConfig.java
@@ -23,7 +23,7 @@
 import com.alibaba.dubbo.common.threadpool.ThreadPool;
 import com.alibaba.dubbo.config.support.Parameter;
 import com.alibaba.dubbo.registry.support.AbstractRegistryFactory;
-import com.alibaba.dubbo.remoting.Dispather;
+import com.alibaba.dubbo.remoting.Dispatcher;
 import com.alibaba.dubbo.remoting.Codec;
 import com.alibaba.dubbo.remoting.Transporter;
 import com.alibaba.dubbo.remoting.exchange.Exchanger;
@@ -95,7 +95,7 @@ public class ProtocolConfig extends AbstractConfig {
     private String              exchanger;
 
     // 信息线程模型派发方式
-    private String              dispather;
+    private String              dispatcher;
 
     // 对称网络组网方式
     private String              networker;
@@ -367,13 +367,31 @@ public void setExchanger(String exchanger) {
         this.exchanger = exchanger;
     }
 
+    /**
+     * 单词拼写错误，请使用getDispatcher()
+     * @deprecated {@link #getDispatcher()}
+     */
+    @Deprecated
     public String getDispather() {
-        return dispather;
+        return getDispatcher();
     }
 
+    /**
+     * 单词拼写错误，请使用setDispatcher()
+     * @deprecated {@link #setDispatcher(String)}
+     */
+    @Deprecated
     public void setDispather(String dispather) {
-        checkExtension(Dispather.class, "dispather", exchanger);
-        this.dispather = dispather;
+        setDispatcher(dispather);
+    }
+
+    public String getDispatcher() {
+        return dispatcher;
+    }
+
+    public void setDispatcher(String dispatcher) {
+        checkExtension(Dispatcher.class, "dispacther", dispatcher);
+        this.dispatcher = dispatcher;
     }
 
     public String getNetworker() {

diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ProviderConfig.java b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ProviderConfig.java
@@ -20,7 +20,7 @@
 import com.alibaba.dubbo.common.status.StatusChecker;
 import com.alibaba.dubbo.common.threadpool.ThreadPool;
 import com.alibaba.dubbo.config.support.Parameter;
-import com.alibaba.dubbo.remoting.Dispather;
+import com.alibaba.dubbo.remoting.Dispatcher;
 import com.alibaba.dubbo.remoting.Transporter;
 import com.alibaba.dubbo.remoting.exchange.Exchanger;
 import com.alibaba.dubbo.remoting.telnet.TelnetHandler;
@@ -348,7 +348,7 @@ public String getDispather() {
     }
 
     public void setDispather(String dispather) {
-        checkExtension(Dispather.class, "dispather", exchanger);
+        checkExtension(Dispatcher.class, "dispather", exchanger);
         this.dispather = dispather;
     }
 

diff --git a/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd b/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd
@@ -825,7 +825,12 @@
 		</xsd:attribute>
 		<xsd:attribute name="dispather" type="xsd:string" use="optional">
 			<xsd:annotation>
-				<xsd:documentation><![CDATA[ The protocol dispather type. ]]></xsd:documentation>
+				<xsd:documentation><![CDATA[ Deprecated. replace to "dispatcher". ]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="dispatcher" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[ The protocol dispatcher type. ]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="networker" type="xsd:string" use="optional">
@@ -945,7 +950,12 @@
 				</xsd:attribute>
 				<xsd:attribute name="dispather" type="xsd:string" use="optional">
 					<xsd:annotation>
-						<xsd:documentation><![CDATA[ The protocol dispather type. ]]></xsd:documentation>
+						<xsd:documentation><![CDATA[ Deprecated. replace to "dispatcher". ]]></xsd:documentation>
+					</xsd:annotation>
+				</xsd:attribute>
+				<xsd:attribute name="dispatcher" type="xsd:string" use="optional">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[ The protocol dispatcher type. ]]></xsd:documentation>
 					</xsd:annotation>
 				</xsd:attribute>
 				<xsd:attribute name="networker" type="xsd:string" use="optional">

diff --git a/...com/alibaba/dubbo/remoting/Dispather.java → ...om/alibaba/dubbo/remoting/Dispatcher.java b/...com/alibaba/dubbo/remoting/Dispather.java → ...om/alibaba/dubbo/remoting/Dispatcher.java
@@ -27,7 +27,7 @@
  * @author chao.liuc
  */
 @SPI(AllDispather.NAME)
-public interface Dispather {
+public interface Dispatcher {
 
     /**
      * dispath.

diff --git a/...ing-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/ChannelHandlers.java b/...ing-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/ChannelHandlers.java
@@ -19,7 +19,7 @@
 import com.alibaba.dubbo.common.URL;
 import com.alibaba.dubbo.common.extension.ExtensionLoader;
 import com.alibaba.dubbo.remoting.ChannelHandler;
-import com.alibaba.dubbo.remoting.Dispather;
+import com.alibaba.dubbo.remoting.Dispatcher;
 import com.alibaba.dubbo.remoting.exchange.support.header.HeartbeatHandler;
 import com.alibaba.dubbo.remoting.transport.MultiMessageHandler;
 
@@ -36,7 +36,7 @@ public static ChannelHandler wrap(ChannelHandler handler, URL url){
     protected ChannelHandlers() {}
 
     protected ChannelHandler wrapInternal(ChannelHandler handler, URL url) {
-        return new MultiMessageHandler(new HeartbeatHandler(ExtensionLoader.getExtensionLoader(Dispather.class)
+        return new MultiMessageHandler(new HeartbeatHandler(ExtensionLoader.getExtensionLoader(Dispatcher.class)
                                         .getAdaptiveExtension().dispath(handler, url)));
     }
 

diff --git a/...ng-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/all/AllDispather.java b/...ng-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispather/all/AllDispather.java
@@ -17,14 +17,14 @@
 
 import com.alibaba.dubbo.common.URL;
 import com.alibaba.dubbo.remoting.ChannelHandler;
-import com.alibaba.dubbo.remoting.Dispather;
+import com.alibaba.dubbo.remoting.Dispatcher;
 
 /**
  * 默认的线程池配置
  * 
  * @author chao.liuc
  */
-public class AllDispather implements Dispather {
+public class AllDispather implements Dispatcher {
 
     public static final String NAME = "all";
 

diff --git a/...com/alibaba/dubbo/remoting/transport/dispather/connection/ConnectionOrderedDispather.java b/...com/alibaba/dubbo/remoting/transport/dispather/connection/ConnectionOrderedDispather.java
@@ -17,14 +17,14 @@
 
 import com.alibaba.dubbo.common.URL;
 import com.alibaba.dubbo.remoting.ChannelHandler;
-import com.alibaba.dubbo.remoting.Dispather;
+import com.alibaba.dubbo.remoting.Dispatcher;
 
 /**
  * connect disconnect 保证顺序.
  * 
  * @author chao.liuc
  */
-public class ConnectionOrderedDispather implements Dispather {
+public class ConnectionOrderedDispather implements Dispatcher {
 
     public static final String NAME = "connection";
 

diff --git a/.../src/main/java/com/alibaba/dubbo/remoting/transport/dispather/direct/DirectDispather.java b/.../src/main/java/com/alibaba/dubbo/remoting/transport/dispather/direct/DirectDispather.java
@@ -17,14 +17,14 @@
 
 import com.alibaba.dubbo.common.URL;
 import com.alibaba.dubbo.remoting.ChannelHandler;
-import com.alibaba.dubbo.remoting.Dispather;
+import com.alibaba.dubbo.remoting.Dispatcher;
 
 /**
  * 不派发线程池。
  * 
  * @author chao.liuc
  */
-public class DirectDispather implements Dispather {
+public class DirectDispather implements Dispatcher {
 
     public static final String NAME = "direct";
 

diff --git a/...ain/java/com/alibaba/dubbo/remoting/transport/dispather/execution/ExecutionDispather.java b/...ain/java/com/alibaba/dubbo/remoting/transport/dispather/execution/ExecutionDispather.java
@@ -17,14 +17,14 @@
 
 import com.alibaba.dubbo.common.URL;
 import com.alibaba.dubbo.remoting.ChannelHandler;
-import com.alibaba.dubbo.remoting.Dispather;
+import com.alibaba.dubbo.remoting.Dispatcher;
 
 /**
  * 除发送全部使用线程池处理
  * 
  * @author chao.liuc
  */
-public class ExecutionDispather implements Dispather {
+public class ExecutionDispather implements Dispatcher {
 
     public static final String NAME = "execution";
 

diff --git a/...ain/java/com/alibaba/dubbo/remoting/transport/dispather/message/MessageOnlyDispather.java b/...ain/java/com/alibaba/dubbo/remoting/transport/dispather/message/MessageOnlyDispather.java
@@ -17,14 +17,14 @@
 
 import com.alibaba.dubbo.common.URL;
 import com.alibaba.dubbo.remoting.ChannelHandler;
-import com.alibaba.dubbo.remoting.Dispather;
+import com.alibaba.dubbo.remoting.Dispatcher;
 
 /**
  * 只有message receive使用线程池.
  * 
  * @author chao.liuc
  */
-public class MessageOnlyDispather implements Dispather {
+public class MessageOnlyDispather implements Dispatcher {
 
     public static final String NAME = "message";
 

diff --git a/...rnal/com.alibaba.dubbo.remoting.Dispather → ...nal/com.alibaba.dubbo.remoting.Dispatcher b/...rnal/com.alibaba.dubbo.remoting.Dispather → ...nal/com.alibaba.dubbo.remoting.Dispatcher
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
@@ -19,7 +19,7 @@
 import com.alibaba.dubbo.common.URL;
 import com.alibaba.dubbo.common.extension.ExtensionLoader;
 import com.alibaba.dubbo.remoting.ChannelHandler;
-import com.alibaba.dubbo.remoting.Dispather;
+import com.alibaba.dubbo.remoting.Dispatcher;
 
 /**
  * @author <a href="mailto:[email protected]">kimi</a>
@@ -32,7 +32,7 @@ public FakeChannelHandlers() {
 
     @Override
     protected ChannelHandler wrapInternal(ChannelHandler handler, URL url) {
-        return ExtensionLoader.getExtensionLoader(Dispather.class)
+        return ExtensionLoader.getExtensionLoader(Dispatcher.class)
             .getAdaptiveExtension().dispath(handler, url);
     }
 

diff --git a/dubbo/pom.xml b/dubbo/pom.xml
@@ -368,7 +368,7 @@
 								</transformer>
 								<transformer
 									implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-									<resource>META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Dispather</resource>
+									<resource>META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Dispatcher</resource>
 								</transformer>
 								<transformer
 									implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">