From 3b208ee7675c52bdee87de53a8370b6bc330c029 Mon Sep 17 00:00:00 2001
From: "william.liangf" <william.liangf@1a56cb94-b969-4eaa-88fa-be21384802f2>
Date: Wed, 2 Nov 2011 09:13:28 +0000
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8Restable=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://code.alibabatech.com/svn/dubbo/trunk@178 1a56cb94-b969-4eaa-88fa-be21384802f2
---
 .../src/main/java/com/alibaba/dubbo/common}/Resetable.java  | 2 +-
 dubbo-remoting-http/pom.xml                                 | 6 +-----
 .../java/com/alibaba/dubbo/remoting/http/HttpServer.java    | 2 +-
 .../src/main/java/com/alibaba/dubbo/remoting/Client.java    | 2 ++
 .../src/main/java/com/alibaba/dubbo/remoting/Server.java    | 2 ++
 .../alibaba/dubbo/remoting/transport/AbstractEndpoint.java  | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename {dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting => dubbo-common/src/main/java/com/alibaba/dubbo/common}/Resetable.java (92%)

diff --git a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/Resetable.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/Resetable.java
similarity index 92%
rename from dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/Resetable.java
rename to dubbo-common/src/main/java/com/alibaba/dubbo/common/Resetable.java
index 882bb2e147..398ad1f237 100644
--- a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/Resetable.java
+++ b/dubbo-common/src/main/java/com/alibaba/dubbo/common/Resetable.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.dubbo.remoting;
+package com.alibaba.dubbo.common;
 
 import com.alibaba.dubbo.common.URL;
 
diff --git a/dubbo-remoting-http/pom.xml b/dubbo-remoting-http/pom.xml
index d3a45efc8e..545c247068 100644
--- a/dubbo-remoting-http/pom.xml
+++ b/dubbo-remoting-http/pom.xml
@@ -31,13 +31,9 @@
 	<dependencies>
 		<dependency>
 			<groupId>com.alibaba</groupId>
-			<artifactId>dubbo-remoting</artifactId>
+			<artifactId>dubbo-common</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.mortbay.jetty</groupId>
 			<artifactId>jetty</artifactId>
diff --git a/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/HttpServer.java b/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/HttpServer.java
index 37b9ae2782..1aa44ed360 100644
--- a/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/HttpServer.java
+++ b/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/HttpServer.java
@@ -17,8 +17,8 @@ package com.alibaba.dubbo.remoting.http;
 
 import java.net.InetSocketAddress;
 
+import com.alibaba.dubbo.common.Resetable;
 import com.alibaba.dubbo.common.URL;
-import com.alibaba.dubbo.remoting.Resetable;
 
 public interface HttpServer extends Resetable {
     
diff --git a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/Client.java b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/Client.java
index 81131aa2aa..edd2dd99e0 100644
--- a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/Client.java
+++ b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/Client.java
@@ -15,6 +15,8 @@
  */
 package com.alibaba.dubbo.remoting;
 
+import com.alibaba.dubbo.common.Resetable;
+
 /**
  * Remoting Client. (API/SPI, Prototype, ThreadSafe)
  * 
diff --git a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/Server.java b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/Server.java
index b75e81c4d9..7abe6dbbd5 100755
--- a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/Server.java
+++ b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/Server.java
@@ -18,6 +18,8 @@ package com.alibaba.dubbo.remoting;
 import java.net.InetSocketAddress;
 import java.util.Collection;
 
+import com.alibaba.dubbo.common.Resetable;
+
 /**
  * Remoting Server. (API/SPI, Prototype, ThreadSafe)
  * 
diff --git a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractEndpoint.java b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractEndpoint.java
index 282dd0b9ff..faa96aefcb 100644
--- a/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractEndpoint.java
+++ b/dubbo-remoting/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractEndpoint.java
@@ -17,10 +17,10 @@ package com.alibaba.dubbo.remoting.transport;
 
 import com.alibaba.dubbo.common.Constants;
 import com.alibaba.dubbo.common.ExtensionLoader;
+import com.alibaba.dubbo.common.Resetable;
 import com.alibaba.dubbo.common.URL;
 import com.alibaba.dubbo.remoting.ChannelHandler;
 import com.alibaba.dubbo.remoting.Codec;
-import com.alibaba.dubbo.remoting.Resetable;
 
 /**
  * AbstractEndpoint