From 5cfbb1d691b4f30b1f2c6961b67a49cff9078ec7 Mon Sep 17 00:00:00 2001
From: kimi <kimi@1a56cb94-b969-4eaa-88fa-be21384802f2>
Date: Wed, 13 Jun 2012 05:09:02 +0000
Subject: [PATCH] =?UTF-8?q?DUBBO-135=20=E4=BF=AE=E6=94=B9=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=B5=8B=E8=AF=95=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96?=
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@1973 1a56cb94-b969-4eaa-88fa-be21384802f2
---
 dubbo-rpc/dubbo-rpc-thrift/pom.xml                   | 12 ++++++++++++
 .../rpc/protocol/thrift/DubboClassNameGenerator.java |  3 ---
 .../protocol/thrift/ThriftClassNameGenerator.java    |  3 ---
 .../src/test/resources/dubbo-demo-consumer.xml       |  4 ++--
 .../src/test/resources/dubbo-demo-provider.xml       |  4 ++--
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/dubbo-rpc/dubbo-rpc-thrift/pom.xml b/dubbo-rpc/dubbo-rpc-thrift/pom.xml
index fb944fa0e..2b7595a68 100644
--- a/dubbo-rpc/dubbo-rpc-thrift/pom.xml
+++ b/dubbo-rpc/dubbo-rpc-thrift/pom.xml
@@ -59,5 +59,17 @@
 			<scope>provided</scope>
 			<optional>true</optional>
 		</dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>dubbo-config-spring</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>dubbo-registry-multicast</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>test</scope>
+        </dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/DubboClassNameGenerator.java b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/DubboClassNameGenerator.java
index 4d213a02f..ab9d70832 100644
--- a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/DubboClassNameGenerator.java
+++ b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/DubboClassNameGenerator.java
@@ -13,12 +13,9 @@
  */
 package com.alibaba.dubbo.rpc.protocol.thrift;
 
-import com.alibaba.dubbo.common.Extension;
-
 /**
  * @author <a href="mailto:gang.lvg@alibaba-inc.com">kimi</a>
  */
-@Extension( DubboClassNameGenerator.NAME )
 public class DubboClassNameGenerator implements ClassNameGenerator {
 
     public static final String NAME = "dubbo";
diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftClassNameGenerator.java b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftClassNameGenerator.java
index e7648a324..5c34c222f 100644
--- a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftClassNameGenerator.java
+++ b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftClassNameGenerator.java
@@ -13,12 +13,9 @@
  */
 package com.alibaba.dubbo.rpc.protocol.thrift;
 
-import com.alibaba.dubbo.common.Extension;
-
 /**
  * @author <a href="mailto:gang.lvg@alibaba-inc.com">kimi</a>
  */
-@Extension( ThriftClassNameGenerator.NAME)
 public class ThriftClassNameGenerator implements ClassNameGenerator {
 
     public static final String NAME = "thrift";
diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/test/resources/dubbo-demo-consumer.xml b/dubbo-rpc/dubbo-rpc-thrift/src/test/resources/dubbo-demo-consumer.xml
index 6197d7e02..31cb0d904 100644
--- a/dubbo-rpc/dubbo-rpc-thrift/src/test/resources/dubbo-demo-consumer.xml
+++ b/dubbo-rpc/dubbo-rpc-thrift/src/test/resources/dubbo-demo-consumer.xml
@@ -8,10 +8,10 @@
 
     <dubbo:application name="dubbo-demo-consumer"/>
 
-    <!--<dubbo:registry address="multicast://224.5.6.7:1234"/>-->
+    <dubbo:registry address="multicast://224.5.6.7:1234"/>
 
     <dubbo:protocol name="thrift" />
 
-    <dubbo:reference id="demoService" interface="com.alibaba.dubbo.rpc.gen.dubbo.Demo" url="thrift://127.0.0.1:40880" timeout="1000000" />
+    <dubbo:reference id="demoService" interface="com.alibaba.dubbo.rpc.gen.dubbo.Demo" timeout="1000000" />
 
 </beans>
\ No newline at end of file
diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/test/resources/dubbo-demo-provider.xml b/dubbo-rpc/dubbo-rpc-thrift/src/test/resources/dubbo-demo-provider.xml
index a72f634ac..54ca21212 100644
--- a/dubbo-rpc/dubbo-rpc-thrift/src/test/resources/dubbo-demo-provider.xml
+++ b/dubbo-rpc/dubbo-rpc-thrift/src/test/resources/dubbo-demo-provider.xml
@@ -10,10 +10,10 @@
 
     <dubbo:registry address="multicast://224.5.6.7:1234"/>
 
-    <dubbo:protocol name="thrift" />
+    <dubbo:protocol id="thrift" name="thrift" />
 
     <bean id="demoService" class="com.alibaba.dubbo.rpc.protocol.thrift.DubboDemoImpl"/>
 
-    <dubbo:service interface="com.alibaba.dubbo.rpc.gen.dubbo.Demo" ref="demoService"/>
+    <dubbo:service protocol="thrift" interface="com.alibaba.dubbo.rpc.gen.dubbo.Demo" ref="demoService"/>
 
 </beans>
\ No newline at end of file
-- 
GitLab