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 a7382ea SCB-628 correct naming for demos
a7382ea is described below
commit a7382ea68b2206bb50cacdad22d369f464e4005a
Author: Eric Lee <[email protected]>
AuthorDate: Thu May 31 23:08:20 2018 +0800
SCB-628 correct naming for demos
Signed-off-by: Eric Lee <[email protected]>
---
README.md | 3 ++-
README_ZH.md | 3 ++-
.../{acceptance-pack => acceptance-spring-cloud-demo}/pom.xml | 0
.../src/test/java/org/apache/servicecomb/saga/PackStepdefs.java | 0
.../src/test/java/org/apache/servicecomb/saga/RunCucumberIT.java | 0
.../src/test/resources/booking_timeout.btm | 0
.../src/test/resources/log4j2-test.xml | 0
.../src/test/resources/pack_compensation_scenario.feature | 0
.../src/test/resources/pack_success_scenario.feature | 0
.../src/test/resources/pack_timeout_scenario.feature | 0
acceptance-tests/pom.xml | 2 +-
saga-demo/pom.xml | 2 +-
saga-demo/{booking => saga-spring-cloud-demo}/README.md | 0
saga-demo/{booking => saga-spring-cloud-demo}/booking/pom.xml | 0
.../org/apache/servicecomb/saga/demo/pack/booking/Application.java | 0
.../apache/servicecomb/saga/demo/pack/booking/BookingController.java | 0
.../org/apache/servicecomb/saga/demo/pack/booking/MyConfiguration.java | 0
.../booking/src/main/resources/application.yaml | 0
.../booking}/src/main/resources/log4j2.xml | 0
.../booking/src/main/resources/static/index.html | 0
saga-demo/{booking => saga-spring-cloud-demo}/car/pom.xml | 0
.../java/org/apache/servicecomb/saga/demo/pack/car/Application.java | 0
.../java/org/apache/servicecomb/saga/demo/pack/car/CarBooking.java | 0
.../apache/servicecomb/saga/demo/pack/car/CarBookingController.java | 0
.../org/apache/servicecomb/saga/demo/pack/car/CarBookingService.java | 0
.../car/src/main/resources/application.yaml | 0
.../car/src/main/resources/log4j2.xml | 0
.../{booking => saga-spring-cloud-demo}/docker-compose-alpha.yaml | 0
saga-demo/{booking => saga-spring-cloud-demo}/docker-compose-demo.yaml | 0
.../{booking => saga-spring-cloud-demo}/docker-compose.mysql.yaml | 0
saga-demo/{booking => saga-spring-cloud-demo}/docker-compose.yaml | 0
saga-demo/{booking => saga-spring-cloud-demo}/hotel/pom.xml | 0
.../java/org/apache/servicecomb/saga/demo/pack/hotel/Application.java | 0
.../java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBooking.java | 0
.../servicecomb/saga/demo/pack/hotel/HotelBookingController.java | 0
.../apache/servicecomb/saga/demo/pack/hotel/HotelBookingService.java | 0
.../hotel/src/main/resources/application.yaml | 0
.../hotel}/src/main/resources/log4j2.xml | 0
saga-demo/{booking => saga-spring-cloud-demo}/pom.xml | 0
saga-demo/{booking => saga-spring-cloud-demo}/saga-demo.sh | 0
40 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index 65cffa2..cc0ca13 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,8 @@ The following diagram shows the relationships among alpha,
omega and services.
See [Saga Pack Design](docs/design.md) for details.
## Get Started
-See [Booking Demo](saga-demo/booking/README.md) for details.
+* For Spring Cloud applications, please see [Booking
Demo](saga-demo/saga-spring-cloud-demo/README.md) for details.
+* For Dubbo applications, please see [Dubbo
Demo](saga-demo/saga-dubbo-demo/README.md) for details.
## Build and Run the tests from source
* Build the source demo docker image and run all tests
diff --git a/README_ZH.md b/README_ZH.md
index 8367c0c..6319277 100644
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -20,7 +20,8 @@ Saga是由 **alpha** 和 **omega**组成，其中：
详情可浏览[Saga Pack 设计文档](docs/design_zh.md).
## 快速入门
-详情可浏览[出行预订示例](saga-demo/booking/README.md)。
+* Saga在Spring
Cloud应用的用法可参考[出行预订示例](saga-demo/saga-spring-cloud-demo/README.md)。
+* Saga在Dubbo应用的用法可参考[Dubbo示例](saga-demo/saga-dubbo-demo/README.md).
## 用户指南
如何构建和使用可浏览[用户指南](docs/user_guide_zh.md)。
diff --git a/acceptance-tests/acceptance-pack/pom.xml
b/acceptance-tests/acceptance-spring-cloud-demo/pom.xml
similarity index 100%
rename from acceptance-tests/acceptance-pack/pom.xml
rename to acceptance-tests/acceptance-spring-cloud-demo/pom.xml
diff --git
a/acceptance-tests/acceptance-pack/src/test/java/org/apache/servicecomb/saga/PackStepdefs.java
b/acceptance-tests/acceptance-spring-cloud-demo/src/test/java/org/apache/servicecomb/saga/PackStepdefs.java
similarity index 100%
rename from
acceptance-tests/acceptance-pack/src/test/java/org/apache/servicecomb/saga/PackStepdefs.java
rename to
acceptance-tests/acceptance-spring-cloud-demo/src/test/java/org/apache/servicecomb/saga/PackStepdefs.java
diff --git
a/acceptance-tests/acceptance-pack/src/test/java/org/apache/servicecomb/saga/RunCucumberIT.java
b/acceptance-tests/acceptance-spring-cloud-demo/src/test/java/org/apache/servicecomb/saga/RunCucumberIT.java
similarity index 100%
rename from
acceptance-tests/acceptance-pack/src/test/java/org/apache/servicecomb/saga/RunCucumberIT.java
rename to
acceptance-tests/acceptance-spring-cloud-demo/src/test/java/org/apache/servicecomb/saga/RunCucumberIT.java
diff --git
a/acceptance-tests/acceptance-pack/src/test/resources/booking_timeout.btm
b/acceptance-tests/acceptance-spring-cloud-demo/src/test/resources/booking_timeout.btm
similarity index 100%
rename from
acceptance-tests/acceptance-pack/src/test/resources/booking_timeout.btm
rename to
acceptance-tests/acceptance-spring-cloud-demo/src/test/resources/booking_timeout.btm
diff --git
a/acceptance-tests/acceptance-pack/src/test/resources/log4j2-test.xml
b/acceptance-tests/acceptance-spring-cloud-demo/src/test/resources/log4j2-test.xml
similarity index 100%
rename from acceptance-tests/acceptance-pack/src/test/resources/log4j2-test.xml
rename to
acceptance-tests/acceptance-spring-cloud-demo/src/test/resources/log4j2-test.xml
diff --git
a/acceptance-tests/acceptance-pack/src/test/resources/pack_compensation_scenario.feature
b/acceptance-tests/acceptance-spring-cloud-demo/src/test/resources/pack_compensation_scenario.feature
similarity index 100%
rename from
acceptance-tests/acceptance-pack/src/test/resources/pack_compensation_scenario.feature
rename to
acceptance-tests/acceptance-spring-cloud-demo/src/test/resources/pack_compensation_scenario.feature
diff --git
a/acceptance-tests/acceptance-pack/src/test/resources/pack_success_scenario.feature
b/acceptance-tests/acceptance-spring-cloud-demo/src/test/resources/pack_success_scenario.feature
similarity index 100%
rename from
acceptance-tests/acceptance-pack/src/test/resources/pack_success_scenario.feature
rename to
acceptance-tests/acceptance-spring-cloud-demo/src/test/resources/pack_success_scenario.feature
diff --git
a/acceptance-tests/acceptance-pack/src/test/resources/pack_timeout_scenario.feature
b/acceptance-tests/acceptance-spring-cloud-demo/src/test/resources/pack_timeout_scenario.feature
similarity index 100%
rename from
acceptance-tests/acceptance-pack/src/test/resources/pack_timeout_scenario.feature
rename to
acceptance-tests/acceptance-spring-cloud-demo/src/test/resources/pack_timeout_scenario.feature
diff --git a/acceptance-tests/pom.xml b/acceptance-tests/pom.xml
index 572d949..8572a0f 100644
--- a/acceptance-tests/pom.xml
+++ b/acceptance-tests/pom.xml
@@ -30,8 +30,8 @@
<name>Saga:Acceptance Tests</name>
<packaging>pom</packaging>
<modules>
- <module>acceptance-pack</module>
<module>acceptance-dubbo-demo</module>
+ <module>acceptance-spring-cloud-demo</module>
</modules>
<properties>
diff --git a/saga-demo/pom.xml b/saga-demo/pom.xml
index 0c77b00..30788d8 100644
--- a/saga-demo/pom.xml
+++ b/saga-demo/pom.xml
@@ -30,8 +30,8 @@
<packaging>pom</packaging>
<modules>
- <module>booking</module>
<module>saga-dubbo-demo</module>
+ <module>saga-spring-cloud-demo</module>
</modules>
<dependencyManagement>
diff --git a/saga-demo/booking/README.md
b/saga-demo/saga-spring-cloud-demo/README.md
similarity index 100%
rename from saga-demo/booking/README.md
rename to saga-demo/saga-spring-cloud-demo/README.md
diff --git a/saga-demo/booking/booking/pom.xml
b/saga-demo/saga-spring-cloud-demo/booking/pom.xml
similarity index 100%
rename from saga-demo/booking/booking/pom.xml
rename to saga-demo/saga-spring-cloud-demo/booking/pom.xml
diff --git
a/saga-demo/booking/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/Application.java
b/saga-demo/saga-spring-cloud-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/Application.java
similarity index 100%
rename from
saga-demo/booking/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/Application.java
rename to
saga-demo/saga-spring-cloud-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/Application.java
diff --git
a/saga-demo/booking/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
similarity index 100%
rename from
saga-demo/booking/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/BookingController.java
rename to
saga-demo/saga-spring-cloud-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/BookingController.java
diff --git
a/saga-demo/booking/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/MyConfiguration.java
b/saga-demo/saga-spring-cloud-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/MyConfiguration.java
similarity index 100%
rename from
saga-demo/booking/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/MyConfiguration.java
rename to
saga-demo/saga-spring-cloud-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/MyConfiguration.java
diff --git a/saga-demo/booking/booking/src/main/resources/application.yaml
b/saga-demo/saga-spring-cloud-demo/booking/src/main/resources/application.yaml
similarity index 100%
rename from saga-demo/booking/booking/src/main/resources/application.yaml
rename to
saga-demo/saga-spring-cloud-demo/booking/src/main/resources/application.yaml
diff --git a/saga-demo/booking/hotel/src/main/resources/log4j2.xml
b/saga-demo/saga-spring-cloud-demo/booking/src/main/resources/log4j2.xml
similarity index 100%
rename from saga-demo/booking/hotel/src/main/resources/log4j2.xml
rename to saga-demo/saga-spring-cloud-demo/booking/src/main/resources/log4j2.xml
diff --git a/saga-demo/booking/booking/src/main/resources/static/index.html
b/saga-demo/saga-spring-cloud-demo/booking/src/main/resources/static/index.html
similarity index 100%
rename from saga-demo/booking/booking/src/main/resources/static/index.html
rename to
saga-demo/saga-spring-cloud-demo/booking/src/main/resources/static/index.html
diff --git a/saga-demo/booking/car/pom.xml
b/saga-demo/saga-spring-cloud-demo/car/pom.xml
similarity index 100%
rename from saga-demo/booking/car/pom.xml
rename to saga-demo/saga-spring-cloud-demo/car/pom.xml
diff --git
a/saga-demo/booking/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/Application.java
b/saga-demo/saga-spring-cloud-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/Application.java
similarity index 100%
rename from
saga-demo/booking/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/Application.java
rename to
saga-demo/saga-spring-cloud-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/Application.java
diff --git
a/saga-demo/booking/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBooking.java
b/saga-demo/saga-spring-cloud-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBooking.java
similarity index 100%
rename from
saga-demo/booking/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBooking.java
rename to
saga-demo/saga-spring-cloud-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBooking.java
diff --git
a/saga-demo/booking/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingController.java
b/saga-demo/saga-spring-cloud-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingController.java
similarity index 100%
rename from
saga-demo/booking/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingController.java
rename to
saga-demo/saga-spring-cloud-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingController.java
diff --git
a/saga-demo/booking/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingService.java
b/saga-demo/saga-spring-cloud-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingService.java
similarity index 100%
rename from
saga-demo/booking/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingService.java
rename to
saga-demo/saga-spring-cloud-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingService.java
diff --git a/saga-demo/booking/car/src/main/resources/application.yaml
b/saga-demo/saga-spring-cloud-demo/car/src/main/resources/application.yaml
similarity index 100%
rename from saga-demo/booking/car/src/main/resources/application.yaml
rename to
saga-demo/saga-spring-cloud-demo/car/src/main/resources/application.yaml
diff --git a/saga-demo/booking/car/src/main/resources/log4j2.xml
b/saga-demo/saga-spring-cloud-demo/car/src/main/resources/log4j2.xml
similarity index 100%
rename from saga-demo/booking/car/src/main/resources/log4j2.xml
rename to saga-demo/saga-spring-cloud-demo/car/src/main/resources/log4j2.xml
diff --git a/saga-demo/booking/docker-compose-alpha.yaml
b/saga-demo/saga-spring-cloud-demo/docker-compose-alpha.yaml
similarity index 100%
rename from saga-demo/booking/docker-compose-alpha.yaml
rename to saga-demo/saga-spring-cloud-demo/docker-compose-alpha.yaml
diff --git a/saga-demo/booking/docker-compose-demo.yaml
b/saga-demo/saga-spring-cloud-demo/docker-compose-demo.yaml
similarity index 100%
rename from saga-demo/booking/docker-compose-demo.yaml
rename to saga-demo/saga-spring-cloud-demo/docker-compose-demo.yaml
diff --git a/saga-demo/booking/docker-compose.mysql.yaml
b/saga-demo/saga-spring-cloud-demo/docker-compose.mysql.yaml
similarity index 100%
rename from saga-demo/booking/docker-compose.mysql.yaml
rename to saga-demo/saga-spring-cloud-demo/docker-compose.mysql.yaml
diff --git a/saga-demo/booking/docker-compose.yaml
b/saga-demo/saga-spring-cloud-demo/docker-compose.yaml
similarity index 100%
rename from saga-demo/booking/docker-compose.yaml
rename to saga-demo/saga-spring-cloud-demo/docker-compose.yaml
diff --git a/saga-demo/booking/hotel/pom.xml
b/saga-demo/saga-spring-cloud-demo/hotel/pom.xml
similarity index 100%
rename from saga-demo/booking/hotel/pom.xml
rename to saga-demo/saga-spring-cloud-demo/hotel/pom.xml
diff --git
a/saga-demo/booking/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/Application.java
b/saga-demo/saga-spring-cloud-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/Application.java
similarity index 100%
rename from
saga-demo/booking/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/Application.java
rename to
saga-demo/saga-spring-cloud-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/Application.java
diff --git
a/saga-demo/booking/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBooking.java
b/saga-demo/saga-spring-cloud-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBooking.java
similarity index 100%
rename from
saga-demo/booking/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBooking.java
rename to
saga-demo/saga-spring-cloud-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBooking.java
diff --git
a/saga-demo/booking/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingController.java
b/saga-demo/saga-spring-cloud-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingController.java
similarity index 100%
rename from
saga-demo/booking/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingController.java
rename to
saga-demo/saga-spring-cloud-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingController.java
diff --git
a/saga-demo/booking/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingService.java
b/saga-demo/saga-spring-cloud-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingService.java
similarity index 100%
rename from
saga-demo/booking/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingService.java
rename to
saga-demo/saga-spring-cloud-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingService.java
diff --git a/saga-demo/booking/hotel/src/main/resources/application.yaml
b/saga-demo/saga-spring-cloud-demo/hotel/src/main/resources/application.yaml
similarity index 100%
rename from saga-demo/booking/hotel/src/main/resources/application.yaml
rename to
saga-demo/saga-spring-cloud-demo/hotel/src/main/resources/application.yaml
diff --git a/saga-demo/booking/booking/src/main/resources/log4j2.xml
b/saga-demo/saga-spring-cloud-demo/hotel/src/main/resources/log4j2.xml
similarity index 100%
rename from saga-demo/booking/booking/src/main/resources/log4j2.xml
rename to saga-demo/saga-spring-cloud-demo/hotel/src/main/resources/log4j2.xml
diff --git a/saga-demo/booking/pom.xml
b/saga-demo/saga-spring-cloud-demo/pom.xml
similarity index 100%
rename from saga-demo/booking/pom.xml
rename to saga-demo/saga-spring-cloud-demo/pom.xml
diff --git a/saga-demo/booking/saga-demo.sh
b/saga-demo/saga-spring-cloud-demo/saga-demo.sh
similarity index 100%
rename from saga-demo/booking/saga-demo.sh
rename to saga-demo/saga-spring-cloud-demo/saga-demo.sh
--
To stop receiving notification emails like this one, please contact
[email protected].
