You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@servicecomb.apache.org by GitBox <gi...@apache.org> on 2018/04/27 06:49:48 UTC
[GitHub] wujimin closed pull request #669: [SCB-515] change all config of
'cse.xxx' to 'servicecomb.xxx'
wujimin closed pull request #669: [SCB-515] change all config of 'cse.xxx' to 'servicecomb.xxx'
URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/669
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/archetypes/business-service-jaxrs/src/main/resources/microservice.yaml b/archetypes/business-service-jaxrs/src/main/resources/microservice.yaml
index ddf5f398d..90de8072f 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 4de481325..b47bdef73 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 698b20f36..a49e8e399 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 9b6c0fe84..a82dcd3f0 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 764149d0c..4590f8f87 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 d1170ebae..f58cba5e0 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 8e98001b9..d532582be 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 109e27ac7..11206233c 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 2046f7489..296bf393a 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 b7e2e6354..18982e969 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 85071dd9c..6fdaaf9c9 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 cb1fdadff..f6161c34a 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 b1c74634f..3defb01db 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 6cfae5445..f32d547fd 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 ec2dc79f3..9a8ea2d7f 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 5a48c8ef4..b24d620d4 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 96ffb5759..ea9f8a887 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 48a55c568..814dbfae3 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 302c3d041..7be293d08 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 a5f28e554..9ca4af41b 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 e01a6b282..346bef083 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 1be593db4..c4297e4f3 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 9c7afa565..0901fe193 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 e68182aad..c6e5a22fe 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 33c260ade..76a37044b 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 b70e2da72..4069ea25e 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 fbf28fb6d..91fa6c7c2 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 72d65bf2b..541a8c714 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 fbe42c314..b9c96385e 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 7d9b5561f..e597667c1 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 6c8b496fa..3b19383a2 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 445cfa6ea..e0d5d7dab 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 b83cc7645..ffc5b92bb 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 6f3e60e2b..4b5aa684c 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 f27819222..0cdcb3167 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 ca417ce7b..cdeb3311e 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 a6baf3e13..a5d81f871 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 ab8a3535b..b12e81a1e 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 ee37f015a..7b3542fbe 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 355d67df7..550a798a9 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 a7a7a6b41..43da60267 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 7f4c9a275..5f8d524c3 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 e8d1629cc..ae7231290 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 141958fdd..c7752332b 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 524b5a576..d94cae8f7 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 05ea5fd30..fd747ecb8 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 ed7626057..4b473cd8f 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 f258aadf3..0f0958d00 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 b5b1675c2..1fe5accad 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 524e785d6..cb1bf609d 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 ed6f78eab..070939662 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 2f24d50ba..1eda6501c 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 8c25b99cb..af8527434 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 fb9d26feb..af5781398 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 9c5c0175d..47883555d 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
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services