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-saga.git
The following commit(s) were added to refs/heads/master by this push:
new 6f1fa97 SCB-633 Correct artifactId and module of
saga-spring-cloud-demo (#200)
6f1fa97 is described below
commit 6f1fa97441a1e18264e777b3599f568de049d412
Author: zhengyangyong <yangyong.zh...@huawei.com>
AuthorDate: Fri Jun 1 22:17:25 2018 +0800
SCB-633 Correct artifactId and module of saga-spring-cloud-demo (#200)
* SCB-633 Correct artifactId and module of saga-spring-cloud-demo
Signed-off-by: zhengyangyong <yangyong.zh...@huawei.com>
* SCB-633 fix pr comment
Signed-off-by: zhengyangyong <yangyong.zh...@huawei.com>
* SCB-633 fix ci failed
Signed-off-by: zhengyangyong <yangyong.zh...@huawei.com>
---
.../acceptance-spring-cloud-demo/pom.xml | 10 ++++-----
.../resources/pack_compensation_scenario.feature | 14 ++++++------
.../test/resources/pack_success_scenario.feature | 12 +++++-----
.../test/resources/pack_timeout_scenario.feature | 18 +++++++--------
saga-demo/saga-dubbo-demo/service-api/pom.xml | 1 +
saga-demo/saga-dubbo-demo/service-pub/pom.xml | 2 +-
saga-demo/saga-dubbo-demo/servicea/pom.xml | 1 +
saga-demo/saga-dubbo-demo/serviceb/pom.xml | 1 +
saga-demo/saga-dubbo-demo/servicec/pom.xml | 1 +
saga-demo/saga-spring-cloud-demo/README.md | 12 +++++-----
saga-demo/saga-spring-cloud-demo/booking/pom.xml | 6 ++---
.../saga/demo/pack/booking/BookingController.java | 4 ++--
.../booking/src/main/resources/application.yaml | 2 +-
saga-demo/saga-spring-cloud-demo/car/pom.xml | 6 ++---
.../car/src/main/resources/application.yaml | 2 +-
.../docker-compose-demo.yaml | 26 +++++++++++-----------
.../saga-spring-cloud-demo/docker-compose.yaml | 26 +++++++++++-----------
saga-demo/saga-spring-cloud-demo/hotel/pom.xml | 6 ++---
.../hotel/src/main/resources/application.yaml | 2 +-
saga-demo/saga-spring-cloud-demo/pom.xml | 2 +-
20 files changed, 79 insertions(+), 75 deletions(-)
diff --git a/acceptance-tests/acceptance-spring-cloud-demo/pom.xml
b/acceptance-tests/acceptance-spring-cloud-demo/pom.xml
index d99d476..c9f4888 100644
--- a/acceptance-tests/acceptance-spring-cloud-demo/pom.xml
+++ b/acceptance-tests/acceptance-spring-cloud-demo/pom.xml
@@ -144,7 +144,7 @@
</run>
</image>
<image>
- <name>pack-car:${project.version}</name>
+ <name>car:${project.version}</name>
<alias>car</alias>
<run>
<env>
@@ -176,7 +176,7 @@
</run>
</image>
<image>
- <name>pack-hotel:${project.version}</name>
+ <name>hotel:${project.version}</name>
<alias>hotel</alias>
<run>
<env>
@@ -208,7 +208,7 @@
</run>
</image>
<image>
- <name>pack-booking:${project.version}</name>
+ <name>booking:${project.version}</name>
<alias>booking</alias>
<run>
<env>
@@ -229,8 +229,8 @@
</wait>
<links>
<link>alpha:alpha-server.servicecomb.io</link>
- <link>car:pack-car.servicecomb.io</link>
- <link>hotel:pack-hotel.servicecomb.io</link>
+ <link>car:car.servicecomb.io</link>
+ <link>hotel:hotel.servicecomb.io</link>
</links>
<ports>
<port>booking.port:8080</port>
diff --git
a/acceptance-tests/acceptance-spring-cloud-demo/src/test/resources/pack_compensation_scenario.feature
b/acceptance-tests/acceptance-spring-cloud-demo/src/test/resources/pack_compensation_scenario.feature
index 64c5812..0375f35 100644
---
a/acceptance-tests/acceptance-spring-cloud-demo/src/test/resources/pack_compensation_scenario.feature
+++
b/acceptance-tests/acceptance-spring-cloud-demo/src/test/resources/pack_compensation_scenario.feature
@@ -25,13 +25,13 @@ Feature: Alpha records transaction events
Then Alpha records the following events
| serviceName | type |
- | pack-booking | SagaStartedEvent |
- | pack-car | TxStartedEvent |
- | pack-car | TxEndedEvent |
- | pack-hotel | TxStartedEvent |
- | pack-hotel | TxAbortedEvent |
- | pack-car | TxCompensatedEvent |
- | pack-car | SagaEndedEvent |
+ | booking | SagaStartedEvent |
+ | car | TxStartedEvent |
+ | car | TxEndedEvent |
+ | hotel | TxStartedEvent |
+ | hotel | TxAbortedEvent |
+ | car | TxCompensatedEvent |
+ | car | SagaEndedEvent |
Then Car Service contains the following booking orders
| name | amount | confirmed | cancelled |
diff --git
a/acceptance-tests/acceptance-spring-cloud-demo/src/test/resources/pack_success_scenario.feature
b/acceptance-tests/acceptance-spring-cloud-demo/src/test/resources/pack_success_scenario.feature
index 7132cbb..781a0a7 100644
---
a/acceptance-tests/acceptance-spring-cloud-demo/src/test/resources/pack_success_scenario.feature
+++
b/acceptance-tests/acceptance-spring-cloud-demo/src/test/resources/pack_success_scenario.feature
@@ -25,12 +25,12 @@ Feature: Alpha records transaction events
Then Alpha records the following events
| serviceName | type |
- | pack-booking | SagaStartedEvent |
- | pack-car | TxStartedEvent |
- | pack-car | TxEndedEvent |
- | pack-hotel | TxStartedEvent |
- | pack-hotel | TxEndedEvent |
- | pack-booking | SagaEndedEvent |
+ | booking | SagaStartedEvent |
+ | car | TxStartedEvent |
+ | car | TxEndedEvent |
+ | hotel | TxStartedEvent |
+ | hotel | TxEndedEvent |
+ | booking | SagaEndedEvent |
And Car Service contains the following booking orders
| name | amount | confirmed | cancelled |
diff --git
a/acceptance-tests/acceptance-spring-cloud-demo/src/test/resources/pack_timeout_scenario.feature
b/acceptance-tests/acceptance-spring-cloud-demo/src/test/resources/pack_timeout_scenario.feature
index a49d340..78193e9 100644
---
a/acceptance-tests/acceptance-spring-cloud-demo/src/test/resources/pack_timeout_scenario.feature
+++
b/acceptance-tests/acceptance-spring-cloud-demo/src/test/resources/pack_timeout_scenario.feature
@@ -27,15 +27,15 @@ Feature: Alpha records transaction events
Then Alpha records the following events
| serviceName | type |
- | pack-booking | SagaStartedEvent |
- | pack-car | TxStartedEvent |
- | pack-car | TxEndedEvent |
- | pack-hotel | TxStartedEvent |
- | pack-hotel | TxEndedEvent |
- | pack-booking | TxAbortedEvent |
- | pack-hotel | TxCompensatedEvent |
- | pack-car | TxCompensatedEvent |
- | pack-car | SagaEndedEvent |
+ | booking | SagaStartedEvent |
+ | car | TxStartedEvent |
+ | car | TxEndedEvent |
+ | hotel | TxStartedEvent |
+ | hotel | TxEndedEvent |
+ | booking | TxAbortedEvent |
+ | hotel | TxCompensatedEvent |
+ | car | TxCompensatedEvent |
+ | car | SagaEndedEvent |
Then Car Service contains the following booking orders
| name | amount | confirmed | cancelled |
diff --git a/saga-demo/saga-dubbo-demo/service-api/pom.xml
b/saga-demo/saga-dubbo-demo/service-api/pom.xml
index a74c31b..e63b3d4 100644
--- a/saga-demo/saga-dubbo-demo/service-api/pom.xml
+++ b/saga-demo/saga-dubbo-demo/service-api/pom.xml
@@ -35,5 +35,6 @@
</parent>
<artifactId>service-api</artifactId>
+ <name>Saga::Demo::Dubbo-Demo::ServiceAPI</name>
</project>
\ No newline at end of file
diff --git a/saga-demo/saga-dubbo-demo/service-pub/pom.xml
b/saga-demo/saga-dubbo-demo/service-pub/pom.xml
index 1dff58e..99f414d 100644
--- a/saga-demo/saga-dubbo-demo/service-pub/pom.xml
+++ b/saga-demo/saga-dubbo-demo/service-pub/pom.xml
@@ -26,6 +26,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>service-pub</artifactId>
-
+ <name>Saga::Demo::Dubbo-Demo::ServicePub</name>
</project>
\ No newline at end of file
diff --git a/saga-demo/saga-dubbo-demo/servicea/pom.xml
b/saga-demo/saga-dubbo-demo/servicea/pom.xml
index 025bdbd..f1f0da9 100644
--- a/saga-demo/saga-dubbo-demo/servicea/pom.xml
+++ b/saga-demo/saga-dubbo-demo/servicea/pom.xml
@@ -40,6 +40,7 @@
</parent>
<artifactId>servicea</artifactId>
+ <name>Saga::Demo::Dubbo-Demo::ServiceA</name>
<build>
<plugins>
diff --git a/saga-demo/saga-dubbo-demo/serviceb/pom.xml
b/saga-demo/saga-dubbo-demo/serviceb/pom.xml
index c5d736b..417cbf4 100644
--- a/saga-demo/saga-dubbo-demo/serviceb/pom.xml
+++ b/saga-demo/saga-dubbo-demo/serviceb/pom.xml
@@ -36,6 +36,7 @@
</parent>
<artifactId>serviceb</artifactId>
+ <name>Saga::Demo::Dubbo-Demo::ServiceB</name>
<build>
<plugins>
diff --git a/saga-demo/saga-dubbo-demo/servicec/pom.xml
b/saga-demo/saga-dubbo-demo/servicec/pom.xml
index d1eb1d4..974c654 100644
--- a/saga-demo/saga-dubbo-demo/servicec/pom.xml
+++ b/saga-demo/saga-dubbo-demo/servicec/pom.xml
@@ -36,6 +36,7 @@
</parent>
<artifactId>servicec</artifactId>
+ <name>Saga::Demo::Dubbo-Demo::ServiceC</name>
<build>
<plugins>
diff --git a/saga-demo/saga-spring-cloud-demo/README.md
b/saga-demo/saga-spring-cloud-demo/README.md
index b72c62e..65b9e69 100644
--- a/saga-demo/saga-spring-cloud-demo/README.md
+++ b/saga-demo/saga-spring-cloud-demo/README.md
@@ -1,8 +1,8 @@
# Booking Demo
This demo simulates a booking application including three services:
-* pack-booking
-* pack-car
-* pack-hotel
+* booking
+* car
+* hotel
## Prerequisites
You will need:
@@ -78,17 +78,17 @@ You can run the demo using either docker compose or
executable files.
3. start application up
1. start hotel service. The executable jar file should be in
`saga-demo/booking/hotel/target/saga`.
```bash
- java -Dserver.port=8081 -Dalpha.cluster.address=${alpha_address}:8080 -jar
pack-hotel-${saga_version}-exec.jar
+ java -Dserver.port=8081 -Dalpha.cluster.address=${alpha_address}:8080 -jar
hotel-${saga_version}-exec.jar
```
2. start car service. The executable jar file should be in
`saga-demo/booking/car/target/saga`.
```bash
- java -Dserver.port=8082 -Dalpha.cluster.address=${alpha_address}:8080 -jar
pack-car-${saga_version}-exec.jar
+ java -Dserver.port=8082 -Dalpha.cluster.address=${alpha_address}:8080 -jar
car-${saga_version}-exec.jar
```
3. start booking service. The executable jar file should be in
`saga-demo/booking/booking/target/saga`.
```bash
- java -Dserver.port=8083 -Dalpha.cluster.address=${alpha_address}:8080
-Dcar.service.address=${host_address}:8082
-Dhotel.service.address=${host_address}:8081 -jar
pack-booking-${saga_version}-exec.jar
+ java -Dserver.port=8083 -Dalpha.cluster.address=${alpha_address}:8080
-Dcar.service.address=${host_address}:8082
-Dhotel.service.address=${host_address}:8081 -jar
booking-${saga_version}-exec.jar
```
## User Requests by command line tools
diff --git a/saga-demo/saga-spring-cloud-demo/booking/pom.xml
b/saga-demo/saga-spring-cloud-demo/booking/pom.xml
index 624eb32..65d5e5a 100644
--- a/saga-demo/saga-spring-cloud-demo/booking/pom.xml
+++ b/saga-demo/saga-spring-cloud-demo/booking/pom.xml
@@ -18,14 +18,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
- <artifactId>booking</artifactId>
+ <artifactId>saga-spring-cloud-demo</artifactId>
<groupId>org.apache.servicecomb.saga.demo</groupId>
<version>0.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>pack-booking</artifactId>
- <name>Saga::Demo::Pack::Booking</name>
+ <artifactId>booking</artifactId>
+ <name>Saga::Demo::Spring-Cloud-Demo::Booking</name>
<dependencies>
<dependency>
diff --git
a/saga-demo/saga-spring-cloud-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/BookingController.java
b/saga-demo/saga-spring-cloud-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/BookingController.java
index c194811..9a7433c 100644
---
a/saga-demo/saga-spring-cloud-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/BookingController.java
+++
b/saga-demo/saga-spring-cloud-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/BookingController.java
@@ -28,10 +28,10 @@ import org.springframework.web.client.RestTemplate;
@RestController
public class BookingController {
- @Value("${car.service.address:http://pack-car.servicecomb.io:8080}";)
+ @Value("${car.service.address:http://car.servicecomb.io:8080}";)
private String carServiceUrl;
- @Value("${hotel.service.address:http://pack-hotel.servicecomb.io:8080}";)
+ @Value("${hotel.service.address:http://hotel.servicecomb.io:8080}";)
private String hotelServiceUrl;
@Autowired
diff --git
a/saga-demo/saga-spring-cloud-demo/booking/src/main/resources/application.yaml
b/saga-demo/saga-spring-cloud-demo/booking/src/main/resources/application.yaml
index ef8f833..65e6508 100644
---
a/saga-demo/saga-spring-cloud-demo/booking/src/main/resources/application.yaml
+++
b/saga-demo/saga-spring-cloud-demo/booking/src/main/resources/application.yaml
@@ -16,7 +16,7 @@
## ---------------------------------------------------------------------------
spring:
application:
- name: pack-booking
+ name: booking
alpha:
cluster:
address: alpha-server.servicecomb.io:8080
diff --git a/saga-demo/saga-spring-cloud-demo/car/pom.xml
b/saga-demo/saga-spring-cloud-demo/car/pom.xml
index 95db68d..3f8b4eb 100644
--- a/saga-demo/saga-spring-cloud-demo/car/pom.xml
+++ b/saga-demo/saga-spring-cloud-demo/car/pom.xml
@@ -18,14 +18,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
- <artifactId>booking</artifactId>
+ <artifactId>saga-spring-cloud-demo</artifactId>
<groupId>org.apache.servicecomb.saga.demo</groupId>
<version>0.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>pack-car</artifactId>
- <name>Saga::Demo::Pack::Car</name>
+ <artifactId>car</artifactId>
+ <name>Saga::Demo::Spring-Cloud-Demo::Car</name>
<dependencies>
<dependency>
diff --git
a/saga-demo/saga-spring-cloud-demo/car/src/main/resources/application.yaml
b/saga-demo/saga-spring-cloud-demo/car/src/main/resources/application.yaml
index 2a1c2b7..42572f3 100644
--- a/saga-demo/saga-spring-cloud-demo/car/src/main/resources/application.yaml
+++ b/saga-demo/saga-spring-cloud-demo/car/src/main/resources/application.yaml
@@ -16,7 +16,7 @@
## ---------------------------------------------------------------------------
spring:
application:
- name: pack-car
+ name: car
alpha:
cluster:
address: alpha-server.servicecomb.io:8080
diff --git a/saga-demo/saga-spring-cloud-demo/docker-compose-demo.yaml
b/saga-demo/saga-spring-cloud-demo/docker-compose-demo.yaml
index b1d6639..2fcf1a1 100644
--- a/saga-demo/saga-spring-cloud-demo/docker-compose-demo.yaml
+++ b/saga-demo/saga-spring-cloud-demo/docker-compose-demo.yaml
@@ -18,31 +18,31 @@
version: '2.1'
services:
- pack-hotel:
- image: "pack-hotel:${TAG}"
- hostname: pack-hotel
+ hotel:
+ image: "hotel:${TAG}"
+ hostname: hotel
external_links:
- "alpha:alpha-server.servicecomb.io"
ports:
- "8081:8080"
- pack-car:
- image: "pack-car:${TAG}"
- hostname: pack-car
+ car:
+ image: "car:${TAG}"
+ hostname: car
external_links:
- "alpha:alpha-server.servicecomb.io"
ports:
- "8082:8080"
- pack-booking:
- image: "pack-booking:${TAG}"
- hostname: pack-booking
+ booking:
+ image: "booking:${TAG}"
+ hostname: booking
external_links:
- "alpha:alpha-server.servicecomb.io"
- - "pack-hotel:pack-hotel.servicecomb.io"
- - "pack-car:pack-car.servicecomb.io"
+ - "hotel:hotel.servicecomb.io"
+ - "car:car.servicecomb.io"
ports:
- "8083:8080"
depends_on:
- - pack-hotel
- - pack-car
+ - hotel
+ - car
diff --git a/saga-demo/saga-spring-cloud-demo/docker-compose.yaml
b/saga-demo/saga-spring-cloud-demo/docker-compose.yaml
index e9f8dd1..38e48f1 100644
--- a/saga-demo/saga-spring-cloud-demo/docker-compose.yaml
+++ b/saga-demo/saga-spring-cloud-demo/docker-compose.yaml
@@ -47,9 +47,9 @@ services:
database:
condition: service_healthy
- pack-hotel:
- image: "pack-hotel:${TAG}"
- hostname: pack-hotel
+ hotel:
+ image: "hotel:${TAG}"
+ hostname: hotel
links:
- "alpha:alpha-server.servicecomb.io"
ports:
@@ -58,9 +58,9 @@ services:
alpha:
condition: service_healthy
- pack-car:
- image: "pack-car:${TAG}"
- hostname: pack-car
+ car:
+ image: "car:${TAG}"
+ hostname: car
links:
- "alpha:alpha-server.servicecomb.io"
ports:
@@ -69,15 +69,15 @@ services:
alpha:
condition: service_healthy
- pack-booking:
- image: "pack-booking:${TAG}"
- hostname: pack-booking
+ booking:
+ image: "booking:${TAG}"
+ hostname: booking
links:
- "alpha:alpha-server.servicecomb.io"
- - "pack-hotel:pack-hotel.servicecomb.io"
- - "pack-car:pack-car.servicecomb.io"
+ - "hotel:hotel.servicecomb.io"
+ - "car:car.servicecomb.io"
ports:
- "8083:8080"
depends_on:
- - pack-hotel
- - pack-car
+ - hotel
+ - car
diff --git a/saga-demo/saga-spring-cloud-demo/hotel/pom.xml
b/saga-demo/saga-spring-cloud-demo/hotel/pom.xml
index a8285e4..c8bfa1a 100644
--- a/saga-demo/saga-spring-cloud-demo/hotel/pom.xml
+++ b/saga-demo/saga-spring-cloud-demo/hotel/pom.xml
@@ -18,14 +18,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
- <artifactId>booking</artifactId>
+ <artifactId>saga-spring-cloud-demo</artifactId>
<groupId>org.apache.servicecomb.saga.demo</groupId>
<version>0.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>pack-hotel</artifactId>
- <name>Saga::Demo::Pack::Hotel</name>
+ <artifactId>hotel</artifactId>
+ <name>Saga::Demo::Spring-Cloud-Demo::Hotel</name>
<dependencies>
<dependency>
diff --git
a/saga-demo/saga-spring-cloud-demo/hotel/src/main/resources/application.yaml
b/saga-demo/saga-spring-cloud-demo/hotel/src/main/resources/application.yaml
index cb03be0..99bb4a8 100644
--- a/saga-demo/saga-spring-cloud-demo/hotel/src/main/resources/application.yaml
+++ b/saga-demo/saga-spring-cloud-demo/hotel/src/main/resources/application.yaml
@@ -16,7 +16,7 @@
## ---------------------------------------------------------------------------
spring:
application:
- name: pack-hotel
+ name: hotel
alpha:
cluster:
address: alpha-server.servicecomb.io:8080
diff --git a/saga-demo/saga-spring-cloud-demo/pom.xml
b/saga-demo/saga-spring-cloud-demo/pom.xml
index 03b2f11..a3272c4 100644
--- a/saga-demo/saga-spring-cloud-demo/pom.xml
+++ b/saga-demo/saga-spring-cloud-demo/pom.xml
@@ -24,7 +24,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>booking</artifactId>
+ <artifactId>saga-spring-cloud-demo</artifactId>
<name>Saga::Demo::Spring-Cloud-Demo</name>
<packaging>pom</packaging>
--
To stop receiving notification emails like this one, please contact
ningji...@apache.org.
