This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 18847ab0ff01634f3c81be4331efb3caedef124b
Author: wujimin <wuji...@huawei.com>
AuthorDate: Sat Jan 13 11:52:48 2018 +0800
remove "hiboard" keyword in edge demo
---
.../authentication/src/main/resources/microservice.yaml | 2 +-
.../{hiboard-business-1-1-0 => business-1-1-0}/pom.xml | 6 +++---
.../servicecomb/demo/edge/business/BusinessMain_V1_1_0.java | 0
.../java/org/apache/servicecomb/demo/edge/business/Impl.java | 2 +-
.../src/main/resources/microservice.yaml | 2 +-
.../{hiboard-business-1.0.0 => business-1.0.0}/pom.xml | 6 +++---
.../servicecomb/demo/edge/business/BusinessMain_V1_0_0.java | 0
.../java/org/apache/servicecomb/demo/edge/business/Impl.java | 2 +-
.../src/main/resources/microservice.yaml | 2 +-
.../{hiboard-business-2.0.0 => business-2.0.0}/pom.xml | 6 +++---
.../servicecomb/demo/edge/business/BusinessMain_V2_0_0.java | 0
.../java/org/apache/servicecomb/demo/edge/business/Impl.java | 2 +-
.../src/main/resources/microservice.yaml | 2 +-
demo/demo-edge/{hiboard-consumer => consumer}/pom.xml | 6 +++---
.../org/apache/servicecomb/demo/edge/consumer/Consumer.java | 0
.../apache/servicecomb/demo/edge/consumer/ConsumerMain.java | 0
.../src/main/resources/microservice.yaml | 2 +-
.../edge-service/src/main/resources/microservice.yaml | 2 +-
demo/demo-edge/{hiboard-model => model}/pom.xml | 4 ++--
.../apache/servicecomb/demo/edge/model/AppClientDataRsp.java | 0
.../apache/servicecomb/demo/edge/model/ChannelRequestBase.java | 0
.../apache/servicecomb/demo/edge/model/ResultWithInstance.java | 0
demo/demo-edge/pom.xml | 10 +++++-----
23 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/demo/demo-edge/authentication/src/main/resources/microservice.yaml
b/demo/demo-edge/authentication/src/main/resources/microservice.yaml
index 98712e4..8e98001 100644
--- a/demo/demo-edge/authentication/src/main/resources/microservice.yaml
+++ b/demo/demo-edge/authentication/src/main/resources/microservice.yaml
@@ -15,7 +15,7 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-APPLICATION_ID: hiboard
+APPLICATION_ID: edge
service_description:
name: auth
version: 0.0.1
diff --git a/demo/demo-edge/hiboard-business-1-1-0/pom.xml
b/demo/demo-edge/business-1-1-0/pom.xml
similarity index 92%
rename from demo/demo-edge/hiboard-business-1-1-0/pom.xml
rename to demo/demo-edge/business-1-1-0/pom.xml
index 22e2d7b..f04a50b 100644
--- a/demo/demo-edge/hiboard-business-1-1-0/pom.xml
+++ b/demo/demo-edge/business-1-1-0/pom.xml
@@ -22,8 +22,8 @@
<artifactId>demo-edge</artifactId>
<version>0.6.0-SNAPSHOT</version>
</parent>
- <artifactId>hiboard-business-1-1-0</artifactId>
- <name>Java Chassis::Demo::Edge::HiBoard Business 1.1.0</name>
+ <artifactId>business-1-1-0</artifactId>
+ <name>Java Chassis::Demo::Edge::Business 1.1.0</name>
<properties>
<demo.main>org.apache.servicecomb.demo.edge.business.BusinessMain_V1_1_0</demo.main>
</properties>
@@ -43,7 +43,7 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
- <artifactId>hiboard-model</artifactId>
+ <artifactId>model</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git
a/demo/demo-edge/hiboard-business-1-1-0/src/main/java/org/apache/servicecomb/demo/edge/business/BusinessMain_V1_1_0.java
b/demo/demo-edge/business-1-1-0/src/main/java/org/apache/servicecomb/demo/edge/business/BusinessMain_V1_1_0.java
similarity index 100%
rename from
demo/demo-edge/hiboard-business-1-1-0/src/main/java/org/apache/servicecomb/demo/edge/business/BusinessMain_V1_1_0.java
rename to
demo/demo-edge/business-1-1-0/src/main/java/org/apache/servicecomb/demo/edge/business/BusinessMain_V1_1_0.java
diff --git
a/demo/demo-edge/hiboard-business-1-1-0/src/main/java/org/apache/servicecomb/demo/edge/business/Impl.java
b/demo/demo-edge/business-1-1-0/src/main/java/org/apache/servicecomb/demo/edge/business/Impl.java
similarity index 96%
rename from
demo/demo-edge/hiboard-business-1-1-0/src/main/java/org/apache/servicecomb/demo/edge/business/Impl.java
rename to
demo/demo-edge/business-1-1-0/src/main/java/org/apache/servicecomb/demo/edge/business/Impl.java
index d0d3ee1..3ff5cd1 100644
---
a/demo/demo-edge/hiboard-business-1-1-0/src/main/java/org/apache/servicecomb/demo/edge/business/Impl.java
+++
b/demo/demo-edge/business-1-1-0/src/main/java/org/apache/servicecomb/demo/edge/business/Impl.java
@@ -32,7 +32,7 @@ public class Impl {
@RequestMapping(path = "/channel/news/subscribe", method =
RequestMethod.POST)
public AppClientDataRsp subscribeNewsColumn(@RequestBody ChannelRequestBase
request) {
AppClientDataRsp response = new AppClientDataRsp();
- String rsp = StringUtils.rightPad("hiboard edge test", 1024, "*");
+ String rsp = StringUtils.rightPad("edge test", 1024, "*");
response.setRsp(rsp);
return response;
}
diff --git
a/demo/demo-edge/hiboard-business-1-1-0/src/main/resources/microservice.yaml
b/demo/demo-edge/business-1-1-0/src/main/resources/microservice.yaml
similarity index 97%
rename from
demo/demo-edge/hiboard-business-1-1-0/src/main/resources/microservice.yaml
rename to demo/demo-edge/business-1-1-0/src/main/resources/microservice.yaml
index ddac134..109e27a 100644
--- a/demo/demo-edge/hiboard-business-1-1-0/src/main/resources/microservice.yaml
+++ b/demo/demo-edge/business-1-1-0/src/main/resources/microservice.yaml
@@ -15,7 +15,7 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-APPLICATION_ID: hiboard
+APPLICATION_ID: edge
service_description:
name: business
version: 1.1.0
diff --git a/demo/demo-edge/hiboard-business-1.0.0/pom.xml
b/demo/demo-edge/business-1.0.0/pom.xml
similarity index 92%
rename from demo/demo-edge/hiboard-business-1.0.0/pom.xml
rename to demo/demo-edge/business-1.0.0/pom.xml
index db80e49..f77b0f2 100644
--- a/demo/demo-edge/hiboard-business-1.0.0/pom.xml
+++ b/demo/demo-edge/business-1.0.0/pom.xml
@@ -24,8 +24,8 @@
<artifactId>demo-edge</artifactId>
<version>0.6.0-SNAPSHOT</version>
</parent>
- <artifactId>hiboard-business-1-0-0</artifactId>
- <name>Java Chassis::Demo::Edge::HiBoard Business 1.0.0</name>
+ <artifactId>business-1-0-0</artifactId>
+ <name>Java Chassis::Demo::Edge::Business 1.0.0</name>
<properties>
<demo.main>org.apache.servicecomb.demo.edge.business.BusinessMain_V1_0_0</demo.main>
@@ -46,7 +46,7 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
- <artifactId>hiboard-model</artifactId>
+ <artifactId>model</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git
a/demo/demo-edge/hiboard-business-1.0.0/src/main/java/org/apache/servicecomb/demo/edge/business/BusinessMain_V1_0_0.java
b/demo/demo-edge/business-1.0.0/src/main/java/org/apache/servicecomb/demo/edge/business/BusinessMain_V1_0_0.java
similarity index 100%
rename from
demo/demo-edge/hiboard-business-1.0.0/src/main/java/org/apache/servicecomb/demo/edge/business/BusinessMain_V1_0_0.java
rename to
demo/demo-edge/business-1.0.0/src/main/java/org/apache/servicecomb/demo/edge/business/BusinessMain_V1_0_0.java
diff --git
a/demo/demo-edge/hiboard-business-1.0.0/src/main/java/org/apache/servicecomb/demo/edge/business/Impl.java
b/demo/demo-edge/business-1.0.0/src/main/java/org/apache/servicecomb/demo/edge/business/Impl.java
similarity index 96%
rename from
demo/demo-edge/hiboard-business-1.0.0/src/main/java/org/apache/servicecomb/demo/edge/business/Impl.java
rename to
demo/demo-edge/business-1.0.0/src/main/java/org/apache/servicecomb/demo/edge/business/Impl.java
index 1d39c25..1322db0 100644
---
a/demo/demo-edge/hiboard-business-1.0.0/src/main/java/org/apache/servicecomb/demo/edge/business/Impl.java
+++
b/demo/demo-edge/business-1.0.0/src/main/java/org/apache/servicecomb/demo/edge/business/Impl.java
@@ -32,7 +32,7 @@ public class Impl {
@RequestMapping(path = "/channel/news/subscribe", method =
RequestMethod.POST)
public AppClientDataRsp subscribeNewsColumn(@RequestBody ChannelRequestBase
request) {
AppClientDataRsp response = new AppClientDataRsp();
- String rsp = StringUtils.rightPad("hiboard edge test", 1024, "*");
+ String rsp = StringUtils.rightPad("edge test", 1024, "*");
response.setRsp(rsp);
return response;
}
diff --git
a/demo/demo-edge/hiboard-business-1.0.0/src/main/resources/microservice.yaml
b/demo/demo-edge/business-1.0.0/src/main/resources/microservice.yaml
similarity index 97%
rename from
demo/demo-edge/hiboard-business-1.0.0/src/main/resources/microservice.yaml
rename to demo/demo-edge/business-1.0.0/src/main/resources/microservice.yaml
index 4842c2a..2046f74 100644
--- a/demo/demo-edge/hiboard-business-1.0.0/src/main/resources/microservice.yaml
+++ b/demo/demo-edge/business-1.0.0/src/main/resources/microservice.yaml
@@ -15,7 +15,7 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-APPLICATION_ID: hiboard
+APPLICATION_ID: edge
service_description:
name: business
version: 1.0.0
diff --git a/demo/demo-edge/hiboard-business-2.0.0/pom.xml
b/demo/demo-edge/business-2.0.0/pom.xml
similarity index 92%
rename from demo/demo-edge/hiboard-business-2.0.0/pom.xml
rename to demo/demo-edge/business-2.0.0/pom.xml
index 590b305..8cc9ded 100644
--- a/demo/demo-edge/hiboard-business-2.0.0/pom.xml
+++ b/demo/demo-edge/business-2.0.0/pom.xml
@@ -24,8 +24,8 @@
<artifactId>demo-edge</artifactId>
<version>0.6.0-SNAPSHOT</version>
</parent>
- <artifactId>hiboard-business-2-0-0</artifactId>
- <name>Java Chassis::Demo::Edge::HiBoard Business 2.0.0</name>
+ <artifactId>business-2-0-0</artifactId>
+ <name>Java Chassis::Demo::Edge::Business 2.0.0</name>
<properties>
<demo.main>org.apache.servicecomb.demo.edge.business.BusinessMain_V2_0_0</demo.main>
@@ -46,7 +46,7 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
- <artifactId>hiboard-model</artifactId>
+ <artifactId>model</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git
a/demo/demo-edge/hiboard-business-2.0.0/src/main/java/org/apache/servicecomb/demo/edge/business/BusinessMain_V2_0_0.java
b/demo/demo-edge/business-2.0.0/src/main/java/org/apache/servicecomb/demo/edge/business/BusinessMain_V2_0_0.java
similarity index 100%
rename from
demo/demo-edge/hiboard-business-2.0.0/src/main/java/org/apache/servicecomb/demo/edge/business/BusinessMain_V2_0_0.java
rename to
demo/demo-edge/business-2.0.0/src/main/java/org/apache/servicecomb/demo/edge/business/BusinessMain_V2_0_0.java
diff --git
a/demo/demo-edge/hiboard-business-2.0.0/src/main/java/org/apache/servicecomb/demo/edge/business/Impl.java
b/demo/demo-edge/business-2.0.0/src/main/java/org/apache/servicecomb/demo/edge/business/Impl.java
similarity index 96%
rename from
demo/demo-edge/hiboard-business-2.0.0/src/main/java/org/apache/servicecomb/demo/edge/business/Impl.java
rename to
demo/demo-edge/business-2.0.0/src/main/java/org/apache/servicecomb/demo/edge/business/Impl.java
index 7593b7e..3db2a7c 100644
---
a/demo/demo-edge/hiboard-business-2.0.0/src/main/java/org/apache/servicecomb/demo/edge/business/Impl.java
+++
b/demo/demo-edge/business-2.0.0/src/main/java/org/apache/servicecomb/demo/edge/business/Impl.java
@@ -32,7 +32,7 @@ public class Impl {
@RequestMapping(path = "/channel/news/subscribe", method =
RequestMethod.POST)
public AppClientDataRsp subscribeNewsColumn(@RequestBody ChannelRequestBase
request) {
AppClientDataRsp response = new AppClientDataRsp();
- String rsp = StringUtils.rightPad("hiboard edge test", 1024, "*");
+ String rsp = StringUtils.rightPad("edge test", 1024, "*");
response.setRsp(rsp);
return response;
}
diff --git
a/demo/demo-edge/hiboard-business-2.0.0/src/main/resources/microservice.yaml
b/demo/demo-edge/business-2.0.0/src/main/resources/microservice.yaml
similarity index 97%
rename from
demo/demo-edge/hiboard-business-2.0.0/src/main/resources/microservice.yaml
rename to demo/demo-edge/business-2.0.0/src/main/resources/microservice.yaml
index eaddea7..b7e2e63 100644
--- a/demo/demo-edge/hiboard-business-2.0.0/src/main/resources/microservice.yaml
+++ b/demo/demo-edge/business-2.0.0/src/main/resources/microservice.yaml
@@ -15,7 +15,7 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-APPLICATION_ID: hiboard
+APPLICATION_ID: edge
service_description:
name: business
version: 2.0.0
diff --git a/demo/demo-edge/hiboard-consumer/pom.xml
b/demo/demo-edge/consumer/pom.xml
similarity index 93%
rename from demo/demo-edge/hiboard-consumer/pom.xml
rename to demo/demo-edge/consumer/pom.xml
index 4bd28aa..5087766 100644
--- a/demo/demo-edge/hiboard-consumer/pom.xml
+++ b/demo/demo-edge/consumer/pom.xml
@@ -24,8 +24,8 @@
<artifactId>demo-edge</artifactId>
<version>0.6.0-SNAPSHOT</version>
</parent>
- <artifactId>hiboard-consumer</artifactId>
- <name>Java Chassis::Demo::Edge::HiBoard Consumer</name>
+ <artifactId>consumer</artifactId>
+ <name>Java Chassis::Demo::Edge::Consumer</name>
<properties>
<demo.main>org.apache.servicecomb.demo.edge.consumer.ConsumerMain</demo.main>
@@ -50,7 +50,7 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb.demo</groupId>
- <artifactId>hiboard-model</artifactId>
+ <artifactId>model</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git
a/demo/demo-edge/hiboard-consumer/src/main/java/org/apache/servicecomb/demo/edge/consumer/Consumer.java
b/demo/demo-edge/consumer/src/main/java/org/apache/servicecomb/demo/edge/consumer/Consumer.java
similarity index 100%
rename from
demo/demo-edge/hiboard-consumer/src/main/java/org/apache/servicecomb/demo/edge/consumer/Consumer.java
rename to
demo/demo-edge/consumer/src/main/java/org/apache/servicecomb/demo/edge/consumer/Consumer.java
diff --git
a/demo/demo-edge/hiboard-consumer/src/main/java/org/apache/servicecomb/demo/edge/consumer/ConsumerMain.java
b/demo/demo-edge/consumer/src/main/java/org/apache/servicecomb/demo/edge/consumer/ConsumerMain.java
similarity index 100%
rename from
demo/demo-edge/hiboard-consumer/src/main/java/org/apache/servicecomb/demo/edge/consumer/ConsumerMain.java
rename to
demo/demo-edge/consumer/src/main/java/org/apache/servicecomb/demo/edge/consumer/ConsumerMain.java
diff --git
a/demo/demo-edge/hiboard-consumer/src/main/resources/microservice.yaml
b/demo/demo-edge/consumer/src/main/resources/microservice.yaml
similarity index 97%
rename from demo/demo-edge/hiboard-consumer/src/main/resources/microservice.yaml
rename to demo/demo-edge/consumer/src/main/resources/microservice.yaml
index d369107..85071dd 100644
--- a/demo/demo-edge/hiboard-consumer/src/main/resources/microservice.yaml
+++ b/demo/demo-edge/consumer/src/main/resources/microservice.yaml
@@ -15,7 +15,7 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-APPLICATION_ID: hiboard
+APPLICATION_ID: edge
service_description:
name: consumer
version: 0.0.1
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 f66a9b0..cb1fdad 100644
--- a/demo/demo-edge/edge-service/src/main/resources/microservice.yaml
+++ b/demo/demo-edge/edge-service/src/main/resources/microservice.yaml
@@ -15,7 +15,7 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-APPLICATION_ID: hiboard
+APPLICATION_ID: edge
service_description:
name: edge
version: 0.0.1
diff --git a/demo/demo-edge/hiboard-model/pom.xml b/demo/demo-edge/model/pom.xml
similarity index 93%
rename from demo/demo-edge/hiboard-model/pom.xml
rename to demo/demo-edge/model/pom.xml
index 136e82f..808c086 100644
--- a/demo/demo-edge/hiboard-model/pom.xml
+++ b/demo/demo-edge/model/pom.xml
@@ -23,8 +23,8 @@
<artifactId>demo-edge</artifactId>
<version>0.6.0-SNAPSHOT</version>
</parent>
- <artifactId>hiboard-model</artifactId>
- <name>Java Chassis::Demo::Edge::HiBoard Model</name>
+ <artifactId>model</artifactId>
+ <name>Java Chassis::Demo::Edge::Model</name>
<dependencies>
<dependency>
<groupId>org.apache.servicecomb</groupId>
diff --git
a/demo/demo-edge/hiboard-model/src/main/java/org/apache/servicecomb/demo/edge/model/AppClientDataRsp.java
b/demo/demo-edge/model/src/main/java/org/apache/servicecomb/demo/edge/model/AppClientDataRsp.java
similarity index 100%
rename from
demo/demo-edge/hiboard-model/src/main/java/org/apache/servicecomb/demo/edge/model/AppClientDataRsp.java
rename to
demo/demo-edge/model/src/main/java/org/apache/servicecomb/demo/edge/model/AppClientDataRsp.java
diff --git
a/demo/demo-edge/hiboard-model/src/main/java/org/apache/servicecomb/demo/edge/model/ChannelRequestBase.java
b/demo/demo-edge/model/src/main/java/org/apache/servicecomb/demo/edge/model/ChannelRequestBase.java
similarity index 100%
rename from
demo/demo-edge/hiboard-model/src/main/java/org/apache/servicecomb/demo/edge/model/ChannelRequestBase.java
rename to
demo/demo-edge/model/src/main/java/org/apache/servicecomb/demo/edge/model/ChannelRequestBase.java
diff --git
a/demo/demo-edge/hiboard-model/src/main/java/org/apache/servicecomb/demo/edge/model/ResultWithInstance.java
b/demo/demo-edge/model/src/main/java/org/apache/servicecomb/demo/edge/model/ResultWithInstance.java
similarity index 100%
rename from
demo/demo-edge/hiboard-model/src/main/java/org/apache/servicecomb/demo/edge/model/ResultWithInstance.java
rename to
demo/demo-edge/model/src/main/java/org/apache/servicecomb/demo/edge/model/ResultWithInstance.java
diff --git a/demo/demo-edge/pom.xml b/demo/demo-edge/pom.xml
index a57abf5..5fd6c51 100644
--- a/demo/demo-edge/pom.xml
+++ b/demo/demo-edge/pom.xml
@@ -31,11 +31,11 @@
<module>edge-service</module>
- <module>hiboard-model</module>
- <module>hiboard-consumer</module>
- <module>hiboard-business-1.0.0</module>
- <module>hiboard-business-1-1-0</module>
- <module>hiboard-business-2.0.0</module>
+ <module>model</module>
+ <module>consumer</module>
+ <module>business-1.0.0</module>
+ <module>business-1-1-0</module>
+ <module>business-2.0.0</module>
<module>authentication</module>
</modules>
--
To stop receiving notification emails like this one, please contact
"commits@servicecomb.apache.org" <commits@servicecomb.apache.org>.
