You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@servicecomb.apache.org by "ASF GitHub Bot (JIRA)" <ji...@apache.org> on 2018/06/01 00:59:00 UTC

[jira] [Commented] (SCB-628) correct the naming of demos

    [ https://issues.apache.org/jira/browse/SCB-628?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16497421#comment-16497421 ] 

ASF GitHub Bot commented on SCB-628:
------------------------------------

WillemJiang closed pull request #197: SCB-628 correct naming for demos
URL: https://github.com/apache/incubator-servicecomb-saga/pull/197
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/README.md b/README.md
index 65cffa27..cc0ca130 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 8367c0cf..6319277d 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 572d949b..8572a0f7 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 0c77b000..30788d83 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/booking/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/booking/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/hotel/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/hotel/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


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


> correct the naming of demos
> ---------------------------
>
>                 Key: SCB-628
>                 URL: https://issues.apache.org/jira/browse/SCB-628
>             Project: Apache ServiceComb
>          Issue Type: Improvement
>          Components: Saga
>    Affects Versions: saga-0.2.0
>            Reporter: Eric Lee
>            Assignee: Eric Lee
>            Priority: Major
>             Fix For: saga-0.2.0
>
>
> As there is new dubbo-demo added, we need to update the demo directory and accept test directory rightly.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)