You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by wu...@apache.org on 2018/04/27 06:49:48 UTC
[incubator-servicecomb-java-chassis] branch master updated: SCB-515
change all config of 'cse.xxx' to 'servicecomb.xxx'
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new 20ff37b SCB-515 change all config of 'cse.xxx' to 'servicecomb.xxx'
20ff37b is described below
commit 20ff37b489819a05e913ec4aeb50c376bf56bb8b
Author: zhengyangyong <ya...@huawei.com>
AuthorDate: Mon Apr 23 10:13:16 2018 +0800
SCB-515 change all config of 'cse.xxx' to 'servicecomb.xxx'
Signed-off-by: zhengyangyong <ya...@huawei.com>
---
.../business-service-jaxrs/src/main/resources/microservice.yaml | 2 +-
common/common-rest/src/test/resources/microservice.yaml | 2 +-
core/src/test/resources/microservice.yaml | 2 +-
core/src/test/resources/test/test/microservice.yaml | 2 +-
.../crossapp-client/src/main/resources/microservice.yaml | 2 +-
.../crossapp-server/src/main/resources/microservice.yaml | 2 +-
demo/demo-edge/authentication/src/main/resources/microservice.yaml | 2 +-
demo/demo-edge/business-1-1-0/src/main/resources/microservice.yaml | 2 +-
demo/demo-edge/business-1.0.0/src/main/resources/microservice.yaml | 2 +-
demo/demo-edge/business-2.0.0/src/main/resources/microservice.yaml | 2 +-
demo/demo-edge/consumer/src/main/resources/microservice.yaml | 2 +-
demo/demo-edge/edge-service/src/main/resources/microservice.yaml | 2 +-
demo/demo-jaxrs/jaxrs-client/src/main/resources/microservice.yaml | 2 +-
demo/demo-jaxrs/jaxrs-server/src/main/resources/microservice.yaml | 2 +-
demo/demo-multiple/a-client/src/main/resources/microservice.yaml | 2 +-
demo/demo-multiple/a-server/src/main/resources/microservice.yaml | 2 +-
demo/demo-multiple/b-client/src/main/resources/microservice.yaml | 2 +-
demo/demo-multiple/b-server/src/main/resources/microservice.yaml | 2 +-
demo/demo-pojo/pojo-client/src/main/resources/microservice.yaml | 2 +-
demo/demo-pojo/pojo-server/src/main/resources/microservice.yaml | 2 +-
.../src/test/resources/microservice.yaml | 2 +-
.../src/main/resources/microservice.yaml | 2 +-
.../demo-spring-boot-zuul-proxy/src/test/resources/microservice.yaml | 2 +-
.../src/main/resources/microservice.yaml | 2 +-
.../src/main/resources/microservice.yaml | 2 +-
.../demo-spring-boot-pojo-client/src/main/resources/microservice.yaml | 2 +-
.../demo-spring-boot-pojo-server/src/main/resources/microservice.yaml | 2 +-
.../springmvc-client/src/main/resources/microservice.yaml | 2 +-
.../springmvc-server/src/main/resources/microservice.yaml | 2 +-
demo/perf/src/main/resources/microservice.yaml | 2 +-
dynamic-config/config-apollo/src/test/resources/microservice.yaml | 2 +-
dynamic-config/config-cc/src/test/resources/microservice.yaml | 2 +-
.../dynamic-config-tests/src/test/resources/microservice.yaml | 3 ++-
integration-tests/jaxrs-tests/src/test/resources/microservice.yaml | 2 +-
integration-tests/pojo-test/src/test/resources/microservice.yaml | 2 +-
.../spring-zuul-tracing-tests/src/test/resources/microservice.yaml | 4 +---
.../springmvc-tests/src/test/resources/microservice.yaml | 2 +-
integration-tests/tracing-tests/src/test/resources/microservice.yaml | 4 +---
.../auth-sample/auth-consumer/src/main/resources/microservice.yaml | 2 +-
.../auth-sample/auth-provider/src/main/resources/microservice.yaml | 2 +-
samples/bmi/calculator/src/main/resources/microservice.yaml | 2 +-
samples/bmi/webapp/src/main/resources/microservice.yaml | 2 +-
.../codefirst-consumer/src/main/resources/microservice.yaml | 2 +-
.../codefirst-provider/src/main/resources/microservice.yaml | 2 +-
samples/config-apollo-sample/src/main/resources/microservice.yaml | 2 +-
.../custom-handler-consumer/src/main/resources/microservice.yaml | 2 +-
.../custom-handler-provider/src/main/resources/microservice.yaml | 2 +-
.../jaxrs-sample/jaxrs-consumer/src/main/resources/microservice.yaml | 2 +-
.../jaxrs-sample/jaxrs-provider/src/main/resources/microservice.yaml | 2 +-
.../metrics-extend-healthcheck/src/main/resources/microservice.yaml | 2 +-
.../pojo-sample/pojo-consumer/src/main/resources/microservice.yaml | 2 +-
.../pojo-sample/pojo-provider/src/main/resources/microservice.yaml | 2 +-
.../springmvc-consumer/src/main/resources/microservice.yaml | 2 +-
.../springmvc-provider/src/main/resources/microservice.yaml | 2 +-
service-registry/src/test/resources/microservice.yaml | 2 +-
55 files changed, 56 insertions(+), 59 deletions(-)
diff --git a/archetypes/business-service-jaxrs/src/main/resources/microservice.yaml b/archetypes/business-service-jaxrs/src/main/resources/microservice.yaml
index ddf5f39..90de807 100644
--- a/archetypes/business-service-jaxrs/src/main/resources/microservice.yaml
+++ b/archetypes/business-service-jaxrs/src/main/resources/microservice.yaml
@@ -30,7 +30,7 @@ service_description:
name: business-service
#Indicates a service version
version: 1.0.0
-cse:
+servicecomb:
service:
#Specifies the service center IP address.
registry:
diff --git a/common/common-rest/src/test/resources/microservice.yaml b/common/common-rest/src/test/resources/microservice.yaml
index 4de4813..b47bdef 100644
--- a/common/common-rest/src/test/resources/microservice.yaml
+++ b/common/common-rest/src/test/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: test
service_description:
name: test
version: 0.0.1
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/core/src/test/resources/microservice.yaml b/core/src/test/resources/microservice.yaml
index 698b20f..a49e8e3 100644
--- a/core/src/test/resources/microservice.yaml
+++ b/core/src/test/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: app
service_description:
name: perfClient
version: 0.0.1
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/core/src/test/resources/test/test/microservice.yaml b/core/src/test/resources/test/test/microservice.yaml
index 9b6c0fe..a82dcd3 100644
--- a/core/src/test/resources/test/test/microservice.yaml
+++ b/core/src/test/resources/test/test/microservice.yaml
@@ -19,7 +19,7 @@ service_description:
name: default
version: 0.0.1
propertyExtentedClass: org.apache.servicecomb.serviceregistry.MicroServicePropertyExtendedStub
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/demo/demo-crossapp/crossapp-client/src/main/resources/microservice.yaml b/demo/demo-crossapp/crossapp-client/src/main/resources/microservice.yaml
index 764149d..4590f8f 100644
--- a/demo/demo-crossapp/crossapp-client/src/main/resources/microservice.yaml
+++ b/demo/demo-crossapp/crossapp-client/src/main/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: appClient
service_description:
name: appClientService
version: 0.0.1
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/demo/demo-crossapp/crossapp-server/src/main/resources/microservice.yaml b/demo/demo-crossapp/crossapp-server/src/main/resources/microservice.yaml
index d1170eb..f58cba5 100644
--- a/demo/demo-crossapp/crossapp-server/src/main/resources/microservice.yaml
+++ b/demo/demo-crossapp/crossapp-server/src/main/resources/microservice.yaml
@@ -25,7 +25,7 @@ instance_description:
properties:
tag0: value0
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/demo/demo-edge/authentication/src/main/resources/microservice.yaml b/demo/demo-edge/authentication/src/main/resources/microservice.yaml
index 8e98001..d532582 100644
--- a/demo/demo-edge/authentication/src/main/resources/microservice.yaml
+++ b/demo/demo-edge/authentication/src/main/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: edge
service_description:
name: auth
version: 0.0.1
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/demo/demo-edge/business-1-1-0/src/main/resources/microservice.yaml b/demo/demo-edge/business-1-1-0/src/main/resources/microservice.yaml
index 109e27a..1120623 100644
--- a/demo/demo-edge/business-1-1-0/src/main/resources/microservice.yaml
+++ b/demo/demo-edge/business-1-1-0/src/main/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: edge
service_description:
name: business
version: 1.1.0
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/demo/demo-edge/business-1.0.0/src/main/resources/microservice.yaml b/demo/demo-edge/business-1.0.0/src/main/resources/microservice.yaml
index 2046f74..296bf39 100644
--- a/demo/demo-edge/business-1.0.0/src/main/resources/microservice.yaml
+++ b/demo/demo-edge/business-1.0.0/src/main/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: edge
service_description:
name: business
version: 1.0.0
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/demo/demo-edge/business-2.0.0/src/main/resources/microservice.yaml b/demo/demo-edge/business-2.0.0/src/main/resources/microservice.yaml
index b7e2e63..18982e9 100644
--- a/demo/demo-edge/business-2.0.0/src/main/resources/microservice.yaml
+++ b/demo/demo-edge/business-2.0.0/src/main/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: edge
service_description:
name: business
version: 2.0.0
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/demo/demo-edge/consumer/src/main/resources/microservice.yaml b/demo/demo-edge/consumer/src/main/resources/microservice.yaml
index 85071dd..6fdaaf9 100644
--- a/demo/demo-edge/consumer/src/main/resources/microservice.yaml
+++ b/demo/demo-edge/consumer/src/main/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: edge
service_description:
name: consumer
version: 0.0.1
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/demo/demo-edge/edge-service/src/main/resources/microservice.yaml b/demo/demo-edge/edge-service/src/main/resources/microservice.yaml
index cb1fdad..f6161c3 100644
--- a/demo/demo-edge/edge-service/src/main/resources/microservice.yaml
+++ b/demo/demo-edge/edge-service/src/main/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: edge
service_description:
name: edge
version: 0.0.1
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/demo/demo-jaxrs/jaxrs-client/src/main/resources/microservice.yaml b/demo/demo-jaxrs/jaxrs-client/src/main/resources/microservice.yaml
index b1c7463..3defb01 100644
--- a/demo/demo-jaxrs/jaxrs-client/src/main/resources/microservice.yaml
+++ b/demo/demo-jaxrs/jaxrs-client/src/main/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: jaxrstest
service_description:
name: jaxrsClient
version: 0.0.1
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/demo/demo-jaxrs/jaxrs-server/src/main/resources/microservice.yaml b/demo/demo-jaxrs/jaxrs-server/src/main/resources/microservice.yaml
index 6cfae54..f32d547 100644
--- a/demo/demo-jaxrs/jaxrs-server/src/main/resources/microservice.yaml
+++ b/demo/demo-jaxrs/jaxrs-server/src/main/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: jaxrstest
service_description:
name: jaxrs
version: 0.0.2
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/demo/demo-multiple/a-client/src/main/resources/microservice.yaml b/demo/demo-multiple/a-client/src/main/resources/microservice.yaml
index ec2dc79..9a8ea2d 100644
--- a/demo/demo-multiple/a-client/src/main/resources/microservice.yaml
+++ b/demo/demo-multiple/a-client/src/main/resources/microservice.yaml
@@ -20,7 +20,7 @@ APPLICATION_ID: multiple
service_description:
name: a-client
version: 0.0.1
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/demo/demo-multiple/a-server/src/main/resources/microservice.yaml b/demo/demo-multiple/a-server/src/main/resources/microservice.yaml
index 5a48c8e..b24d620 100644
--- a/demo/demo-multiple/a-server/src/main/resources/microservice.yaml
+++ b/demo/demo-multiple/a-server/src/main/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: multiple
service_description:
name: a-server
version: 0.0.1
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/demo/demo-multiple/b-client/src/main/resources/microservice.yaml b/demo/demo-multiple/b-client/src/main/resources/microservice.yaml
index 96ffb57..ea9f8a8 100644
--- a/demo/demo-multiple/b-client/src/main/resources/microservice.yaml
+++ b/demo/demo-multiple/b-client/src/main/resources/microservice.yaml
@@ -20,7 +20,7 @@ APPLICATION_ID: multiple
service_description:
name: b-client
version: 0.0.1
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/demo/demo-multiple/b-server/src/main/resources/microservice.yaml b/demo/demo-multiple/b-server/src/main/resources/microservice.yaml
index 48a55c5..814dbfa 100644
--- a/demo/demo-multiple/b-server/src/main/resources/microservice.yaml
+++ b/demo/demo-multiple/b-server/src/main/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: multiple
service_description:
name: b-server
version: 0.0.1
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/demo/demo-pojo/pojo-client/src/main/resources/microservice.yaml b/demo/demo-pojo/pojo-client/src/main/resources/microservice.yaml
index 302c3d0..7be293d 100644
--- a/demo/demo-pojo/pojo-client/src/main/resources/microservice.yaml
+++ b/demo/demo-pojo/pojo-client/src/main/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: pojotest
service_description:
name: pojoClient
version: 0.0.1
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/demo/demo-pojo/pojo-server/src/main/resources/microservice.yaml b/demo/demo-pojo/pojo-server/src/main/resources/microservice.yaml
index a5f28e5..9ca4af4 100644
--- a/demo/demo-pojo/pojo-server/src/main/resources/microservice.yaml
+++ b/demo/demo-pojo/pojo-server/src/main/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: pojotest
service_description:
name: pojo
version: 0.0.4
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/demo/demo-spring-boot-discovery/demo-spring-boot-discovery-client/src/test/resources/microservice.yaml b/demo/demo-spring-boot-discovery/demo-spring-boot-discovery-client/src/test/resources/microservice.yaml
index e01a6b2..346bef0 100644
--- a/demo/demo-spring-boot-discovery/demo-spring-boot-discovery-client/src/test/resources/microservice.yaml
+++ b/demo/demo-spring-boot-discovery/demo-spring-boot-discovery-client/src/test/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: discoverytest
service_description:
name: discoveryClient
version: 0.0.2
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/demo/demo-spring-boot-discovery/demo-spring-boot-discovery-server/src/main/resources/microservice.yaml b/demo/demo-spring-boot-discovery/demo-spring-boot-discovery-server/src/main/resources/microservice.yaml
index 1be593d..c4297e4 100644
--- a/demo/demo-spring-boot-discovery/demo-spring-boot-discovery-server/src/main/resources/microservice.yaml
+++ b/demo/demo-spring-boot-discovery/demo-spring-boot-discovery-server/src/main/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: discoverytest
service_description:
name: discoveryServer
version: 0.0.2
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/demo/demo-spring-boot-discovery/demo-spring-boot-zuul-proxy/src/test/resources/microservice.yaml b/demo/demo-spring-boot-discovery/demo-spring-boot-zuul-proxy/src/test/resources/microservice.yaml
index 9c7afa5..0901fe1 100644
--- a/demo/demo-spring-boot-discovery/demo-spring-boot-zuul-proxy/src/test/resources/microservice.yaml
+++ b/demo/demo-spring-boot-discovery/demo-spring-boot-zuul-proxy/src/test/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: discoverytest
service_description:
name: discoveryGateway
version: 0.0.2
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-client/src/main/resources/microservice.yaml b/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-client/src/main/resources/microservice.yaml
index e68182a..c6e5a22 100644
--- a/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-client/src/main/resources/microservice.yaml
+++ b/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-client/src/main/resources/microservice.yaml
@@ -20,7 +20,7 @@ APPLICATION_ID: spring-boot-jaxrstest
service_description:
name: jaxrsClient
version: 0.0.1
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-server/src/main/resources/microservice.yaml b/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-server/src/main/resources/microservice.yaml
index 33c260a..76a3704 100644
--- a/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-server/src/main/resources/microservice.yaml
+++ b/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-server/src/main/resources/microservice.yaml
@@ -20,7 +20,7 @@ APPLICATION_ID: spring-boot-jaxrstest
service_description:
name: jaxrs
version: 0.0.1
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/src/main/resources/microservice.yaml b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/src/main/resources/microservice.yaml
index b70e2da..4069ea2 100644
--- a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/src/main/resources/microservice.yaml
+++ b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/src/main/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: spring-boot-pojotest
service_description:
name: pojoClient
version: 0.0.1
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/resources/microservice.yaml b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/resources/microservice.yaml
index fbf28fb..91fa6c7 100644
--- a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/resources/microservice.yaml
+++ b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: spring-boot-pojotest
service_description:
name: pojo
version: 0.0.1
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/demo/demo-springmvc/springmvc-client/src/main/resources/microservice.yaml b/demo/demo-springmvc/springmvc-client/src/main/resources/microservice.yaml
index 72d65bf..541a8c7 100644
--- a/demo/demo-springmvc/springmvc-client/src/main/resources/microservice.yaml
+++ b/demo/demo-springmvc/springmvc-client/src/main/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: springmvctest
service_description:
name: springmvcClient
version: 0.0.1
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:9980,http://127.0.0.1:30100
diff --git a/demo/demo-springmvc/springmvc-server/src/main/resources/microservice.yaml b/demo/demo-springmvc/springmvc-server/src/main/resources/microservice.yaml
index fbe42c3..b9c9638 100644
--- a/demo/demo-springmvc/springmvc-server/src/main/resources/microservice.yaml
+++ b/demo/demo-springmvc/springmvc-server/src/main/resources/microservice.yaml
@@ -29,7 +29,7 @@ service_description:
property:
checksession: true
cse.uploads.directory: target
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/demo/perf/src/main/resources/microservice.yaml b/demo/perf/src/main/resources/microservice.yaml
index 7d9b556..e597667 100644
--- a/demo/perf/src/main/resources/microservice.yaml
+++ b/demo/perf/src/main/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: perfTest
service_description:
name: perf1
version: 0.0.1
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/dynamic-config/config-apollo/src/test/resources/microservice.yaml b/dynamic-config/config-apollo/src/test/resources/microservice.yaml
index 6c8b496..3b19383 100644
--- a/dynamic-config/config-apollo/src/test/resources/microservice.yaml
+++ b/dynamic-config/config-apollo/src/test/resources/microservice.yaml
@@ -32,7 +32,7 @@ apollo:
refreshInterval: 30
firstRefreshInterval: 0
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/dynamic-config/config-cc/src/test/resources/microservice.yaml b/dynamic-config/config-cc/src/test/resources/microservice.yaml
index 445cfa6..e0d5d7d 100644
--- a/dynamic-config/config-cc/src/test/resources/microservice.yaml
+++ b/dynamic-config/config-cc/src/test/resources/microservice.yaml
@@ -42,7 +42,7 @@ eureka:
client:
serviceUrl:
defaultZone: http://172.16.8.8:30100/
-cse:
+servicecomb:
config:
client:
serviceName: testDemo
diff --git a/integration-tests/dynamic-config-tests/src/test/resources/microservice.yaml b/integration-tests/dynamic-config-tests/src/test/resources/microservice.yaml
index b83cc76..ffc5b92 100644
--- a/integration-tests/dynamic-config-tests/src/test/resources/microservice.yaml
+++ b/integration-tests/dynamic-config-tests/src/test/resources/microservice.yaml
@@ -30,7 +30,8 @@ apollo:
namespace: application
token: testtoken
refreshInterval: 2
-cse:
+
+servicecomb:
config:
client:
serverUri: http://apollo.servicecomb.apache.org:8070
\ No newline at end of file
diff --git a/integration-tests/jaxrs-tests/src/test/resources/microservice.yaml b/integration-tests/jaxrs-tests/src/test/resources/microservice.yaml
index 6f3e60e..4b5aa68 100644
--- a/integration-tests/jaxrs-tests/src/test/resources/microservice.yaml
+++ b/integration-tests/jaxrs-tests/src/test/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: jaxrstest-it
service_description:
name: jaxrs
version: 0.0.2
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/integration-tests/pojo-test/src/test/resources/microservice.yaml b/integration-tests/pojo-test/src/test/resources/microservice.yaml
index f278192..0cdcb31 100644
--- a/integration-tests/pojo-test/src/test/resources/microservice.yaml
+++ b/integration-tests/pojo-test/src/test/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: pojotest-it
service_description:
name: pojo
version: 0.0.4
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/integration-tests/spring-zuul-tracing-tests/src/test/resources/microservice.yaml b/integration-tests/spring-zuul-tracing-tests/src/test/resources/microservice.yaml
index 0859d00..761bc46 100644
--- a/integration-tests/spring-zuul-tracing-tests/src/test/resources/microservice.yaml
+++ b/integration-tests/spring-zuul-tracing-tests/src/test/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: tracing-app
service_description:
name: gateway-service
version: 0.0.2
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
@@ -31,8 +31,6 @@ cse:
default: tracing-provider,bizkeeper-provider
Consumer:
default: tracing-consumer,loadbalance,bizkeeper-consumer
-
-servicecomb:
tracing:
collector:
address: http://localhost:9411/
diff --git a/integration-tests/springmvc-tests/src/test/resources/microservice.yaml b/integration-tests/springmvc-tests/src/test/resources/microservice.yaml
index a6baf3e..a5d81f8 100644
--- a/integration-tests/springmvc-tests/src/test/resources/microservice.yaml
+++ b/integration-tests/springmvc-tests/src/test/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: springmvctest-it
service_description:
name: springmvc-tests
version: 0.0.2
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/integration-tests/tracing-tests/src/test/resources/microservice.yaml b/integration-tests/tracing-tests/src/test/resources/microservice.yaml
index ab8a353..b12e81a 100644
--- a/integration-tests/tracing-tests/src/test/resources/microservice.yaml
+++ b/integration-tests/tracing-tests/src/test/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: tracing-app
service_description:
name: tracing-service
version: 0.0.2
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
@@ -33,8 +33,6 @@ cse:
default: tracing-provider,bizkeeper-provider
Consumer:
default: tracing-consumer,loadbalance,bizkeeper-consumer
-
-servicecomb:
tracing:
collector:
address: http://localhost:9411
diff --git a/samples/auth-sample/auth-consumer/src/main/resources/microservice.yaml b/samples/auth-sample/auth-consumer/src/main/resources/microservice.yaml
index ee37f01..7b3542f 100644
--- a/samples/auth-sample/auth-consumer/src/main/resources/microservice.yaml
+++ b/samples/auth-sample/auth-consumer/src/main/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: auth-sample
service_description:
name: authConsumer
version: 0.0.1
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/samples/auth-sample/auth-provider/src/main/resources/microservice.yaml b/samples/auth-sample/auth-provider/src/main/resources/microservice.yaml
index 355d67d..550a798 100644
--- a/samples/auth-sample/auth-provider/src/main/resources/microservice.yaml
+++ b/samples/auth-sample/auth-provider/src/main/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: auth-sample
service_description:
name: auth-provider
version: 0.0.1
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/samples/bmi/calculator/src/main/resources/microservice.yaml b/samples/bmi/calculator/src/main/resources/microservice.yaml
index a7a7a6b..43da602 100644
--- a/samples/bmi/calculator/src/main/resources/microservice.yaml
+++ b/samples/bmi/calculator/src/main/resources/microservice.yaml
@@ -22,7 +22,7 @@ service_description:
# name of the declaring microservice
name: calculator
version: 0.0.1
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/samples/bmi/webapp/src/main/resources/microservice.yaml b/samples/bmi/webapp/src/main/resources/microservice.yaml
index 7f4c9a2..5f8d524 100644
--- a/samples/bmi/webapp/src/main/resources/microservice.yaml
+++ b/samples/bmi/webapp/src/main/resources/microservice.yaml
@@ -22,7 +22,7 @@ service_description:
# name of the declaring microservice
name: gateway
version: 0.0.1
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/samples/codefirst-sample/codefirst-consumer/src/main/resources/microservice.yaml b/samples/codefirst-sample/codefirst-consumer/src/main/resources/microservice.yaml
index e8d1629..ae72312 100644
--- a/samples/codefirst-sample/codefirst-consumer/src/main/resources/microservice.yaml
+++ b/samples/codefirst-sample/codefirst-consumer/src/main/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: codefirsttest
service_description:
name: codefirstClient
version: 0.0.1
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/samples/codefirst-sample/codefirst-provider/src/main/resources/microservice.yaml b/samples/codefirst-sample/codefirst-provider/src/main/resources/microservice.yaml
index 141958f..c775233 100644
--- a/samples/codefirst-sample/codefirst-provider/src/main/resources/microservice.yaml
+++ b/samples/codefirst-sample/codefirst-provider/src/main/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: codefirsttest
service_description:
name: codefirst
version: 0.0.1
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/samples/config-apollo-sample/src/main/resources/microservice.yaml b/samples/config-apollo-sample/src/main/resources/microservice.yaml
index 524b5a5..d94cae8 100644
--- a/samples/config-apollo-sample/src/main/resources/microservice.yaml
+++ b/samples/config-apollo-sample/src/main/resources/microservice.yaml
@@ -33,7 +33,7 @@ apollo:
#more detail can be found at https://github.com/ctripcorp/apollo/wiki/Apollo%E6%A0%B8%E5%BF%83%E6%A6%82%E5%BF%B5%E4%B9%8B%E2%80%9CNamespace%E2%80%9D
namespace: application
token: #get token from Apollo web pages
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/samples/custom-handler-sample/custom-handler-consumer/src/main/resources/microservice.yaml b/samples/custom-handler-sample/custom-handler-consumer/src/main/resources/microservice.yaml
index 05ea5fd..fd747ec 100644
--- a/samples/custom-handler-sample/custom-handler-consumer/src/main/resources/microservice.yaml
+++ b/samples/custom-handler-sample/custom-handler-consumer/src/main/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: chstest
service_description:
name: chsClient
version: 0.0.1
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/samples/custom-handler-sample/custom-handler-provider/src/main/resources/microservice.yaml b/samples/custom-handler-sample/custom-handler-provider/src/main/resources/microservice.yaml
index ed76260..4b473cd 100644
--- a/samples/custom-handler-sample/custom-handler-provider/src/main/resources/microservice.yaml
+++ b/samples/custom-handler-sample/custom-handler-provider/src/main/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: chstest
service_description:
name: customerhandler
version: 0.0.1
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/samples/jaxrs-sample/jaxrs-consumer/src/main/resources/microservice.yaml b/samples/jaxrs-sample/jaxrs-consumer/src/main/resources/microservice.yaml
index f258aad..0f0958d 100644
--- a/samples/jaxrs-sample/jaxrs-consumer/src/main/resources/microservice.yaml
+++ b/samples/jaxrs-sample/jaxrs-consumer/src/main/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: jaxrstest-sample
service_description:
name: helloClient
version: 0.0.1
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/samples/jaxrs-sample/jaxrs-provider/src/main/resources/microservice.yaml b/samples/jaxrs-sample/jaxrs-provider/src/main/resources/microservice.yaml
index b5b1675..1fe5acc 100644
--- a/samples/jaxrs-sample/jaxrs-provider/src/main/resources/microservice.yaml
+++ b/samples/jaxrs-sample/jaxrs-provider/src/main/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: jaxrstest-sample
service_description:
name: jaxrs
version: 0.0.1
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/samples/metrics-extend-healthcheck/src/main/resources/microservice.yaml b/samples/metrics-extend-healthcheck/src/main/resources/microservice.yaml
index 524e785..cb1bf60 100644
--- a/samples/metrics-extend-healthcheck/src/main/resources/microservice.yaml
+++ b/samples/metrics-extend-healthcheck/src/main/resources/microservice.yaml
@@ -22,7 +22,7 @@ service_description:
# name of the declaring microservice
name: metricsHealthCheckDemo
version: 0.0.1
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/samples/pojo-sample/pojo-consumer/src/main/resources/microservice.yaml b/samples/pojo-sample/pojo-consumer/src/main/resources/microservice.yaml
index ed6f78e..0709396 100644
--- a/samples/pojo-sample/pojo-consumer/src/main/resources/microservice.yaml
+++ b/samples/pojo-sample/pojo-consumer/src/main/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: pojo-sample
service_description:
name: helloClient
version: 0.0.1
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/samples/pojo-sample/pojo-provider/src/main/resources/microservice.yaml b/samples/pojo-sample/pojo-provider/src/main/resources/microservice.yaml
index 2f24d50..1eda650 100644
--- a/samples/pojo-sample/pojo-provider/src/main/resources/microservice.yaml
+++ b/samples/pojo-sample/pojo-provider/src/main/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: pojo-sample
service_description:
name: hello
version: 0.0.1
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/samples/springmvc-sample/springmvc-consumer/src/main/resources/microservice.yaml b/samples/springmvc-sample/springmvc-consumer/src/main/resources/microservice.yaml
index 8c25b99..af85274 100644
--- a/samples/springmvc-sample/springmvc-consumer/src/main/resources/microservice.yaml
+++ b/samples/springmvc-sample/springmvc-consumer/src/main/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: springmvc-sample
service_description:
name: springmvcConsumer
version: 0.0.2
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/samples/springmvc-sample/springmvc-provider/src/main/resources/microservice.yaml b/samples/springmvc-sample/springmvc-provider/src/main/resources/microservice.yaml
index fb9d26f..af57813 100644
--- a/samples/springmvc-sample/springmvc-provider/src/main/resources/microservice.yaml
+++ b/samples/springmvc-sample/springmvc-provider/src/main/resources/microservice.yaml
@@ -19,7 +19,7 @@ APPLICATION_ID: springmvc-sample
service_description:
name: springmvc
version: 0.0.2
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
diff --git a/service-registry/src/test/resources/microservice.yaml b/service-registry/src/test/resources/microservice.yaml
index 9c5c017..4788355 100644
--- a/service-registry/src/test/resources/microservice.yaml
+++ b/service-registry/src/test/resources/microservice.yaml
@@ -34,7 +34,7 @@ instance_description:
key0: value0
propertyExtentedClass: org.apache.servicecomb.serviceregistry.MicroServicePropertyExtendedStub
-cse:
+servicecomb:
service:
registry:
address: http://127.0.0.1:30100
--
To stop receiving notification emails like this one, please contact
wujimin@apache.org.