This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-samples.git
The following commit(s) were added to refs/heads/master by this push:
new 24753db update versions to 2.1.2 (#58)
24753db is described below
commit 24753db2c50143805fc967326c59ae9e51c18c4b
Author: bao liu <[email protected]>
AuthorDate: Wed Oct 28 17:47:59 2020 +0800
update versions to 2.1.2 (#58)
---
java-chassis-samples/apm-agent/pom.xml | 4 ++--
java-chassis-samples/auth-sample/auth-consumer/pom.xml | 2 +-
.../auth-consumer/src/main/resources/microservice.yaml | 8 ++++----
java-chassis-samples/auth-sample/auth-provider/pom.xml | 2 +-
.../auth-provider/src/main/resources/microservice.yaml | 8 ++++----
java-chassis-samples/auth-sample/pom.xml | 10 +++++++++-
java-chassis-samples/bmi/calculator/pom.xml | 2 +-
.../servicecomb/samples/bmi/InstanceInfoServiceImpl.java | 6 +++---
.../bmi/calculator/src/main/resources/application.yml | 10 ++++------
java-chassis-samples/bmi/pom.xml | 9 ++++++++-
java-chassis-samples/bmi/webapp/pom.xml | 2 +-
.../servicecomb/samples/bmi/StaticWebpageDispatcher.java | 2 +-
.../bmi/webapp/src/main/resources/application.yml | 11 ++++-------
.../bmi/webapp/src/main/resources/static/index.html | 2 +-
.../bmi/webapp/src/main/resources/static/jquery-1.11.1.min.js | 4 ++++
.../codefirst-sample/codefirst-consumer/pom.xml | 2 +-
.../codefirst-consumer/src/main/resources/microservice.yaml | 8 ++++----
.../codefirst-sample/codefirst-provider/pom.xml | 2 +-
.../codefirst-provider/src/main/resources/microservice.yaml | 8 ++++----
java-chassis-samples/codefirst-sample/pom.xml | 10 +++++++++-
java-chassis-samples/common-schema/pom.xml | 2 +-
java-chassis-samples/config-apollo-sample/pom.xml | 2 +-
.../custom-handler-sample/custom-handler-consumer/pom.xml | 2 +-
.../src/main/resources/microservice.yaml | 8 ++++----
.../custom-handler-sample/custom-handler-provider/pom.xml | 2 +-
.../src/main/resources/microservice.yaml | 8 ++++----
java-chassis-samples/custom-handler-sample/pom.xml | 10 +++++++++-
java-chassis-samples/jaxrs-sample/jaxrs-consumer/pom.xml | 2 +-
.../jaxrs-consumer/src/main/resources/microservice.yaml | 8 ++++----
java-chassis-samples/jaxrs-sample/jaxrs-provider/pom.xml | 2 +-
.../jaxrs-provider/src/main/resources/microservice.yaml | 7 +++----
java-chassis-samples/jaxrs-sample/pom.xml | 10 +++++++++-
.../local-service-registry/local-registry-client/pom.xml | 2 +-
.../localregistryclient/LocalRegistryClient.java | 2 --
.../src/main/resources/microservice.yaml | 9 +++++----
.../local-service-registry/local-registry-server/pom.xml | 2 +-
.../localregistryserver/LocalRegistryServer.java | 1 -
.../src/main/resources/microservice.yaml | 9 +++++----
java-chassis-samples/local-service-registry/pom.xml | 8 +++++++-
java-chassis-samples/metrics-extend-healthcheck/pom.xml | 2 +-
.../metrics-write-file-sample/metrics-write-file/pom.xml | 2 +-
.../apache/servicecomb/samples/mwf/CloudEyeFilePublisher.java | 6 +++---
java-chassis-samples/metrics-write-file-sample/pom.xml | 2 +-
java-chassis-samples/pojo-sample/pojo-consumer/pom.xml | 2 +-
.../pojo-consumer/src/main/resources/microservice.yaml | 8 ++++----
java-chassis-samples/pojo-sample/pojo-provider/pom.xml | 2 +-
.../pojo-provider/src/main/resources/microservice.yaml | 8 ++++----
java-chassis-samples/pojo-sample/pom.xml | 10 +++++++++-
java-chassis-samples/pom.xml | 2 +-
java-chassis-samples/springmvc-sample/pom.xml | 10 +++++++++-
.../springmvc-sample/springmvc-consumer/pom.xml | 2 +-
.../samples/springmvc/consumer/SpringmvcHelloClient.java | 4 ++--
.../springmvc-consumer/src/main/resources/microservice.yaml | 8 ++++----
.../springmvc-sample/springmvc-provider/pom.xml | 2 +-
.../springmvc-provider/src/main/resources/microservice.yaml | 8 ++++----
java-chassis-samples/trust-sample/customer/pom.xml | 2 +-
.../customer/src/main/resources/microservice.yaml | 8 ++++----
java-chassis-samples/trust-sample/hacker/pom.xml | 2 +-
.../trust-sample/hacker/src/main/resources/microservice.yaml | 8 ++++----
java-chassis-samples/trust-sample/pom.xml | 10 +++++++++-
java-chassis-samples/trust-sample/store/pom.xml | 2 +-
.../trust-sample/store/src/main/resources/microservice.yaml | 8 ++++----
java-chassis-samples/use-log4j2-sample/pom.xml | 2 +-
63 files changed, 197 insertions(+), 131 deletions(-)
diff --git a/java-chassis-samples/apm-agent/pom.xml
b/java-chassis-samples/apm-agent/pom.xml
index 306deee..225a8c8 100644
--- a/java-chassis-samples/apm-agent/pom.xml
+++ b/java-chassis-samples/apm-agent/pom.xml
@@ -22,14 +22,14 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>samples</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>apm-agent</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
<name>Java Chassis::Samples::apm-agent</name>
<properties>
diff --git a/java-chassis-samples/auth-sample/auth-consumer/pom.xml
b/java-chassis-samples/auth-sample/auth-consumer/pom.xml
index 70ff8cc..b10cf4c 100644
--- a/java-chassis-samples/auth-sample/auth-consumer/pom.xml
+++ b/java-chassis-samples/auth-sample/auth-consumer/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>auth-sample</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>auth-consumer</artifactId>
<name>Java Chassis::Samples::Auth::Consumer</name>
diff --git
a/java-chassis-samples/auth-sample/auth-consumer/src/main/resources/microservice.yaml
b/java-chassis-samples/auth-sample/auth-consumer/src/main/resources/microservice.yaml
index 7b3542f..76e45f8 100644
---
a/java-chassis-samples/auth-sample/auth-consumer/src/main/resources/microservice.yaml
+++
b/java-chassis-samples/auth-sample/auth-consumer/src/main/resources/microservice.yaml
@@ -15,12 +15,12 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-APPLICATION_ID: auth-sample
-service_description:
- name: authConsumer
- version: 0.0.1
servicecomb:
service:
+ application: auth-sample
+ name: authConsumer
+ version: 0.0.1
+
registry:
address: http://127.0.0.1:30100
handler:
diff --git a/java-chassis-samples/auth-sample/auth-provider/pom.xml
b/java-chassis-samples/auth-sample/auth-provider/pom.xml
index 64de860..55187e1 100644
--- a/java-chassis-samples/auth-sample/auth-provider/pom.xml
+++ b/java-chassis-samples/auth-sample/auth-provider/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>auth-sample</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>auth-provider</artifactId>
<dependencies>
diff --git
a/java-chassis-samples/auth-sample/auth-provider/src/main/resources/microservice.yaml
b/java-chassis-samples/auth-sample/auth-provider/src/main/resources/microservice.yaml
index 635398d..83df4c0 100644
---
a/java-chassis-samples/auth-sample/auth-provider/src/main/resources/microservice.yaml
+++
b/java-chassis-samples/auth-sample/auth-provider/src/main/resources/microservice.yaml
@@ -15,12 +15,12 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-APPLICATION_ID: auth-sample
-service_description:
- name: auth-provider
- version: 0.0.1
servicecomb:
service:
+ application: auth-sample
+ name: auth-provider
+ version: 0.0.1
+
registry:
address: http://127.0.0.1:30100
handler:
diff --git a/java-chassis-samples/auth-sample/pom.xml
b/java-chassis-samples/auth-sample/pom.xml
index e695ef0..f42fda4 100644
--- a/java-chassis-samples/auth-sample/pom.xml
+++ b/java-chassis-samples/auth-sample/pom.xml
@@ -21,11 +21,19 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>samples</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>auth-sample</artifactId>
<name>Java Chassis::Samples::Auth</name>
<packaging>pom</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>registry-service-center</artifactId>
+ </dependency>
+ </dependencies>
+
<modules>
<module>auth-provider</module>
<module>auth-consumer</module>
diff --git a/java-chassis-samples/bmi/calculator/pom.xml
b/java-chassis-samples/bmi/calculator/pom.xml
index c7a3ed5..0bfbca4 100644
--- a/java-chassis-samples/bmi/calculator/pom.xml
+++ b/java-chassis-samples/bmi/calculator/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>bmi</artifactId>
<groupId>org.apache.servicecomb.samples</groupId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git
a/java-chassis-samples/bmi/calculator/src/main/java/org/apache/servicecomb/samples/bmi/InstanceInfoServiceImpl.java
b/java-chassis-samples/bmi/calculator/src/main/java/org/apache/servicecomb/samples/bmi/InstanceInfoServiceImpl.java
index f3ae184..8a960a2 100644
---
a/java-chassis-samples/bmi/calculator/src/main/java/org/apache/servicecomb/samples/bmi/InstanceInfoServiceImpl.java
+++
b/java-chassis-samples/bmi/calculator/src/main/java/org/apache/servicecomb/samples/bmi/InstanceInfoServiceImpl.java
@@ -17,8 +17,8 @@
package org.apache.servicecomb.samples.bmi;
-import org.apache.servicecomb.serviceregistry.RegistryUtils;
-import
org.apache.servicecomb.serviceregistry.api.registry.MicroserviceInstance;
+import org.apache.servicecomb.registry.RegistrationManager;
+import org.apache.servicecomb.registry.api.registry.MicroserviceInstance;
import org.springframework.stereotype.Service;
@Service
@@ -30,7 +30,7 @@ public class InstanceInfoServiceImpl implements
InstanceInfoService {
@Override
public String getInstanceId() {
- MicroserviceInstance instance = RegistryUtils.getMicroserviceInstance();
+ MicroserviceInstance instance =
RegistrationManager.INSTANCE.getMicroserviceInstance();
if (instance == null) {
throw new IllegalStateException(
"unable to find any service instances, maybe there is problem
registering in service center?");
diff --git
a/java-chassis-samples/bmi/calculator/src/main/resources/application.yml
b/java-chassis-samples/bmi/calculator/src/main/resources/application.yml
index ca1193b..5bd55ef 100644
--- a/java-chassis-samples/bmi/calculator/src/main/resources/application.yml
+++ b/java-chassis-samples/bmi/calculator/src/main/resources/application.yml
@@ -19,14 +19,12 @@
server:
port: 7777
-# all interconnected microservices must belong to an application wth the same
ID
-APPLICATION_ID: bmi
-service_description:
-# name of the declaring microservice
- name: calculator
- version: 0.0.1
servicecomb:
service:
+ application: bmi
+ name: calculator
+ version: 0.0.1
+
registry:
address: http://127.0.0.1:30100
rest:
diff --git a/java-chassis-samples/bmi/pom.xml b/java-chassis-samples/bmi/pom.xml
index 4a29954..ef56e8e 100644
--- a/java-chassis-samples/bmi/pom.xml
+++ b/java-chassis-samples/bmi/pom.xml
@@ -22,13 +22,20 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>samples</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>bmi</artifactId>
<name>Java Chassis::Samples::BMI</name>
<packaging>pom</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>registry-service-center</artifactId>
+ </dependency>
+ </dependencies>
+
<modules>
<module>calculator</module>
<module>webapp</module>
diff --git a/java-chassis-samples/bmi/webapp/pom.xml
b/java-chassis-samples/bmi/webapp/pom.xml
index bc75387..90305e0 100644
--- a/java-chassis-samples/bmi/webapp/pom.xml
+++ b/java-chassis-samples/bmi/webapp/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>bmi</artifactId>
<groupId>org.apache.servicecomb.samples</groupId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git
a/java-chassis-samples/bmi/webapp/src/main/java/org/apache/servicecomb/samples/bmi/StaticWebpageDispatcher.java
b/java-chassis-samples/bmi/webapp/src/main/java/org/apache/servicecomb/samples/bmi/StaticWebpageDispatcher.java
index ff92720..780c7fd 100644
---
a/java-chassis-samples/bmi/webapp/src/main/java/org/apache/servicecomb/samples/bmi/StaticWebpageDispatcher.java
+++
b/java-chassis-samples/bmi/webapp/src/main/java/org/apache/servicecomb/samples/bmi/StaticWebpageDispatcher.java
@@ -35,7 +35,7 @@ public class StaticWebpageDispatcher implements
VertxHttpDispatcher {
@Override
public int getOrder() {
- return Integer.MAX_VALUE;
+ return Integer.MAX_VALUE / 2;
}
@Override
diff --git a/java-chassis-samples/bmi/webapp/src/main/resources/application.yml
b/java-chassis-samples/bmi/webapp/src/main/resources/application.yml
index ca56d79..97aee70 100644
--- a/java-chassis-samples/bmi/webapp/src/main/resources/application.yml
+++ b/java-chassis-samples/bmi/webapp/src/main/resources/application.yml
@@ -15,15 +15,12 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-# all interconnected microservices must belong to an application wth the same
ID
-APPLICATION_ID: bmi
-
-service_description:
- # name of the declaring microservice
- name: gateway
- version: 0.0.1
servicecomb:
service:
+ application: bmi
+ name: gateway
+ version: 0.0.1
+
registry:
address: http://127.0.0.1:30100
rest:
diff --git
a/java-chassis-samples/bmi/webapp/src/main/resources/static/index.html
b/java-chassis-samples/bmi/webapp/src/main/resources/static/index.html
index faabdf7..8dcbd56 100644
--- a/java-chassis-samples/bmi/webapp/src/main/resources/static/index.html
+++ b/java-chassis-samples/bmi/webapp/src/main/resources/static/index.html
@@ -22,7 +22,7 @@
<link rel="stylesheet"
href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css";
integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M"
crossorigin="anonymous">
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
- <script src="https://code.jquery.com/jquery-3.2.1.min.js";
crossorigin="anonymous"></script>
+ <script src="jquery-1.11.1.min.js"></script>
<script
src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js";
integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4"
crossorigin="anonymous"></script>
<script
src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js";
integrity="sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1"
crossorigin="anonymous"></script>
</head>
diff --git
a/java-chassis-samples/bmi/webapp/src/main/resources/static/jquery-1.11.1.min.js
b/java-chassis-samples/bmi/webapp/src/main/resources/static/jquery-1.11.1.min.js
new file mode 100644
index 0000000..ab28a24
--- /dev/null
+++
b/java-chassis-samples/bmi/webapp/src/main/resources/static/jquery-1.11.1.min.js
@@ -0,0 +1,4 @@
+/*! jQuery v1.11.1 | (c) 2005, 2014 jQuery Foundation, Inc. |
jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof
module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw
new Error("jQuery requires a window with a document");return
b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var
c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.1",m=function(a,b){return
new
m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b
[...]
+if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return
k||(k=i?a[h]=c.pop()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof
b||"function"==typeof
b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void
0!==d&&(g[m.camelCase(b)]=d),"string"==typeof
b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}function
R(a,b,c){if(m.acceptData(a)){var
d,e,f=a.nodeType,g=f?m.cache:a,h=f?a[m.expando]:m.expando;if(g[h]){if(b&& [...]
+},cur:function(){var a=Zb.propHooks[this.prop];return
a&&a.get?a.get(this):Zb.propHooks._default.get(this)},run:function(a){var
b,c=Zb.propHooks[this.prop];return
this.pos=b=this.options.duration?m.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Zb.propHooks._default.set(this),this}},Zb.prototype.init.prototype=Zb.prototype,Zb.prop
[...]
diff --git a/java-chassis-samples/codefirst-sample/codefirst-consumer/pom.xml
b/java-chassis-samples/codefirst-sample/codefirst-consumer/pom.xml
index 2ffd569..69b2d00 100644
--- a/java-chassis-samples/codefirst-sample/codefirst-consumer/pom.xml
+++ b/java-chassis-samples/codefirst-sample/codefirst-consumer/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>codefirst-sample</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>codefirst-consumer</artifactId>
<name>Java Chassis::Samples::CodeFirst::Consumer</name>
diff --git
a/java-chassis-samples/codefirst-sample/codefirst-consumer/src/main/resources/microservice.yaml
b/java-chassis-samples/codefirst-sample/codefirst-consumer/src/main/resources/microservice.yaml
index ae72312..70fa2f9 100644
---
a/java-chassis-samples/codefirst-sample/codefirst-consumer/src/main/resources/microservice.yaml
+++
b/java-chassis-samples/codefirst-sample/codefirst-consumer/src/main/resources/microservice.yaml
@@ -15,12 +15,12 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-APPLICATION_ID: codefirsttest
-service_description:
- name: codefirstClient
- version: 0.0.1
servicecomb:
service:
+ application: codefirsttest
+ name: codefirstClient
+ version: 0.0.1
+
registry:
address: http://127.0.0.1:30100
isolation:
diff --git a/java-chassis-samples/codefirst-sample/codefirst-provider/pom.xml
b/java-chassis-samples/codefirst-sample/codefirst-provider/pom.xml
index d4bd0fb..c360524 100644
--- a/java-chassis-samples/codefirst-sample/codefirst-provider/pom.xml
+++ b/java-chassis-samples/codefirst-sample/codefirst-provider/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>codefirst-sample</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>codefirst-provider</artifactId>
<name>Java Chassis::Samples::CodeFirst::Provider</name>
diff --git
a/java-chassis-samples/codefirst-sample/codefirst-provider/src/main/resources/microservice.yaml
b/java-chassis-samples/codefirst-sample/codefirst-provider/src/main/resources/microservice.yaml
index 377c8d6..3c9e1e9 100644
---
a/java-chassis-samples/codefirst-sample/codefirst-provider/src/main/resources/microservice.yaml
+++
b/java-chassis-samples/codefirst-sample/codefirst-provider/src/main/resources/microservice.yaml
@@ -15,12 +15,12 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-APPLICATION_ID: codefirsttest
-service_description:
- name: codefirst
- version: 0.0.1
servicecomb:
service:
+ application: codefirsttest
+ name: codefirst
+ version: 0.0.1
+
registry:
address: http://127.0.0.1:30100
rest:
diff --git a/java-chassis-samples/codefirst-sample/pom.xml
b/java-chassis-samples/codefirst-sample/pom.xml
index f4773fe..8d78332 100644
--- a/java-chassis-samples/codefirst-sample/pom.xml
+++ b/java-chassis-samples/codefirst-sample/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>samples</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>codefirst-sample</artifactId>
<name>Java Chassis::Samples::CodeFirst</name>
@@ -31,6 +31,14 @@
UTF-8
</project.build.sourceEncoding>
</properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>registry-service-center</artifactId>
+ </dependency>
+ </dependencies>
+
<modules>
<module>codefirst-provider</module>
<module>codefirst-consumer</module>
diff --git a/java-chassis-samples/common-schema/pom.xml
b/java-chassis-samples/common-schema/pom.xml
index 73e341e..10a2a01 100644
--- a/java-chassis-samples/common-schema/pom.xml
+++ b/java-chassis-samples/common-schema/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>samples</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>common-schema</artifactId>
<name>Java Chassis::Samples::Common Schema</name>
diff --git a/java-chassis-samples/config-apollo-sample/pom.xml
b/java-chassis-samples/config-apollo-sample/pom.xml
index c504f63..b83e9de 100644
--- a/java-chassis-samples/config-apollo-sample/pom.xml
+++ b/java-chassis-samples/config-apollo-sample/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.apache.servicecomb.samples</groupId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git
a/java-chassis-samples/custom-handler-sample/custom-handler-consumer/pom.xml
b/java-chassis-samples/custom-handler-sample/custom-handler-consumer/pom.xml
index 74ebc53..99b6c6a 100644
--- a/java-chassis-samples/custom-handler-sample/custom-handler-consumer/pom.xml
+++ b/java-chassis-samples/custom-handler-sample/custom-handler-consumer/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>custom-handler-sample</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>custom-handler-consumer</artifactId>
<name>Java Chassis::Samples::Custom Handler::Consumer</name>
diff --git
a/java-chassis-samples/custom-handler-sample/custom-handler-consumer/src/main/resources/microservice.yaml
b/java-chassis-samples/custom-handler-sample/custom-handler-consumer/src/main/resources/microservice.yaml
index fd747ec..346a23a 100644
---
a/java-chassis-samples/custom-handler-sample/custom-handler-consumer/src/main/resources/microservice.yaml
+++
b/java-chassis-samples/custom-handler-sample/custom-handler-consumer/src/main/resources/microservice.yaml
@@ -15,12 +15,12 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-APPLICATION_ID: chstest
-service_description:
- name: chsClient
- version: 0.0.1
servicecomb:
service:
+ application: chstest
+ name: chsClient
+ version: 0.0.1
+
registry:
address: http://127.0.0.1:30100
handler:
diff --git
a/java-chassis-samples/custom-handler-sample/custom-handler-provider/pom.xml
b/java-chassis-samples/custom-handler-sample/custom-handler-provider/pom.xml
index 83becd5..207c9ad 100644
--- a/java-chassis-samples/custom-handler-sample/custom-handler-provider/pom.xml
+++ b/java-chassis-samples/custom-handler-sample/custom-handler-provider/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>custom-handler-sample</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>custom-handler-provider</artifactId>
<name>Java Chassis::Samples::Custom Handler::Provider</name>
diff --git
a/java-chassis-samples/custom-handler-sample/custom-handler-provider/src/main/resources/microservice.yaml
b/java-chassis-samples/custom-handler-sample/custom-handler-provider/src/main/resources/microservice.yaml
index cb2c37b..02a2d88 100644
---
a/java-chassis-samples/custom-handler-sample/custom-handler-provider/src/main/resources/microservice.yaml
+++
b/java-chassis-samples/custom-handler-sample/custom-handler-provider/src/main/resources/microservice.yaml
@@ -15,12 +15,12 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-APPLICATION_ID: chstest
-service_description:
- name: customerhandler
- version: 0.0.1
servicecomb:
service:
+ application: chstest
+ name: customerhandler
+ version: 0.0.1
+
registry:
address: http://127.0.0.1:30100
rest:
diff --git a/java-chassis-samples/custom-handler-sample/pom.xml
b/java-chassis-samples/custom-handler-sample/pom.xml
index 75a9f71..e789e62 100644
--- a/java-chassis-samples/custom-handler-sample/pom.xml
+++ b/java-chassis-samples/custom-handler-sample/pom.xml
@@ -21,11 +21,19 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>samples</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>custom-handler-sample</artifactId>
<name>Java Chassis::Samples::Custom Handler</name>
<packaging>pom</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>registry-service-center</artifactId>
+ </dependency>
+ </dependencies>
+
<modules>
<module>custom-handler-consumer</module>
<module>custom-handler-provider</module>
diff --git a/java-chassis-samples/jaxrs-sample/jaxrs-consumer/pom.xml
b/java-chassis-samples/jaxrs-sample/jaxrs-consumer/pom.xml
index dcdfec8..0374087 100644
--- a/java-chassis-samples/jaxrs-sample/jaxrs-consumer/pom.xml
+++ b/java-chassis-samples/jaxrs-sample/jaxrs-consumer/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>jaxrs-sample</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>jaxrs-consumer</artifactId>
<name>Java Chassis::Samples::JAXRS::Consumer</name>
diff --git
a/java-chassis-samples/jaxrs-sample/jaxrs-consumer/src/main/resources/microservice.yaml
b/java-chassis-samples/jaxrs-sample/jaxrs-consumer/src/main/resources/microservice.yaml
index 0f0958d..b978f05 100644
---
a/java-chassis-samples/jaxrs-sample/jaxrs-consumer/src/main/resources/microservice.yaml
+++
b/java-chassis-samples/jaxrs-sample/jaxrs-consumer/src/main/resources/microservice.yaml
@@ -15,12 +15,12 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-APPLICATION_ID: jaxrstest-sample
-service_description:
- name: helloClient
- version: 0.0.1
servicecomb:
service:
+ application: jaxrstest-sample
+ name: helloClient
+ version: 0.0.1
+
registry:
address: http://127.0.0.1:30100
handler:
diff --git a/java-chassis-samples/jaxrs-sample/jaxrs-provider/pom.xml
b/java-chassis-samples/jaxrs-sample/jaxrs-provider/pom.xml
index 5b6e4f2..f640ab8 100644
--- a/java-chassis-samples/jaxrs-sample/jaxrs-provider/pom.xml
+++ b/java-chassis-samples/jaxrs-sample/jaxrs-provider/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>jaxrs-sample</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>jaxrs-provider</artifactId>
<name>Java Chassis::Samples::JAXRS::Provider</name>
diff --git
a/java-chassis-samples/jaxrs-sample/jaxrs-provider/src/main/resources/microservice.yaml
b/java-chassis-samples/jaxrs-sample/jaxrs-provider/src/main/resources/microservice.yaml
index cf0178e..d44325c 100644
---
a/java-chassis-samples/jaxrs-sample/jaxrs-provider/src/main/resources/microservice.yaml
+++
b/java-chassis-samples/jaxrs-sample/jaxrs-provider/src/main/resources/microservice.yaml
@@ -15,12 +15,11 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-APPLICATION_ID: jaxrstest-sample
-service_description:
- name: jaxrs
- version: 0.0.1
servicecomb:
service:
+ application: jaxrstest-sample
+ name: jaxrs
+ version: 0.0.1
registry:
address: http://127.0.0.1:30100
rest:
diff --git a/java-chassis-samples/jaxrs-sample/pom.xml
b/java-chassis-samples/jaxrs-sample/pom.xml
index 76676ea..c4e8be5 100644
--- a/java-chassis-samples/jaxrs-sample/pom.xml
+++ b/java-chassis-samples/jaxrs-sample/pom.xml
@@ -21,11 +21,19 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>samples</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>jaxrs-sample</artifactId>
<name>Java Chassis::Samples::JAXRS</name>
<packaging>pom</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>registry-service-center</artifactId>
+ </dependency>
+ </dependencies>
+
<modules>
<module>jaxrs-provider</module>
<module>jaxrs-consumer</module>
diff --git
a/java-chassis-samples/local-service-registry/local-registry-client/pom.xml
b/java-chassis-samples/local-service-registry/local-registry-client/pom.xml
index 00154da..9e100fd 100644
--- a/java-chassis-samples/local-service-registry/local-registry-client/pom.xml
+++ b/java-chassis-samples/local-service-registry/local-registry-client/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>local-service-registry</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>local-registry-client</artifactId>
<name>Java Chassis::Demo::LocalServiceRegistry::Client</name>
diff --git
a/java-chassis-samples/local-service-registry/local-registry-client/src/main/java/org/apache/servicecomb/samples/localregistry/localregistryclient/LocalRegistryClient.java
b/java-chassis-samples/local-service-registry/local-registry-client/src/main/java/org/apache/servicecomb/samples/localregistry/localregistryclient/LocalRegistryClient.java
index a6fdabb..3d9346f 100644
---
a/java-chassis-samples/local-service-registry/local-registry-client/src/main/java/org/apache/servicecomb/samples/localregistry/localregistryclient/LocalRegistryClient.java
+++
b/java-chassis-samples/local-service-registry/local-registry-client/src/main/java/org/apache/servicecomb/samples/localregistry/localregistryclient/LocalRegistryClient.java
@@ -29,8 +29,6 @@ public class LocalRegistryClient {
private static RestTemplate templateNew = RestTemplateBuilder.create();
public static void main(String[] args) {
- System.setProperty("local.registry.file", "registry.yaml");
-
BeanUtils.init();
run();
diff --git
a/java-chassis-samples/local-service-registry/local-registry-client/src/main/resources/microservice.yaml
b/java-chassis-samples/local-service-registry/local-registry-client/src/main/resources/microservice.yaml
index 4a4da5a..071b4f4 100644
---
a/java-chassis-samples/local-service-registry/local-registry-client/src/main/resources/microservice.yaml
+++
b/java-chassis-samples/local-service-registry/local-registry-client/src/main/resources/microservice.yaml
@@ -15,11 +15,12 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-APPLICATION_ID: localservreg
-service_description:
- name: localclient
- version: 0.0.1
servicecomb:
+ service:
+ application: localservreg
+ name: localclient
+ version: 0.0.1
+
handler:
chain:
Consumer:
diff --git
a/java-chassis-samples/local-service-registry/local-registry-server/pom.xml
b/java-chassis-samples/local-service-registry/local-registry-server/pom.xml
index bc7d6ce..6163b50 100644
--- a/java-chassis-samples/local-service-registry/local-registry-server/pom.xml
+++ b/java-chassis-samples/local-service-registry/local-registry-server/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>local-service-registry</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>local-registry-server</artifactId>
<name>Java Chassis::Demo::LocalRegistry::Server</name>
diff --git
a/java-chassis-samples/local-service-registry/local-registry-server/src/main/java/org/apache/servicecomb/samples/localregistry/localregistryserver/LocalRegistryServer.java
b/java-chassis-samples/local-service-registry/local-registry-server/src/main/java/org/apache/servicecomb/samples/localregistry/localregistryserver/LocalRegistryServer.java
index 55f7e5d..e6f06e7 100644
---
a/java-chassis-samples/local-service-registry/local-registry-server/src/main/java/org/apache/servicecomb/samples/localregistry/localregistryserver/LocalRegistryServer.java
+++
b/java-chassis-samples/local-service-registry/local-registry-server/src/main/java/org/apache/servicecomb/samples/localregistry/localregistryserver/LocalRegistryServer.java
@@ -21,7 +21,6 @@ import
org.apache.servicecomb.foundation.common.utils.BeanUtils;
public class LocalRegistryServer {
public static void main(String[] args) {
- System.setProperty("local.registry.file", "notExistJustForceLocal");
BeanUtils.init();
}
}
diff --git
a/java-chassis-samples/local-service-registry/local-registry-server/src/main/resources/microservice.yaml
b/java-chassis-samples/local-service-registry/local-registry-server/src/main/resources/microservice.yaml
index 72fd803..4d60b18 100644
---
a/java-chassis-samples/local-service-registry/local-registry-server/src/main/resources/microservice.yaml
+++
b/java-chassis-samples/local-service-registry/local-registry-server/src/main/resources/microservice.yaml
@@ -15,11 +15,12 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-APPLICATION_ID: localservreg
-service_description:
- name: localserv
- version: 0.0.1
servicecomb:
+ service:
+ application: localservreg
+ name: localserv
+ version: 0.0.1
+
rest:
address: 0.0.0.0:8080
handler:
diff --git a/java-chassis-samples/local-service-registry/pom.xml
b/java-chassis-samples/local-service-registry/pom.xml
index d58f89c..ba18fea 100644
--- a/java-chassis-samples/local-service-registry/pom.xml
+++ b/java-chassis-samples/local-service-registry/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>samples</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>local-service-registry</artifactId>
<name>Java Chassis::Demo::Local service registry</name>
@@ -32,4 +32,10 @@
<module>local-registry-client</module>
</modules>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>registry-local</artifactId>
+ </dependency>
+ </dependencies>
</project>
diff --git a/java-chassis-samples/metrics-extend-healthcheck/pom.xml
b/java-chassis-samples/metrics-extend-healthcheck/pom.xml
index 9e78471..7148b1e 100644
--- a/java-chassis-samples/metrics-extend-healthcheck/pom.xml
+++ b/java-chassis-samples/metrics-extend-healthcheck/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.apache.servicecomb.samples</groupId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git
a/java-chassis-samples/metrics-write-file-sample/metrics-write-file/pom.xml
b/java-chassis-samples/metrics-write-file-sample/metrics-write-file/pom.xml
index a00453c..d4c9e0f 100644
--- a/java-chassis-samples/metrics-write-file-sample/metrics-write-file/pom.xml
+++ b/java-chassis-samples/metrics-write-file-sample/metrics-write-file/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>metrics-write-file-sample</artifactId>
<groupId>org.apache.servicecomb.samples</groupId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git
a/java-chassis-samples/metrics-write-file-sample/metrics-write-file/src/main/java/org/apache/servicecomb/samples/mwf/CloudEyeFilePublisher.java
b/java-chassis-samples/metrics-write-file-sample/metrics-write-file/src/main/java/org/apache/servicecomb/samples/mwf/CloudEyeFilePublisher.java
index 0e85fcf..d6e6f31 100644
---
a/java-chassis-samples/metrics-write-file-sample/metrics-write-file/src/main/java/org/apache/servicecomb/samples/mwf/CloudEyeFilePublisher.java
+++
b/java-chassis-samples/metrics-write-file-sample/metrics-write-file/src/main/java/org/apache/servicecomb/samples/mwf/CloudEyeFilePublisher.java
@@ -24,8 +24,8 @@ import
org.apache.servicecomb.foundation.metrics.MetricsBootstrapConfig;
import org.apache.servicecomb.foundation.metrics.MetricsInitializer;
import org.apache.servicecomb.foundation.metrics.PolledEvent;
import org.apache.servicecomb.foundation.metrics.registry.GlobalRegistry;
-import org.apache.servicecomb.serviceregistry.RegistryUtils;
-import org.apache.servicecomb.serviceregistry.api.registry.Microservice;
+import org.apache.servicecomb.registry.RegistrationManager;
+import org.apache.servicecomb.registry.api.registry.Microservice;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
@@ -59,7 +59,7 @@ public class CloudEyeFilePublisher implements
MetricsInitializer {
public void init(GlobalRegistry globalRegistry, EventBus eventBus,
MetricsBootstrapConfig config) {
eventBus.register(this);
- Microservice microservice = RegistryUtils.getMicroservice();
+ Microservice microservice = RegistrationManager.INSTANCE.getMicroservice();
filePrefix = microservice.getAppId() + "." + microservice.getServiceName();
hostName = NetUtils.getHostName();
diff --git a/java-chassis-samples/metrics-write-file-sample/pom.xml
b/java-chassis-samples/metrics-write-file-sample/pom.xml
index 0a88bc9..cc98acf 100644
--- a/java-chassis-samples/metrics-write-file-sample/pom.xml
+++ b/java-chassis-samples/metrics-write-file-sample/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.apache.servicecomb.samples</groupId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/java-chassis-samples/pojo-sample/pojo-consumer/pom.xml
b/java-chassis-samples/pojo-sample/pojo-consumer/pom.xml
index 89268b0..ff77ebb 100644
--- a/java-chassis-samples/pojo-sample/pojo-consumer/pom.xml
+++ b/java-chassis-samples/pojo-sample/pojo-consumer/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>pojo-sample</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>pojo-consumer</artifactId>
<dependencies>
diff --git
a/java-chassis-samples/pojo-sample/pojo-consumer/src/main/resources/microservice.yaml
b/java-chassis-samples/pojo-sample/pojo-consumer/src/main/resources/microservice.yaml
index 0709396..7978f20 100644
---
a/java-chassis-samples/pojo-sample/pojo-consumer/src/main/resources/microservice.yaml
+++
b/java-chassis-samples/pojo-sample/pojo-consumer/src/main/resources/microservice.yaml
@@ -15,12 +15,12 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-APPLICATION_ID: pojo-sample
-service_description:
- name: helloClient
- version: 0.0.1
servicecomb:
service:
+ application: pojo-sample
+ name: helloClient
+ version: 0.0.1
+
registry:
address: http://127.0.0.1:30100
handler:
diff --git a/java-chassis-samples/pojo-sample/pojo-provider/pom.xml
b/java-chassis-samples/pojo-sample/pojo-provider/pom.xml
index 908fefc..2b18bdc 100644
--- a/java-chassis-samples/pojo-sample/pojo-provider/pom.xml
+++ b/java-chassis-samples/pojo-sample/pojo-provider/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>pojo-sample</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>pojo-provider</artifactId>
<dependencies>
diff --git
a/java-chassis-samples/pojo-sample/pojo-provider/src/main/resources/microservice.yaml
b/java-chassis-samples/pojo-sample/pojo-provider/src/main/resources/microservice.yaml
index 3af69d8..df4ad23 100644
---
a/java-chassis-samples/pojo-sample/pojo-provider/src/main/resources/microservice.yaml
+++
b/java-chassis-samples/pojo-sample/pojo-provider/src/main/resources/microservice.yaml
@@ -15,12 +15,12 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-APPLICATION_ID: pojo-sample
-service_description:
- name: hello
- version: 0.0.1
servicecomb:
service:
+ application: pojo-sample
+ name: hello
+ version: 0.0.1
+
registry:
address: http://127.0.0.1:30100
rest:
diff --git a/java-chassis-samples/pojo-sample/pom.xml
b/java-chassis-samples/pojo-sample/pom.xml
index 955b844..afae2a1 100644
--- a/java-chassis-samples/pojo-sample/pom.xml
+++ b/java-chassis-samples/pojo-sample/pom.xml
@@ -21,10 +21,18 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>samples</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>pojo-sample</artifactId>
<packaging>pom</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>registry-service-center</artifactId>
+ </dependency>
+ </dependencies>
+
<modules>
<module>pojo-provider</module>
<module>pojo-consumer</module>
diff --git a/java-chassis-samples/pom.xml b/java-chassis-samples/pom.xml
index aaae7ed..bc7f92e 100644
--- a/java-chassis-samples/pom.xml
+++ b/java-chassis-samples/pom.xml
@@ -24,7 +24,7 @@
<artifactId>samples</artifactId>
<name>Java Chassis::Samples</name>
<packaging>pom</packaging>
- <version>2.0.0</version>
+ <version>2.1.2</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/java-chassis-samples/springmvc-sample/pom.xml
b/java-chassis-samples/springmvc-sample/pom.xml
index d0dfbf5..2e852cb 100644
--- a/java-chassis-samples/springmvc-sample/pom.xml
+++ b/java-chassis-samples/springmvc-sample/pom.xml
@@ -21,10 +21,18 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>samples</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>springmvc-sample</artifactId>
<packaging>pom</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>registry-service-center</artifactId>
+ </dependency>
+ </dependencies>
+
<modules>
<module>springmvc-provider</module>
<module>springmvc-consumer</module>
diff --git a/java-chassis-samples/springmvc-sample/springmvc-consumer/pom.xml
b/java-chassis-samples/springmvc-sample/springmvc-consumer/pom.xml
index 21840ed..d14863f 100644
--- a/java-chassis-samples/springmvc-sample/springmvc-consumer/pom.xml
+++ b/java-chassis-samples/springmvc-sample/springmvc-consumer/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>springmvc-sample</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>springmvc-consumer</artifactId>
<dependencies>
diff --git
a/java-chassis-samples/springmvc-sample/springmvc-consumer/src/main/java/org/apache/servicecomb/samples/springmvc/consumer/SpringmvcHelloClient.java
b/java-chassis-samples/springmvc-sample/springmvc-consumer/src/main/java/org/apache/servicecomb/samples/springmvc/consumer/SpringmvcHelloClient.java
index 6dd1558..838c74f 100644
---
a/java-chassis-samples/springmvc-sample/springmvc-consumer/src/main/java/org/apache/servicecomb/samples/springmvc/consumer/SpringmvcHelloClient.java
+++
b/java-chassis-samples/springmvc-sample/springmvc-consumer/src/main/java/org/apache/servicecomb/samples/springmvc/consumer/SpringmvcHelloClient.java
@@ -49,7 +49,7 @@ public class SpringmvcHelloClient {
// RestTemplate Consumer or POJO Consumer. You can choose whatever you like
// RestTemplate Consumer
String sayHiResult =
-
restTemplate.postForObject("cse://springmvc/springmvchello/sayhi?name=Java
Chassis", null, String.class);
+
restTemplate.postForObject("cse://springmvc/springmvchello/sayhi?name={name}",
null, String.class, "Java Chassis");
Assertion.assertEquals("Hello Java Chassis", sayHiResult);
String sayHiDefaultResult =
@@ -77,7 +77,7 @@ public class SpringmvcHelloClient {
// NOTICE: since 2.0.0, spring deprecated AsyncRestTemplate, user's can
use CompletableFuture of RPC instead
CseAsyncRestTemplate cseAsyncRestTemplate = new CseAsyncRestTemplate();
ListenableFuture<ResponseEntity<String>> responseEntityListenableFuture =
cseAsyncRestTemplate
- .postForEntity("cse://springmvc/springmvchello/sayhi?name=Java
Chassis", null, String.class);
+ .postForEntity("cse://springmvc/springmvchello/sayhi?name={name}",
null, String.class, "Java Chassis");
ResponseEntity<String> responseEntity =
responseEntityListenableFuture.get();
Assertion.assertEquals("Hello Java Chassis", responseEntity.getBody());
System.out.println("AsyncRestTemplate Consumer sayHi services: " +
responseEntity.getBody());
diff --git
a/java-chassis-samples/springmvc-sample/springmvc-consumer/src/main/resources/microservice.yaml
b/java-chassis-samples/springmvc-sample/springmvc-consumer/src/main/resources/microservice.yaml
index af85274..d1d24c5 100644
---
a/java-chassis-samples/springmvc-sample/springmvc-consumer/src/main/resources/microservice.yaml
+++
b/java-chassis-samples/springmvc-sample/springmvc-consumer/src/main/resources/microservice.yaml
@@ -15,12 +15,12 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-APPLICATION_ID: springmvc-sample
-service_description:
- name: springmvcConsumer
- version: 0.0.2
servicecomb:
service:
+ application: springmvc-sample
+ name: springmvcConsumer
+ version: 0.0.1
+
registry:
address: http://127.0.0.1:30100
handler:
diff --git a/java-chassis-samples/springmvc-sample/springmvc-provider/pom.xml
b/java-chassis-samples/springmvc-sample/springmvc-provider/pom.xml
index e1a7953..3b31a13 100644
--- a/java-chassis-samples/springmvc-sample/springmvc-provider/pom.xml
+++ b/java-chassis-samples/springmvc-sample/springmvc-provider/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>springmvc-sample</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>springmvc-provider</artifactId>
<dependencies>
diff --git
a/java-chassis-samples/springmvc-sample/springmvc-provider/src/main/resources/microservice.yaml
b/java-chassis-samples/springmvc-sample/springmvc-provider/src/main/resources/microservice.yaml
index 6b566a5..e618b9b 100644
---
a/java-chassis-samples/springmvc-sample/springmvc-provider/src/main/resources/microservice.yaml
+++
b/java-chassis-samples/springmvc-sample/springmvc-provider/src/main/resources/microservice.yaml
@@ -15,12 +15,12 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-APPLICATION_ID: springmvc-sample
-service_description:
- name: springmvc
- version: 0.0.2
servicecomb:
service:
+ application: springmvc-sample
+ name: springmvc
+ version: 0.0.1
+
registry:
address: http://127.0.0.1:30100
rest:
diff --git a/java-chassis-samples/trust-sample/customer/pom.xml
b/java-chassis-samples/trust-sample/customer/pom.xml
index 0624598..5d9a638 100644
--- a/java-chassis-samples/trust-sample/customer/pom.xml
+++ b/java-chassis-samples/trust-sample/customer/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>trust-sample</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>customer</artifactId>
<dependencies>
diff --git
a/java-chassis-samples/trust-sample/customer/src/main/resources/microservice.yaml
b/java-chassis-samples/trust-sample/customer/src/main/resources/microservice.yaml
index c96ce38..eec4835 100644
---
a/java-chassis-samples/trust-sample/customer/src/main/resources/microservice.yaml
+++
b/java-chassis-samples/trust-sample/customer/src/main/resources/microservice.yaml
@@ -15,12 +15,12 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-APPLICATION_ID: trust-sample
-service_description:
- name: customer
- version: 0.0.1
servicecomb:
service:
+ application: trust-sample
+ name: customer
+ version: 0.0.1
+
registry:
address: http://127.0.0.1:30100
isolation:
diff --git a/java-chassis-samples/trust-sample/hacker/pom.xml
b/java-chassis-samples/trust-sample/hacker/pom.xml
index 0e57591..788d91e 100644
--- a/java-chassis-samples/trust-sample/hacker/pom.xml
+++ b/java-chassis-samples/trust-sample/hacker/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>trust-sample</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>hacker</artifactId>
<dependencies>
diff --git
a/java-chassis-samples/trust-sample/hacker/src/main/resources/microservice.yaml
b/java-chassis-samples/trust-sample/hacker/src/main/resources/microservice.yaml
index ec33b21..ad719bf 100644
---
a/java-chassis-samples/trust-sample/hacker/src/main/resources/microservice.yaml
+++
b/java-chassis-samples/trust-sample/hacker/src/main/resources/microservice.yaml
@@ -15,12 +15,12 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-APPLICATION_ID: trust-sample
-service_description:
- name: hacker
- version: 0.0.1
servicecomb:
service:
+ application: trust-sample
+ name: hacker
+ version: 0.0.1
+
registry:
address: http://127.0.0.1:30100
isolation:
diff --git a/java-chassis-samples/trust-sample/pom.xml
b/java-chassis-samples/trust-sample/pom.xml
index 6d498c5..2c88ac8 100644
--- a/java-chassis-samples/trust-sample/pom.xml
+++ b/java-chassis-samples/trust-sample/pom.xml
@@ -21,10 +21,18 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>samples</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>trust-sample</artifactId>
<packaging>pom</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>registry-service-center</artifactId>
+ </dependency>
+ </dependencies>
+
<modules>
<module>store</module>
<module>customer</module>
diff --git a/java-chassis-samples/trust-sample/store/pom.xml
b/java-chassis-samples/trust-sample/store/pom.xml
index ba59ae6..c6fe384 100644
--- a/java-chassis-samples/trust-sample/store/pom.xml
+++ b/java-chassis-samples/trust-sample/store/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>trust-sample</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>store</artifactId>
<dependencies>
diff --git
a/java-chassis-samples/trust-sample/store/src/main/resources/microservice.yaml
b/java-chassis-samples/trust-sample/store/src/main/resources/microservice.yaml
index 1587317..721093f 100644
---
a/java-chassis-samples/trust-sample/store/src/main/resources/microservice.yaml
+++
b/java-chassis-samples/trust-sample/store/src/main/resources/microservice.yaml
@@ -15,12 +15,12 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-APPLICATION_ID: trust-sample
-service_description:
- name: store
- version: 0.0.1
servicecomb:
service:
+ application: trust-sample
+ name: store
+ version: 0.0.1
+
registry:
address: http://127.0.0.1:30100
rest:
diff --git a/java-chassis-samples/use-log4j2-sample/pom.xml
b/java-chassis-samples/use-log4j2-sample/pom.xml
index f7f1b4c..313179f 100644
--- a/java-chassis-samples/use-log4j2-sample/pom.xml
+++ b/java-chassis-samples/use-log4j2-sample/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.apache.servicecomb.samples</groupId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
