Merge pull request #11 from nzomkxia/master
update dubbo book address
diff --git a/README.md b/README.md
index 857323f..6334c9e 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,17 @@
-# A collection of dubbo docs
+# A collection of Apache Dubbo (incubating) docs
-* [Dubbo user manual(English)](http://dubbo.io/books/dubbo-user-book-en/) or [Dubbo用户手册(中文)](http://dubbo.io/books/dubbo-user-book/) - Describe how to use Dubbo and all features of Dubbo concretely.
-* [Dubbo developer guide(English)](http://dubbo.io/books/dubbo-dev-book-en/) or [Dubbo开发手册(中文)](http://dubbo.io/books/dubbo-dev-book/) - Detailly introduce the design principal, extension mechanisms, code conventions, version control and building project, etc.
-* [Dubbo admin manual(English)](http://dubbo.io/books/dubbo-admin-book-en/) or [Dubbo管理手册(中文)](http://dubbo.io/books/dubbo-admin-book/) - Describe how to use Dubbo registry and admin-console.
+* [Dubbo user manual(English)](http://dubbo.apache.org/books/dubbo-user-book-en/) or [Dubbo用户手册(中文)](http://dubbo.apache.org/books/dubbo-user-book/) - Describe how to use Dubbo and all features of Dubbo concretely.
+* [Dubbo developer guide(English)](http://dubbo.apache.org/books/dubbo-dev-book-en/) or [Dubbo开发手册(中文)](http://dubbo.apache.org/books/dubbo-dev-book/) - Detailly introduce the design principal, extension mechanisms, code conventions, version control and building project, etc.
+* [Dubbo admin manual(English)](http://dubbo.apache.org/books/dubbo-admin-book-en/) or [Dubbo管理手册(中文)](http://dubbo.apache.org/books/dubbo-admin-book/) - Describe how to use Dubbo registry and admin-console.
## How to Visit (Publish Address):
-* The Chinese version is released under the `dubbo.io` domain, for example, you can visit User Mannual through http://dubbo.io/books/dubbo-user-book/.
-* The English version is published to `dubbo.io` as well, in addition, it is also published to `dubbo.gitbooks.io`. This way, you can visit the User Mannul through http://dubbo.io/books/dubbo-user-book-en/ or https://dubbo.gitbooks.io/user-book-en/.
+* The Chinese version is released under the `dubbo.apache.org` domain, for example, you can visit User Mannual through http://dubbo.apache.org/books/dubbo-user-book/.
+* The English version is published to `dubbo.apache.org` as well. This way, you can visit the User Mannul through http://dubbo.apache.org/books/dubbo-user-book-en/.
## How to Publish
This repository only stores markdown sources, in order to be visited by users, it should be published everytime when there's an update. It will not be published automatically, so the committers need to publish mannually following rules below:
-* Publish to dubbo.io. You can find [the publish script](https://github.com/dubbo/dubbo.github.io/blob/master/script/deploy) stored in repo dubbo/dubbo.github.io(the official site), clone that repo and run the script, all resources will be published automatically to dubbo.io.
-* Publish to dubbo.gitbooks.io(only for english version). There's no publish script for this approach, what you need to do is merge the master branch to the corresponding branch. Because the gitbooks is watching the branches in this repo:gitbook-admin-en, gitbook-user-en, gitbook-dev-en, every change will be published automitically.
-
+* Publish to dubbo.apache.org. You can find [the publish script](https://github.com/apache/incubator-dubbo-website/blob/asf-site/script/deploy) stored in repo incubator-dubbo-website(the official site), clone that repo and run the script, all resources will be published automatically to dubbo.apache.org.
diff --git a/dubbo-admin-book-en/install/consumer-demo.md b/dubbo-admin-book-en/install/consumer-demo.md
index 5a841f0..b6e1bf1 100644
--- a/dubbo-admin-book-en/install/consumer-demo.md
+++ b/dubbo-admin-book-en/install/consumer-demo.md
@@ -4,60 +4,15 @@
install:
```sh
-wget http://code.alibabatech.com/mvn/releases/com/alibaba/dubbo-demo-consumer/2.4.1/dubbo-demo-consumer-2.4.1-assembly.tar.gz
-tar zxvf dubbo-demo-consumer-2.4.1-assembly.tar.gz
-cd dubbo-demo-consumer-2.4.1
+git clone https://github.com/apache/incubator-dubbo.git
+cd incubator-dubbo
+Please start Provider first
+add -Djava.net.preferIPv4Stack=true if your IDE is Intellij Idea
```
configuration:
```sh
-vi conf/dubbo.properties
-```
-
-start:
-
-```sh
-./bin/start.sh
-tail -f logs/stdout.log
-```
-
-Stop:
-
-```sh
-./bin/stop.sh
-```
-
-Restart:
-
-```sh
-./bin/restart.sh
-```
-
-Debug:
-
-```sh
-./bin/start.sh debug
-```
-
-System status:
-
-```sh
-./bin/dump.sh
-```
-
-General control entrance:
-
-```sh
-./bin/server.sh start
-./bin/server.sh stop
-./bin/server.sh restart
-./bin/server.sh debug
-./bin/server.sh dump
-```
-
-Stdout:
-
-```sh
-tail -f logs/stdout.log
+resource/META-INFO.spring/dubbo-demo-consumer.xml
+change dubbo:registery to the real registery center address
```
diff --git a/dubbo-admin-book-en/install/provider-demo.md b/dubbo-admin-book-en/install/provider-demo.md
index a960cc9..a41892a 100644
--- a/dubbo-admin-book-en/install/provider-demo.md
+++ b/dubbo-admin-book-en/install/provider-demo.md
@@ -3,75 +3,15 @@
install:
```sh
-wget http://code.alibabatech.com/mvn/releases/com/alibaba/dubbo-demo-provider/2.4.1/dubbo-demo-provider-2.4.1-assembly.tar.gz
-tar zxvf dubbo-demo-provider-2.4.1-assembly.tar.gz
-cd dubbo-demo-provider-2.4.1
+git clone https://github.com/apache/incubator-dubbo.git
+cd incubator-dubbo
+run com.alibaba.dubbo.demo.provider.Provider under dubbo-demo-provider module
+add -Djava.net.preferIPv4Stack=true if your IDE is Intellij Idea
```
configuration:
```sh
-vi conf/dubbo.properties
+resource/META-INFO.spring/dubbo-demo-provider.xml
+change dubbo:registery to a real registery server address, zookeeper is recommanded
```
-
-start:
-
-```sh
-./bin/start.sh
-```
-
-stop:
-
-```sh
-./bin/stop.sh
-```
-
-restart:
-
-```sh
-./bin/restart.sh
-```
-
-Debug:
-
-```sh
-./bin/start.sh debug
-```
-
-System status:
-
-```sh
-./bin/dump.sh
-```
-
-General control entrance:
-
-```sh
-./bin/server.sh start
-./bin/server.sh stop
-./bin/server.sh restart
-./bin/server.sh debug
-./bin/server.sh dump
-```
-
-Stdout:
-
-```sh
-tail -f logs/stdout.log
-```
-
-Command line [^1]:
-
-
-```sh
-telnet 127.0.0.1 20880
-help
-```
-
-Or:
-
-```sh
-echo status | nc -i 1 127.0.0.1 20880
-```
-
-[^1]: Please refer to [Telnet reference manual](http://dubbo.io/books/dubbo-user-book-en/references/telnet.html)
\ No newline at end of file
diff --git a/dubbo-admin-book-en/install/simple-monitor-center.md b/dubbo-admin-book-en/install/simple-monitor-center.md
index d1276d2..e46365f 100644
--- a/dubbo-admin-book-en/install/simple-monitor-center.md
+++ b/dubbo-admin-book-en/install/simple-monitor-center.md
@@ -5,9 +5,10 @@
install:
```sh
-wget http://code.alibabatech.com/mvn/releases/com/alibaba/dubbo-monitor-simple/2.4.1/dubbo-monitor-simple-2.4.1-assembly.tar.gz
-tar zxvf dubbo-monitor-simple-2.4.1-assembly.tar.gz
-cd dubbo-monitor-simple-2.4.1
+git clone https://github.com/apache/incubator-dubbo-ops
+cd incubator-dubbo-ops && mvn package
+cd dubbo-monitor-simple/target && tar xvf dubbo-monitor-simple-2.0.0-assembly.tar.gz
+cd dubbo-monitor-simple-2.0.0
```
configuration:
@@ -19,41 +20,41 @@
start:
```sh
-./bin/start.sh
+./assembly.bin/start.sh
```
stop:
```sh
-./bin/stop.sh
+./assembly.bin/stop.sh
```
restart:
```sh
-./bin/restart.sh
+./assembly.bin/restart.sh
```
debug:
```sh
-./bin/start.sh debug
+./assembly.bin/start.sh debug
```
system status:
```sh
-./bin/dump.sh
+./assembly.bin/dump.sh
```
General control entrance:
```sh
-./bin/server.sh start
-./bin/server.sh stop
-./bin/server.sh restart
-./bin/server.sh debug
-./bin/server.sh dump
+./assembly.bin/server.sh start
+./assembly.bin/server.sh stop
+./assembly.bin/server.sh restart
+./assembly.bin/server.sh debug
+./assembly.bin/server.sh dump
```
Stdout:
diff --git a/dubbo-admin-book-en/install/simple-registry-center.md b/dubbo-admin-book-en/install/simple-registry-center.md
index e0e1fd6..60b3110 100644
--- a/dubbo-admin-book-en/install/simple-registry-center.md
+++ b/dubbo-admin-book-en/install/simple-registry-center.md
@@ -5,9 +5,10 @@
Install:
```sh
-wget http://code.alibabatech.com/mvn/releases/com/alibaba/dubbo-registry-simple/2.4.1/dubbo-registry-simple-2.4.1-assembly.tar.gz
-tar zxvf dubbo-registry-simple-2.4.1-assembly.tar.gz
-cd dubbo-registry-simple-2.4.1
+git clone https://github.com/apache/incubator-dubbo-ops
+cd incubator-dubbo-ops && mvn package
+cd dubbo-registry-simple/target && tar xvf dubbo-registry-simple-2.0.0-assembly.tar.gz
+cd dubbo-registry-simple-2.0.0
```
Configuration:
@@ -19,40 +20,40 @@
Start:
```sh
-./bin/start.sh
+./assembly.bin/start.sh
```
Stop:
```sh
-./bin/stop.sh
+./assembly.bin/stop.sh
```
Restart:
```sh
-./bin/restart.sh
+./assembly.bin/restart.sh
```
Debug:
```sh
-./bin/start.sh debug
+./assembly.bin/start.sh debug
```
System status:
```sh
-./bin/dump.sh
+./assembly.bin/dump.sh
```
General control entrance:
```sh
-./bin/server.sh start
-./bin/server.sh stop
-./bin/server.sh restart
-./bin/server.sh debug
-./bin/server.sh dump
+./assembly.bin/server.sh start
+./assembly.bin/server.sh stop
+./assembly.bin/server.sh restart
+./assembly.bin/server.sh debug
+./assembly.bin/server.sh dump
```
Stdout:
diff --git a/dubbo-admin-book/install/consumer-demo.md b/dubbo-admin-book/install/consumer-demo.md
index 43aa8d5..c68e11f 100644
--- a/dubbo-admin-book/install/consumer-demo.md
+++ b/dubbo-admin-book/install/consumer-demo.md
@@ -4,60 +4,17 @@
安装:
```sh
-wget http://code.alibabatech.com/mvn/releases/com/alibaba/dubbo-demo-consumer/2.4.1/dubbo-demo-consumer-2.4.1-assembly.tar.gz
-tar zxvf dubbo-demo-consumer-2.4.1-assembly.tar.gz
-cd dubbo-demo-consumer-2.4.1
+git clone https://github.com/apache/incubator-dubbo.git
+cd incubator-dubbo
+运行 dubbo-demo-consumer中的com.alibaba.dubbo.demo.consumer.Consumer
+请确保先启动Provider
+如果使用Intellij Idea 请加上-Djava.net.preferIPv4Stack=true
```
配置:
```sh
-vi conf/dubbo.properties
+resource/META-INFO.spring/dubbo-demo-consumer.xml
+修改其中的dubbo:registery，替换成Provider提供的注册中心地址
```
-启动:
-
-```sh
-./bin/start.sh
-tail -f logs/stdout.log
-```
-
-停止:
-
-```sh
-./bin/stop.sh
-```
-
-重启:
-
-```sh
-./bin/restart.sh
-```
-
-调试:
-
-```sh
-./bin/start.sh debug
-```
-
-系统状态:
-
-```sh
-./bin/dump.sh
-```
-
-总控入口:
-
-```sh
-./bin/server.sh start
-./bin/server.sh stop
-./bin/server.sh restart
-./bin/server.sh debug
-./bin/server.sh dump
-```
-
-标准输出:
-
-```sh
-tail -f logs/stdout.log
-```
diff --git a/dubbo-admin-book/install/provider-demo.md b/dubbo-admin-book/install/provider-demo.md
index 4f5eaeb..50da3f5 100644
--- a/dubbo-admin-book/install/provider-demo.md
+++ b/dubbo-admin-book/install/provider-demo.md
@@ -3,75 +3,16 @@
安装：
```sh
-wget http://code.alibabatech.com/mvn/releases/com/alibaba/dubbo-demo-provider/2.4.1/dubbo-demo-provider-2.4.1-assembly.tar.gz
-tar zxvf dubbo-demo-provider-2.4.1-assembly.tar.gz
-cd dubbo-demo-provider-2.4.1
+git clone https://github.com/apache/incubator-dubbo.git
+cd incubator-dubbo
+运行 dubbo-demo-provider中的com.alibaba.dubbo.demo.provider.Provider
+如果使用Intellij Idea 请加上-Djava.net.preferIPv4Stack=true
```
配置：
```sh
-vi conf/dubbo.properties
+resource/META-INFO.spring/dubbo-demo-provider.xml
+修改其中的dubbo:registery，替换成真实的注册中心地址，推荐使用zookeeper
```
-启动：
-
-```sh
-./bin/start.sh
-```
-
-停止：
-
-```sh
-./bin/stop.sh
-```
-
-重启：
-
-```sh
-./bin/restart.sh
-```
-
-调试：
-
-```sh
-./bin/start.sh debug
-```
-
-系统状态：
-
-```sh
-./bin/dump.sh
-```
-
-总控入口：
-
-```sh
-./bin/server.sh start
-./bin/server.sh stop
-./bin/server.sh restart
-./bin/server.sh debug
-./bin/server.sh dump
-```
-
-标准输出：
-
-```sh
-tail -f logs/stdout.log
-```
-
-命令行 [^1]：
-
-
-```sh
-telnet 127.0.0.1 20880
-help
-```
-
-或者：
-
-```sh
-echo status | nc -i 1 127.0.0.1 20880
-```
-
-[^1]: 请参考 [Telnet 命令参考手册](http://dubbo.io/books/dubbo-user-book/references/telnet.html)
diff --git a/dubbo-admin-book/install/simple-monitor-center.md b/dubbo-admin-book/install/simple-monitor-center.md
index 73c27a1..f06f5a3 100644
--- a/dubbo-admin-book/install/simple-monitor-center.md
+++ b/dubbo-admin-book/install/simple-monitor-center.md
@@ -5,9 +5,10 @@
安装:
```sh
-wget http://code.alibabatech.com/mvn/releases/com/alibaba/dubbo-monitor-simple/2.4.1/dubbo-monitor-simple-2.4.1-assembly.tar.gz
-tar zxvf dubbo-monitor-simple-2.4.1-assembly.tar.gz
-cd dubbo-monitor-simple-2.4.1
+git clone https://github.com/apache/incubator-dubbo-ops
+cd incubator-dubbo-ops && mvn package
+cd dubbo-monitor-simple/target && tar xvf dubbo-monitor-simple-2.0.0-assembly.tar.gz
+cd dubbo-monitor-simple-2.0.0
```
配置:
@@ -19,41 +20,41 @@
启动:
```sh
-./bin/start.sh
+./assembly.bin/start.sh
```
停止:
```sh
-./bin/stop.sh
+./assembly.bin/stop.sh
```
重启:
```sh
-./bin/restart.sh
+./assembly.bin/restart.sh
```
调试:
```sh
-./bin/start.sh debug
+./assembly.bin/start.sh debug
```
系统状态:
```sh
-./bin/dump.sh
+./assembly.bin/dump.sh
```
总控入口:
```sh
-./bin/server.sh start
-./bin/server.sh stop
-./bin/server.sh restart
-./bin/server.sh debug
-./bin/server.sh dump
+./assembly.bin/server.sh start
+./assembly.bin/server.sh stop
+./assembly.bin/server.sh restart
+./assembly.bin/server.sh debug
+./assembly.bin/server.sh dump
```
标准输出:
diff --git a/dubbo-admin-book/install/simple-registry-center.md b/dubbo-admin-book/install/simple-registry-center.md
index 3a83066..ca402b2 100644
--- a/dubbo-admin-book/install/simple-registry-center.md
+++ b/dubbo-admin-book/install/simple-registry-center.md
@@ -5,9 +5,10 @@
安装:
```sh
-wget http://code.alibabatech.com/mvn/releases/com/alibaba/dubbo-registry-simple/2.4.1/dubbo-registry-simple-2.4.1-assembly.tar.gz
-tar zxvf dubbo-registry-simple-2.4.1-assembly.tar.gz
-cd dubbo-registry-simple-2.4.1
+git clone https://github.com/apache/incubator-dubbo-ops
+cd incubator-dubbo-ops && mvn package
+cd dubbo-registry-simple/target && tar xvf dubbo-registry-simple-2.0.0-assembly.tar.gz
+cd dubbo-registry-simple-2.0.0
```
配置:
@@ -19,41 +20,41 @@
启动:
```sh
-./bin/start.sh
+./assembly.bin/start.sh
```
停止:
```sh
-./bin/stop.sh
+./assembly.bin/stop.sh
```
重启:
```sh
-./bin/restart.sh
+./assembly.bin/restart.sh
```
调试:
```sh
-./bin/start.sh debug
+./assembly.bin/start.sh debug
```
系统状态:
```sh
-./bin/dump.sh
+./assembly.bin/dump.sh
```
总控入口:
```sh
-./bin/server.sh start
-./bin/server.sh stop
-./bin/server.sh restart
-./bin/server.sh debug
-./bin/server.sh dump
+./assembly.bin/server.sh start
+./assembly.bin/server.sh stop
+./assembly.bin/server.sh restart
+./assembly.bin/server.sh debug
+./assembly.bin/server.sh dump
```
标准输出:
