修改版本为2.1.0-SNAPSHOT

git-svn-id: http://code.alibabatech.com/svn/dubbo/trunk@811 1a56cb94-b969-4eaa-88fa-be21384802f2
skykyw · Jan 6, 2012 · 5fdd7ac · 5fdd7ac
1 parent 267231c
commit 5fdd7ac
Show file tree

Hide file tree

Showing 31 changed files with 42 additions and 41 deletions.
diff --git a/README b/README
@@ -31,32 +31,32 @@
 4. Install the demo provider:
 
     cd ~/dubbo/dubbo-demo-provider/target
-    tar zxvf dubbo-demo-provider-2.0.10-assembly.tar.gz
-    cd dubbo-demo-provider-2.0.10/bin
+    tar zxvf dubbo-demo-provider-2.1.0-SNAPSHOT-assembly.tar.gz
+    cd dubbo-demo-provider-2.1.0-SNAPSHOT/bin
     ./start.sh
 
 5. Install the demo consumer:
 
     cd ~/dubbo/dubbo-demo-consumer/target
-    tar zxvf dubbo-demo-consumer-2.0.10-assembly.tar.gz
-    cd dubbo-demo-consumer-2.0.10/bin
+    tar zxvf dubbo-demo-consumer-2.1.0-SNAPSHOT-assembly.tar.gz
+    cd dubbo-demo-consumer-2.1.0-SNAPSHOT/bin
     ./start.sh
     cd ../logs
     tail -f stdout.log
 
 6. Install the simple monitor:
 
     cd ~/dubbo/dubbo-simple-monitor/target
-    tar zxvf dubbo-simple-monitor-2.0.10-assembly.tar.gz
-    cd dubbo-simple-monitor-2.0.10/bin
+    tar zxvf dubbo-simple-monitor-2.1.0-SNAPSHOT-assembly.tar.gz
+    cd dubbo-simple-monitor-2.1.0-SNAPSHOT/bin
     ./start.sh
     http://127.0.0.1:8080
 
 7. Install the simple registry:
 
     cd ~/dubbo/dubbo-simple-registry/target
-    tar zxvf dubbo-simple-registry-2.0.10-assembly.tar.gz
-    cd dubbo-simple-registry-2.0.10/bin
+    tar zxvf dubbo-simple-registry-2.1.0-SNAPSHOT-assembly.tar.gz
+    cd dubbo-simple-registry-2.1.0-SNAPSHOT/bin
     ./start.sh
 
     cd ~/dubbo/dubbo-demo-provider/conf

diff --git a/dubbo-cluster/pom.xml b/dubbo-cluster/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.0.10</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>dubbo-cluster</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-common/pom.xml b/dubbo-common/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.0.10</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>dubbo-common</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-config/pom.xml b/dubbo-config/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.0.10</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>dubbo-config</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-container/pom.xml b/dubbo-container/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.0.10</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>dubbo-container</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-demo-consumer/pom.xml b/dubbo-demo-consumer/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.0.10</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>dubbo-demo-consumer</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-demo-consumer/src/main/resources/META-INF/spring/demo-action.xml b/dubbo-demo-consumer/src/main/resources/META-INF/spring/demo-action.xml
@@ -16,10 +16,9 @@
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
+	default-autowire="byName">
 
-	<bean class="com.alibaba.dubbo.demo.consumer.DemoAction" init-method="start">
-		<property name="demoService" ref="demoService" />
-	</bean>
+	<bean class="com.alibaba.dubbo.demo.consumer.DemoAction" init-method="start" />
 
 </beans>
diff --git a/dubbo-demo-provider/pom.xml b/dubbo-demo-provider/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.0.10</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>dubbo-demo-provider</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-demo-provider/src/main/resources/META-INF/spring/dubbo-service.xml b/dubbo-demo-provider/src/main/resources/META-INF/spring/dubbo-service.xml
@@ -20,6 +20,8 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
 	http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd">
 
-	<dubbo:service interface="com.alibaba.dubbo.demo.DemoService" ref="demoService" loadbalance="roundrobin" />
+	<dubbo:service interface="com.alibaba.dubbo.demo.DemoService" ref="demoService" loadbalance="roundrobin">
+		<dubbo:method name="sayHello" mock="return ok1" />
+	</dubbo:service>
 
 </beans>
diff --git a/dubbo-demo/pom.xml b/dubbo-demo/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.0.10</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>dubbo-demo</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-monitor-default/pom.xml b/dubbo-monitor-default/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.0.10</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>dubbo-monitor-default</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-monitor-simple/pom.xml b/dubbo-monitor-simple/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.0.10</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>dubbo-monitor-simple</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-monitor/pom.xml b/dubbo-monitor/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.0.10</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>dubbo-monitor</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-registry-default/pom.xml b/dubbo-registry-default/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.0.10</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>dubbo-registry-default</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-registry-multicast/pom.xml b/dubbo-registry-multicast/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.0.10</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>dubbo-registry-multicast</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-registry-simple/pom.xml b/dubbo-registry-simple/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.0.10</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>dubbo-registry-simple</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-registry-zookeeper/pom.xml b/dubbo-registry-zookeeper/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.0.10</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>dubbo-registry-zookeeper</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-registry/pom.xml b/dubbo-registry/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.0.10</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>dubbo-registry</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-remoting-grizzly/pom.xml b/dubbo-remoting-grizzly/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.0.10</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>dubbo-remoting-grizzly</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-remoting-http/pom.xml b/dubbo-remoting-http/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.0.10</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>dubbo-remoting-http</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-remoting-mina/pom.xml b/dubbo-remoting-mina/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.0.10</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>dubbo-remoting-mina</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-remoting-netty/pom.xml b/dubbo-remoting-netty/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.0.10</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>dubbo-remoting-netty</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-remoting-p2p/pom.xml b/dubbo-remoting-p2p/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.0.10</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>dubbo-remoting-p2p</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-remoting/pom.xml b/dubbo-remoting/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.0.10</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>dubbo-remoting</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-rpc-default/pom.xml b/dubbo-rpc-default/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.0.10</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>dubbo-rpc-default</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-rpc-hessian/pom.xml b/dubbo-rpc-hessian/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.0.10</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>dubbo-rpc-hessian</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-rpc-injvm/pom.xml b/dubbo-rpc-injvm/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.0.10</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>dubbo-rpc-injvm</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-rpc-rmi/pom.xml b/dubbo-rpc-rmi/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.0.10</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>dubbo-rpc-rmi</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-rpc/pom.xml b/dubbo-rpc/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.0.10</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>dubbo-rpc</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo/pom.xml b/dubbo/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.0.10</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>dubbo</artifactId>
 	<packaging>jar</packaging>

diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
 		<version>1.0</version>
 	</parent>
 	<artifactId>dubbo-parent</artifactId>
-	<version>2.0.10</version>
+	<version>2.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Dubbo Parent POM</name>
 	<description>The parent project of dubbo</description>