ralf0131 closed pull request #28: change invalid link address URL: https://github.com/apache/incubator-dubbo-docs/pull/28
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/dubbo-admin-book-en/install/admin-console.md b/dubbo-admin-book-en/install/admin-console.md index 516a4f6..7f2a743 100644 --- a/dubbo-admin-book-en/install/admin-console.md +++ b/dubbo-admin-book-en/install/admin-console.md @@ -5,7 +5,7 @@ Include: route rule, dynamic configuration, service downgrade, access control, w Install: ```sh -wget http://apache.etoak.com/tomcat/tomcat-6/v6.0.35/bin/apache-tomcat-6.0.35.tar.gz +wget https://archive.apache.org/dist/tomcat/tomcat-6/v6.0.35/bin/apache-tomcat-6.0.35.tar.gz tar zxvf apache-tomcat-6.0.35.tar.gz cd apache-tomcat-6.0.35 rm -rf webapps/ROOT diff --git a/dubbo-admin-book-en/install/redis.md b/dubbo-admin-book-en/install/redis.md index ce48780..2a1f4c7 100644 --- a/dubbo-admin-book-en/install/redis.md +++ b/dubbo-admin-book-en/install/redis.md @@ -11,7 +11,7 @@ Redis configuration center cluster [^2] write multiple server in client side and Install: ```sh -wget http://redis.googlecode.com/files/redis-2.4.8.tar.gz +wget https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/redis/redis-2.4.8.tar.gz tar xzf redis-2.4.8.tar.gz cd redis-2.4.8 make diff --git a/dubbo-admin-book/install/admin-console.md b/dubbo-admin-book/install/admin-console.md index d93f0f7..bdaf303 100644 --- a/dubbo-admin-book/install/admin-console.md +++ b/dubbo-admin-book/install/admin-console.md @@ -5,7 +5,7 @@ 安装: ```sh -wget http://apache.etoak.com/tomcat/tomcat-6/v6.0.35/bin/apache-tomcat-6.0.35.tar.gz +wget https://archive.apache.org/dist/tomcat/tomcat-6/v6.0.35/bin/apache-tomcat-6.0.35.tar.gz tar zxvf apache-tomcat-6.0.35.tar.gz cd apache-tomcat-6.0.35 rm -rf webapps/ROOT diff --git a/dubbo-admin-book/install/redis.md b/dubbo-admin-book/install/redis.md index b7b518c..fe46707 100644 --- a/dubbo-admin-book/install/redis.md +++ b/dubbo-admin-book/install/redis.md @@ -11,7 +11,7 @@ Redis 注册中心集群 [^2] 采用在客户端同时写入多个服务器， 安装: ```sh -wget http://redis.googlecode.com/files/redis-2.4.8.tar.gz +wget https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/redis/redis-2.4.8.tar.gz tar xzf redis-2.4.8.tar.gz cd redis-2.4.8 make diff --git a/dubbo-user-book-en/benchmark-tool.md b/dubbo-user-book-en/benchmark-tool.md index e74d781..b64112e 100644 --- a/dubbo-user-book-en/benchmark-tool.md +++ b/dubbo-user-book-en/benchmark-tool.md @@ -1,6 +1,8 @@ # Beanchmark testing tool installer -Download the [benchmark installer](http://code.alibabatech.com/wiki/download/attachments/7669075/dubbo.benchmark-2.0.14.tar.gz)，and unzip it +* download： git clone https://github.com/apache/incubator-dubbo.git +* compile benchmark: cd incubator-dubbo/dubbo-test/dubbo-test-benchmark; mvn clean install +* uncompress benchmark： incubator-dubbo/dubbo-test/dubbo-test-benchmark/target/dubbo-test-benchmark-2.6.2-SNAPSHOT.tar.gz Read ReadMe.txt (the contents are as follows, in the compressed package.) diff --git a/dubbo-user-book-en/configuration/xml.md b/dubbo-user-book-en/configuration/xml.md index 99e5973..6789ffc 100644 --- a/dubbo-user-book-en/configuration/xml.md +++ b/dubbo-user-book-en/configuration/xml.md @@ -9,8 +9,8 @@ About the XML configuration items, see：[XML References](../references/xml/intr <?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"; - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd";> + xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd";> <dubbo:application name="hello-world-app" /> <dubbo:registry address="multicast://224.5.6.7:1234" /> <dubbo:protocol name="dubbo" port="20880" /> @@ -32,9 +32,9 @@ Or: ``` xml <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"; + xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"; xmlns:p="http://www.springframework.org/schema/p"; - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd";> + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd";> <dubbo:protocol name="jms" p:queue="your_queue" /> </beans> ``` diff --git a/dubbo-user-book-en/demos/multi-protocols.md b/dubbo-user-book-en/demos/multi-protocols.md index 5ee89bf..b5fb79b 100644 --- a/dubbo-user-book-en/demos/multi-protocols.md +++ b/dubbo-user-book-en/demos/multi-protocols.md @@ -10,8 +10,8 @@ Different protocol performance is not the same. Such as big data should use shor <?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"; - xsi:schemaLocation="http://www.springframework.org/schema/beanshttp://www.springframework.org/schema/beans/spring-beans.xsdhttp://code.alibabatech.com/schema/dubbohttp://code.alibabatech.com/schema/dubbo/dubbo.xsd";> + xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd";> <dubbo:application name="world" /> <dubbo:registry id="registry" address="10.20.141.150:9090" username="admin" password="hello1234" /> <!-- multiple protocols --> @@ -30,8 +30,8 @@ Different protocol performance is not the same. Such as big data should use shor <?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"; - xsi:schemaLocation="http://www.springframework.org/schema/beanshttp://www.springframework.org/schema/beans/spring-beans.xsdhttp://code.alibabatech.com/schema/dubbohttp://code.alibabatech.com/schema/dubbo/dubbo.xsd";> + xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd";> <dubbo:application name="world" /> <dubbo:registry id="registry" address="10.20.141.150:9090" username="admin" password="hello1234" /> <!-- multiple protocols--> diff --git a/dubbo-user-book-en/demos/multi-registry.md b/dubbo-user-book-en/demos/multi-registry.md index fb003b3..9d90bef 100644 --- a/dubbo-user-book-en/demos/multi-registry.md +++ b/dubbo-user-book-en/demos/multi-registry.md @@ -10,8 +10,8 @@ For example: Alibaba some services are not deployed in Qingdao, only deployed in <?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"; - xsi:schemaLocation="http://www.springframework.org/schema/beanshttp://www.springframework.org/schema/beans/spring-beans.xsdhttp://code.alibabatech.com/schema/dubbohttp://code.alibabatech.com/schema/dubbo/dubbo.xsd";> + xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd";> <dubbo:application name="world" /> <!-- Multi registries --> <dubbo:registry id="hangzhouRegistry" address="10.20.141.150:9090" /> @@ -29,8 +29,8 @@ For example: Some CRM services are specifically designed for international stati <?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"; - xsi:schemaLocation="http://www.springframework.org/schema/beanshttp://www.springframework.org/schema/beans/spring-beans.xsdhttp://code.alibabatech.com/schema/dubbohttp://code.alibabatech.com/schema/dubbo/dubbo.xsd";> + xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd";> <dubbo:application name="world" /> <!-- Multi registries --> <dubbo:registry id="chinaRegistry" address="10.20.141.150:9090" /> @@ -51,8 +51,8 @@ For example: CRM needs to call the PC2 service of Chinese station and internatio <?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"; - xsi:schemaLocation="http://www.springframework.org/schema/beanshttp://www.springframework.org/schema/beans/spring-beans.xsdhttp://code.alibabatech.com/schema/dubbohttp://code.alibabatech.com/schema/dubbo/dubbo.xsd";> + xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd";> <dubbo:application name="world" /> <!-- Multi registries --> <dubbo:registry id="chinaRegistry" address="10.20.141.150:9090" /> @@ -70,8 +70,8 @@ When testing, the service needs to be temporarily register to two registries, wh <?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"; - xsi:schemaLocation="http://www.springframework.org/schema/beanshttp://www.springframework.org/schema/beans/spring-beans.xsdhttp://code.alibabatech.com/schema/dubbohttp://code.alibabatech.com/schema/dubbo/dubbo.xsd";> + xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd";> <dubbo:application name="world" /> <!-- The vertical separation means that multiple registries are connected at the same time. Multiple cluster addresses of the same registry are separated by commas --> <dubbo:registry address="10.20.141.150:9090|10.20.154.177:9010" /> diff --git a/dubbo-user-book-en/quick-start.md b/dubbo-user-book-en/quick-start.md index effd71b..d2aa2e1 100644 --- a/dubbo-user-book-en/quick-start.md +++ b/dubbo-user-book-en/quick-start.md @@ -46,8 +46,8 @@ provider.xml： <?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"; - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd";> + xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd";> <!-- Provider application information for computing dependencies --> <dubbo:application name="hello-world-app" /> @@ -94,8 +94,8 @@ consumer.xml： <?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"; - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd";> + xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd";> <!-- Consumer application names, used to calculate dependencies,not matching conditions, do not be the same as the provider --> <dubbo:application name="consumer-of-helloworld-app" /> diff --git a/dubbo-user-book-en/references/registry/simple.md b/dubbo-user-book-en/references/registry/simple.md index 645d9c4..2b8f720 100644 --- a/dubbo-user-book-en/references/registry/simple.md +++ b/dubbo-user-book-en/references/registry/simple.md @@ -10,8 +10,8 @@ Register simple registry server as dubbo service: <?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"; - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsdhttp://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd";> + xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd";> <!-- application info configuration --> <dubbo:application name="simple-registry" /> <!-- service protocol configuration --> diff --git a/dubbo-user-book-en/references/xml/introduction.md b/dubbo-user-book-en/references/xml/introduction.md index 0713926..4cb8867 100644 --- a/dubbo-user-book-en/references/xml/introduction.md +++ b/dubbo-user-book-en/references/xml/introduction.md @@ -10,7 +10,7 @@ All configuration properties fall into three categories, see the "Function" in t * All properties will transform into URL [^3] which is generated by provider. The url will be subscribed by consumers through registry. Please see the `Corresponding URL parameter` in the table below for each property. -[^1]: XML Schema: http://code.alibabatech.com/schema/dubbo/dubbo.xsd +[^1]: XML Schema: http://dubbo.apache.org/schema/dubbo/dubbo.xsd [^2]: Notice: These three properties, group, interface, and version determine a service. All other properties are used for service governance or performance optimize. [^3]: URL format：`protocol://username:password@host:port/path?key=value&key=value` diff --git a/dubbo-user-book-en/simple-monitor.md b/dubbo-user-book-en/simple-monitor.md index 0ca3e6a..0ef2b68 100644 --- a/dubbo-user-book-en/simple-monitor.md +++ b/dubbo-user-book-en/simple-monitor.md @@ -7,8 +7,8 @@ ```xml <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"; - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsdhttp://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd";> + xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd";> <!-- configuration of current application --> <dubbo:application name="simple-monitor" /> @@ -45,8 +45,8 @@ ```xml <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"; - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsdhttp://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd";> + xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd";> <!-- configuration of current application --> <dubbo:application name="simple-monitor" /> diff --git a/dubbo-user-book/benchmark-tool.md b/dubbo-user-book/benchmark-tool.md index f2b530c..fe741aa 100644 --- a/dubbo-user-book/benchmark-tool.md +++ b/dubbo-user-book/benchmark-tool.md @@ -1,6 +1,8 @@ # 基准测试工具包 -下载 [benchmark压缩包](http://code.alibabatech.com/wiki/download/attachments/7669075/dubbo.benchmark-2.0.14.tar.gz)，并解压 +* 下载源码： git clone https://github.com/apache/incubator-dubbo.git +* 编译benchmark: cd incubator-dubbo/dubbo-test/dubbo-test-benchmark; mvn clean install +* 解压 benchmark压缩包： incubator-dubbo/dubbo-test/dubbo-test-benchmark/target/dubbo-test-benchmark-2.6.2-SNAPSHOT.tar.gz 阅读ReadMe.txt（内容如下，请以压缩包内的为准） diff --git a/dubbo-user-book/configuration/xml.md b/dubbo-user-book/configuration/xml.md index ff56167..7e8f5a4 100644 --- a/dubbo-user-book/configuration/xml.md +++ b/dubbo-user-book/configuration/xml.md @@ -9,8 +9,8 @@ <?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"; - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd";> + xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd";> <dubbo:application name="hello-world-app" /> <dubbo:registry address="multicast://224.5.6.7:1234" /> <dubbo:protocol name="dubbo" port="20880" /> @@ -32,9 +32,9 @@ ``` xml <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"; + xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"; xmlns:p="http://www.springframework.org/schema/p"; - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd";> + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd";> <dubbo:protocol name="jms" p:queue="your_queue" /> </beans> ``` diff --git a/dubbo-user-book/demos/multi-protocols.md b/dubbo-user-book/demos/multi-protocols.md index a9086e3..1400427 100644 --- a/dubbo-user-book/demos/multi-protocols.md +++ b/dubbo-user-book/demos/multi-protocols.md @@ -10,8 +10,8 @@ Dubbo 允许配置多协议，在不同服务上支持不同协议或者同一 <?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"; - xsi:schemaLocation="http://www.springframework.org/schema/beanshttp://www.springframework.org/schema/beans/spring-beans.xsdhttp://code.alibabatech.com/schema/dubbohttp://code.alibabatech.com/schema/dubbo/dubbo.xsd";> + xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd";> <dubbo:application name="world" /> <dubbo:registry id="registry" address="10.20.141.150:9090" username="admin" password="hello1234" /> <!-- 多协议配置 --> @@ -32,8 +32,8 @@ Dubbo 允许配置多协议，在不同服务上支持不同协议或者同一 <?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"; - xsi:schemaLocation="http://www.springframework.org/schema/beanshttp://www.springframework.org/schema/beans/spring-beans.xsdhttp://code.alibabatech.com/schema/dubbohttp://code.alibabatech.com/schema/dubbo/dubbo.xsd";> + xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd";> <dubbo:application name="world" /> <dubbo:registry id="registry" address="10.20.141.150:9090" username="admin" password="hello1234" /> <!-- 多协议配置 --> diff --git a/dubbo-user-book/demos/multi-registry.md b/dubbo-user-book/demos/multi-registry.md index 70499c6..c0e4a64 100644 --- a/dubbo-user-book/demos/multi-registry.md +++ b/dubbo-user-book/demos/multi-registry.md @@ -10,8 +10,8 @@ Dubbo 支持同一服务向多注册中心同时注册，或者不同服务分 <?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"; - xsi:schemaLocation="http://www.springframework.org/schema/beanshttp://www.springframework.org/schema/beans/spring-beans.xsdhttp://code.alibabatech.com/schema/dubbohttp://code.alibabatech.com/schema/dubbo/dubbo.xsd";> + xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd";> <dubbo:application name="world" /> <!-- 多注册中心配置 --> <dubbo:registry id="hangzhouRegistry" address="10.20.141.150:9090" /> @@ -30,8 +30,8 @@ Dubbo 支持同一服务向多注册中心同时注册，或者不同服务分 <?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"; - xsi:schemaLocation="http://www.springframework.org/schema/beanshttp://www.springframework.org/schema/beans/spring-beans.xsdhttp://code.alibabatech.com/schema/dubbohttp://code.alibabatech.com/schema/dubbo/dubbo.xsd";> + xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd";> <dubbo:application name="world" /> <!-- 多注册中心配置 --> <dubbo:registry id="chinaRegistry" address="10.20.141.150:9090" /> @@ -51,8 +51,8 @@ Dubbo 支持同一服务向多注册中心同时注册，或者不同服务分 <?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"; - xsi:schemaLocation="http://www.springframework.org/schema/beanshttp://www.springframework.org/schema/beans/spring-beans.xsdhttp://code.alibabatech.com/schema/dubbohttp://code.alibabatech.com/schema/dubbo/dubbo.xsd";> + xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd";> <dubbo:application name="world" /> <!-- 多注册中心配置 --> <dubbo:registry id="chinaRegistry" address="10.20.141.150:9090" /> @@ -70,8 +70,8 @@ Dubbo 支持同一服务向多注册中心同时注册，或者不同服务分 <?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"; - xsi:schemaLocation="http://www.springframework.org/schema/beanshttp://www.springframework.org/schema/beans/spring-beans.xsdhttp://code.alibabatech.com/schema/dubbohttp://code.alibabatech.com/schema/dubbo/dubbo.xsd";> + xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd";> <dubbo:application name="world" /> <!-- 多注册中心配置，竖号分隔表示同时连接多个不同注册中心，同一注册中心的多个集群地址用逗号分隔 --> <dubbo:registry address="10.20.141.150:9090|10.20.154.177:9010" /> diff --git a/dubbo-user-book/quick-start.md b/dubbo-user-book/quick-start.md index 3996af3..c254fcf 100644 --- a/dubbo-user-book/quick-start.md +++ b/dubbo-user-book/quick-start.md @@ -46,8 +46,8 @@ provider.xml： <?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"; - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd";> + xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd";> <!-- 提供方应用信息，用于计算依赖关系 --> <dubbo:application name="hello-world-app" /> @@ -94,8 +94,8 @@ consumer.xml： <?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"; - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd";> + xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd";> <!-- 消费方应用名，用于计算依赖关系，不是匹配条件，不要与提供方一样 --> <dubbo:application name="consumer-of-helloworld-app" /> diff --git a/dubbo-user-book/references/registry/simple.md b/dubbo-user-book/references/registry/simple.md index b20dbc5..845c879 100644 --- a/dubbo-user-book/references/registry/simple.md +++ b/dubbo-user-book/references/registry/simple.md @@ -10,8 +10,8 @@ Simple 注册中心本身就是一个普通的 Dubbo 服务，可以减少第三 <?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"; - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsdhttp://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd";> + xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd";> <!-- 当前应用信息配置 --> <dubbo:application name="simple-registry" /> <!-- 暴露服务协议配置 --> diff --git a/dubbo-user-book/references/xml/introduction.md b/dubbo-user-book/references/xml/introduction.md index 7b488dc..a66df49 100644 --- a/dubbo-user-book/references/xml/introduction.md +++ b/dubbo-user-book/references/xml/introduction.md @@ -10,6 +10,6 @@ * 所有配置最终都将转换为 URL [^3] 表示，并由服务提供方生成，经注册中心传递给消费方，各属性对应 URL 的参数，参见配置项一览表中的 "对应URL参数" 列。 -[^1]: XML Schema: http://code.alibabatech.com/schema/dubbo/dubbo.xsd +[^1]: XML Schema: http://dubbo.apache.org/schema/dubbo/dubbo.xsd [^2]: 注意：只有 group，interface，version 是服务的匹配条件，三者决定是不是同一个服务，其它配置项均为调优和治理参数。 [^3]: URL 格式：`protocol://username:password@host:port/path?key=value&key=value` diff --git a/dubbo-user-book/simple-monitor.md b/dubbo-user-book/simple-monitor.md index 19ec008..9c7b2cf 100644 --- a/dubbo-user-book/simple-monitor.md +++ b/dubbo-user-book/simple-monitor.md @@ -7,8 +7,8 @@ ```xml <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"; - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsdhttp://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd";> + xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd";> <!-- 当前应用信息配置 --> <dubbo:application name="simple-monitor" /> @@ -45,8 +45,8 @@ ```xml <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"; - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsdhttp://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd";> + xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd";> <!-- 当前应用信息配置 --> <dubbo:application name="simple-monitor" /> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services --------------------------------------------------------------------- To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
