diff --git a/README.md b/README.md index f39343868..60cfbb8a6 100644 --- a/README.md +++ b/README.md @@ -2,16 +2,14 @@ [![Build Status](https://travis-ci.org/apache/incubator-dubbo-spring-boot-project.svg?branch=master)](https://travis-ci.org/apache/incubator-dubbo-spring-boot-project) [![codecov](https://codecov.io/gh/apache/incubator-dubbo-spring-boot-project/branch/master/graph/badge.svg)](https://codecov.io/gh/apache/incubator-dubbo-spring-boot-project) -[![Gitter](https://badges.gitter.im/alibaba/dubbo.svg)](https://gitter.im/alibaba/dubbo?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) ![license](https://img.shields.io/github/license/apache/incubator-dubbo-spring-boot-project.svg) -![maven](https://img.shields.io/maven-central/v/com.alibaba.boot/dubbo-spring-boot-starter.svg) [Apache Dubbo(incubating)](https://github.com/apache/incubator-dubbo) Spring Boot Project makes it easy to create [Spring Boot](https://github.com/spring-projects/spring-boot/) application using Dubbo as RPC Framework. What's more, it aslo provides * [auto-configure features](dubbo-spring-boot-autoconfigure) (e.g., annotation-driven, auto configuration, externalized configuration). * [production-ready features](dubbo-spring-boot-actuator) (e.g., security, health checks, externalized configuration). -> Apache Dubbo(incubating) is a high-performance, java based [RPC](https://en.wikipedia.org/wiki/Remote_procedure_call) framework open-sourced by Alibaba. As in many RPC systems, dubbo is based around the idea of defining a service, specifying the methods that can be called remotely with their parameters and return types. On the server side, the server implements this interface and runs a dubbo server to handle client calls. On the client side, the client has a stub that provides the same methods as the server. +> Apache Dubbo (incubating) |ˈdʌbəʊ| is a high-performance, light weight, java based RPC framework. Dubbo offers three key functionalities, which include interface based remote call, fault tolerance & load balancing, and automatic service registration & discovery. ## [中文说明](README_CN.md) @@ -167,7 +165,7 @@ public interface DemoService { ```properties # Spring boot application spring.application.name=dubbo-auto-configuration-provider-demo - # Base packages to scan Dubbo Component: @com.alibaba.dubbo.config.annotation.Service + # Base packages to scan Dubbo Component: @org.apache.dubbo.config.annotation.Service dubbo.scan.base-packages=org.apache.dubbo.spring.boot.demo.provider.service # Dubbo Application diff --git a/README_CN.md b/README_CN.md index 3912038ef..56187debc 100644 --- a/README_CN.md +++ b/README_CN.md @@ -2,20 +2,17 @@ [![Build Status](https://travis-ci.org/apache/incubator-dubbo-spring-boot-project.svg?branch=master)](https://travis-ci.org/apache/incubator-dubbo-spring-boot-project) [![codecov](https://codecov.io/gh/apache/incubator-dubbo-spring-boot-project/branch/master/graph/badge.svg)](https://codecov.io/gh/apache/incubator-dubbo-spring-boot-project) -[![Gitter](https://badges.gitter.im/alibaba/dubbo.svg)](https://gitter.im/alibaba/dubbo?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) ![license](https://img.shields.io/github/license/apache/incubator-dubbo-spring-boot-project.svg) -![maven](https://img.shields.io/maven-central/v/com.alibaba.boot/dubbo-spring-boot-starter.svg) -[Dubbo](https://github.com/alibaba/dubbo) Spring Boot 工程致力于简化 Dubbo RPC 框架在 +[Dubbo](https://dubbo.apache.org/zh-cn/index.html) Apache Dubbo™ (incubating)是一款高性能Java RPC框架。 [Spring Boot](https://github.com/spring-projects/spring-boot/) 应用场景的开发。同时也整合了 Spring Boot 特性: * [自动装配](dubbo-spring-boot-autoconfigure) (比如: 注解驱动, 自动装配等). * [Production-Ready](dubbo-spring-boot-actuator) (比如: 安全, 健康检查, 外部化配置等). +> Apache Dubbo (incubating) |ˈdʌbəʊ| 是一款高性能、轻量级的开源Java RPC框架,它提供了三大核心能力:面向接口的远程方法调用,智能容错和负载均衡,以及服务自动注册和发现。 -> Dubbo *|ˈdʌbəʊ|* is a high-performance, java based [RPC](https://en.wikipedia.org/wiki/Remote_procedure_call) framework open-sourced by Alibaba. As in many RPC systems, dubbo is based around the idea of defining a service, specifying the methods that can be called remotely with their parameters and return types. On the server side, the server implements this interface and runs a dubbo server to handle client calls. On the client side, the client has a stub that provides the same methods as the server. - ## [English README](README_CN.md) @@ -173,7 +170,7 @@ public interface DemoService { ```properties # Spring boot application spring.application.name=dubbo-auto-configuration-provider-demo - # Base packages to scan Dubbo Component: @com.alibaba.dubbo.config.annotation.Service + # Base packages to scan Dubbo Component: @org.apache.dubbo.config.annotation.Service dubbo.scan.base-packages=org.apache.dubbo.spring.boot.demo.provider.service # Dubbo Application diff --git a/dubbo-spring-boot-actuator/README.md b/dubbo-spring-boot-actuator/README.md index 8f52e1bd4..ec743c619 100644 --- a/dubbo-spring-boot-actuator/README.md +++ b/dubbo-spring-boot-actuator/README.md @@ -122,16 +122,16 @@ externalized configuration [`StatusChecker`'s defaults](#statuschecker-defaults) - `META-INF/dubbo/internal/com.alibaba.dubbo.common.status.StatusChecker` declares Build-in `StatusChecker`s as follow : + `META-INF/dubbo/internal/org.apache.dubbo.common.status.StatusChecker` declares Build-in `StatusChecker`s as follow : ```properties -registry=com.alibaba.dubbo.registry.status.RegistryStatusChecker -spring=com.alibaba.dubbo.config.spring.status.SpringStatusChecker -datasource=com.alibaba.dubbo.config.spring.status.DataSourceStatusChecker -memory=com.alibaba.dubbo.common.status.support.MemoryStatusChecker -load=com.alibaba.dubbo.common.status.support.LoadStatusChecker -server=com.alibaba.dubbo.rpc.protocol.dubbo.status.ServerStatusChecker -threadpool=com.alibaba.dubbo.rpc.protocol.dubbo.status.ThreadPoolStatusChecker +registry=org.apache.dubbo.registry.status.RegistryStatusChecker +spring=org.apache.dubbo.config.spring.status.SpringStatusChecker +datasource=org.apache.dubbo.config.spring.status.DataSourceStatusChecker +memory=org.apache.dubbo.common.status.support.MemoryStatusChecker +load=org.apache.dubbo.common.status.support.LoadStatusChecker +server=org.apache.dubbo.rpc.protocol.dubbo.status.ServerStatusChecker +threadpool=org.apache.dubbo.rpc.protocol.dubbo.status.ThreadPoolStatusChecker ``` @@ -175,11 +175,11 @@ Actuator endpoint `dubbo` supports Actuator Endpoints : "dubbo": "2.7.0" }, "urls": { - "dubbo": "https://github.com/alibaba/dubbo", - "google-group": "http://groups.google.com/group/dubbo", - "github": "https://github.com/dubbo/dubbo-spring-boot-project", - "issues": "https://github.com/dubbo/dubbo-spring-boot-project/issues", - "git": "https://github.com/dubbo/dubbo-spring-boot-project.git" + "dubbo": "https://github.com/apache/incubator-dubbo/", + "google-group": "dev@dubbo.apache.org", + "github": "https://github.com/apache/incubator-dubbo-spring-boot-project", + "issues": "https://github.com/apache/incubator-dubbo-spring-boot-project/issues", + "git": "https://github.com/apache/incubator-dubbo-spring-boot-project.git" } } ``` @@ -222,7 +222,7 @@ The structure of JSON is simple Key-Value format , the key is property name as a "actives": null, "cache": null, "callbacks": null, - "class": "com.alibaba.dubbo.config.spring.ServiceBean", + "class": "org.apache.dubbo.config.spring.ServiceBean", "cluster": null, "connections": null, "delay": null, @@ -278,7 +278,7 @@ The key is the Bean name of `ServiceBean` , `ServiceBean`'s properties compose v "actives": null, "cache": null, "callbacks": null, - "class": "com.alibaba.dubbo.config.spring.ReferenceBean", + "class": "org.apache.dubbo.config.spring.ReferenceBean", "client": null, "cluster": null, "connections": null, @@ -315,7 +315,7 @@ The key is the Bean name of `ServiceBean` , `ServiceBean`'s properties compose v "validation": null, "version": "1.0.0", "invoker": { - "class": "com.alibaba.dubbo.common.bytecode.proxy0" + "class": "org.apache.dubbo.common.bytecode.proxy0" } } } @@ -334,7 +334,7 @@ The key is the string presentation of `@Reference` `Field` or `Method ` , `Refe "ApplicationConfig": { "dubbo-consumer-demo": { "architecture": null, - "class": "com.alibaba.dubbo.config.ApplicationConfig", + "class": "org.apache.dubbo.config.ApplicationConfig", "compiler": null, "dumpDirectory": null, "environment": null, @@ -364,7 +364,7 @@ The key is the string presentation of `@Reference` `Field` or `Method ` , `Refe "accesslog": null, "buffer": null, "charset": null, - "class": "com.alibaba.dubbo.config.ProtocolConfig", + "class": "org.apache.dubbo.config.ProtocolConfig", "client": null, "codec": null, "contextpath": null, diff --git a/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/src/main/resources/application.properties b/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/src/main/resources/application.properties index 4f9939cd4..b3de3d9c1 100644 --- a/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/src/main/resources/application.properties +++ b/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/src/main/resources/application.properties @@ -1,6 +1,6 @@ # Spring boot application spring.application.name=dubbo-auto-configuration-provider-demo -# Base packages to scan Dubbo Component: @com.alibaba.dubbo.config.annotation.Service +# Base packages to scan Dubbo Component: @org.apache.dubbo.config.annotation.Service dubbo.scan.base-packages=org.apache.dubbo.spring.boot.demo.provider.service # Dubbo Application ## The default value of dubbo.application.name is ${spring.application.name} diff --git a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/src/main/resources/application.properties b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/src/main/resources/application.properties index eca5996f4..d66c19dea 100644 --- a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/src/main/resources/application.properties +++ b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/src/main/resources/application.properties @@ -1,7 +1,6 @@ # Spring boot application spring.application.name=dubbo-registry-zookeeper-provider-sample - -# Base packages to scan Dubbo Component: @com.alibaba.dubbo.config.annotation.Service +# Base packages to scan Dubbo Component: @org.apache.dubbo.config.annotation.Service dubbo.scan.base-packages=org.apache.dubbo.spring.boot.demo.provider.service # Dubbo Application diff --git a/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/src/main/resources/application.properties b/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/src/main/resources/application.properties index bf406798e..400759a7b 100644 --- a/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/src/main/resources/application.properties +++ b/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/src/main/resources/application.properties @@ -1,7 +1,6 @@ # Spring boot application spring.application.name=dubbo-externalized-configuration-provider-sample - -# Base packages to scan Dubbo Component: @com.alibaba.dubbo.config.annotation.Service +# Base packages to scan Dubbo Component: @org.apache.dubbo.config.annotation.Service dubbo.scan.base-packages=org.apache.dubbo.spring.boot.demo.provider.service # Dubbo Application