You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2018/06/26 01:47:24 UTC
[incubator-servicecomb-saga] branch master updated (b450957 ->
b9dc389)
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git.
from b450957 SCB-244 fix pr comment
new fcf7c78 SCB-244 Clean up the dependency versions
new 709c77f Rename the saga-spring-cloud-demo to saga-spring-demo
new b9dc389 SCB-244 Polish the log of SagaConsumerHandler and SagaProviderHandler.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../saga/omega/transport/servicecomb/SagaConsumerHandler.java | 4 ++--
.../saga/omega/transport/servicecomb/SagaProviderHandler.java | 4 ++--
pom.xml | 7 +++----
saga-demo/pom.xml | 2 +-
saga-demo/saga-servicecomb-demo/pom.xml | 4 ++--
saga-demo/{saga-spring-cloud-demo => saga-spring-demo}/README.md | 0
.../{saga-spring-cloud-demo => saga-spring-demo}/booking/pom.xml | 4 ++--
.../org/apache/servicecomb/saga/demo/pack/booking/Application.java | 0
.../servicecomb/saga/demo/pack/booking/BookingController.java | 0
.../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/{saga-spring-cloud-demo => saga-spring-demo}/car/pom.xml | 4 ++--
.../org/apache/servicecomb/saga/demo/pack/car/Application.java | 0
.../java/org/apache/servicecomb/saga/demo/pack/car/CarBooking.java | 0
.../servicecomb/saga/demo/pack/car/CarBookingController.java | 0
.../apache/servicecomb/saga/demo/pack/car/CarBookingService.java | 0
.../car/src/main/resources/application.yaml | 0
.../car/src/main/resources/log4j2.xml | 0
.../docker-compose-alpha.yaml | 0
.../docker-compose-demo.yaml | 0
.../docker-compose.mysql.yaml | 0
.../docker-compose.yaml | 0
.../{saga-spring-cloud-demo => saga-spring-demo}/hotel/pom.xml | 4 ++--
.../org/apache/servicecomb/saga/demo/pack/hotel/Application.java | 0
.../org/apache/servicecomb/saga/demo/pack/hotel/HotelBooking.java | 0
.../servicecomb/saga/demo/pack/hotel/HotelBookingController.java | 0
.../servicecomb/saga/demo/pack/hotel/HotelBookingService.java | 0
.../hotel/src/main/resources/application.yaml | 0
.../hotel}/src/main/resources/log4j2.xml | 0
saga-demo/{saga-spring-cloud-demo => saga-spring-demo}/pom.xml | 4 ++--
.../{saga-spring-cloud-demo => saga-spring-demo}/saga-demo.sh | 0
33 files changed, 18 insertions(+), 19 deletions(-)
rename saga-demo/{saga-spring-cloud-demo => saga-spring-demo}/README.md (100%)
rename saga-demo/{saga-spring-cloud-demo => saga-spring-demo}/booking/pom.xml (96%)
rename saga-demo/{saga-spring-cloud-demo => saga-spring-demo}/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/Application.java (100%)
rename saga-demo/{saga-spring-cloud-demo => saga-spring-demo}/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/BookingController.java (100%)
rename saga-demo/{saga-spring-cloud-demo => saga-spring-demo}/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/MyConfiguration.java (100%)
rename saga-demo/{saga-spring-cloud-demo => saga-spring-demo}/booking/src/main/resources/application.yaml (100%)
rename saga-demo/{saga-spring-cloud-demo/hotel => saga-spring-demo/booking}/src/main/resources/log4j2.xml (100%)
rename saga-demo/{saga-spring-cloud-demo => saga-spring-demo}/booking/src/main/resources/static/index.html (100%)
rename saga-demo/{saga-spring-cloud-demo => saga-spring-demo}/car/pom.xml (96%)
rename saga-demo/{saga-spring-cloud-demo => saga-spring-demo}/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/Application.java (100%)
rename saga-demo/{saga-spring-cloud-demo => saga-spring-demo}/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBooking.java (100%)
rename saga-demo/{saga-spring-cloud-demo => saga-spring-demo}/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingController.java (100%)
rename saga-demo/{saga-spring-cloud-demo => saga-spring-demo}/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingService.java (100%)
rename saga-demo/{saga-spring-cloud-demo => saga-spring-demo}/car/src/main/resources/application.yaml (100%)
rename saga-demo/{saga-spring-cloud-demo => saga-spring-demo}/car/src/main/resources/log4j2.xml (100%)
rename saga-demo/{saga-spring-cloud-demo => saga-spring-demo}/docker-compose-alpha.yaml (100%)
rename saga-demo/{saga-spring-cloud-demo => saga-spring-demo}/docker-compose-demo.yaml (100%)
rename saga-demo/{saga-spring-cloud-demo => saga-spring-demo}/docker-compose.mysql.yaml (100%)
rename saga-demo/{saga-spring-cloud-demo => saga-spring-demo}/docker-compose.yaml (100%)
rename saga-demo/{saga-spring-cloud-demo => saga-spring-demo}/hotel/pom.xml (96%)
rename saga-demo/{saga-spring-cloud-demo => saga-spring-demo}/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/Application.java (100%)
rename saga-demo/{saga-spring-cloud-demo => saga-spring-demo}/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBooking.java (100%)
rename saga-demo/{saga-spring-cloud-demo => saga-spring-demo}/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingController.java (100%)
rename saga-demo/{saga-spring-cloud-demo => saga-spring-demo}/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingService.java (100%)
rename saga-demo/{saga-spring-cloud-demo => saga-spring-demo}/hotel/src/main/resources/application.yaml (100%)
rename saga-demo/{saga-spring-cloud-demo/booking => saga-spring-demo/hotel}/src/main/resources/log4j2.xml (100%)
rename saga-demo/{saga-spring-cloud-demo => saga-spring-demo}/pom.xml (94%)
rename saga-demo/{saga-spring-cloud-demo => saga-spring-demo}/saga-demo.sh (100%)
[incubator-servicecomb-saga] 01/03: SCB-244 Clean up the dependency
versions
Posted by ni...@apache.org.
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
commit fcf7c788ece273fd1941a92297765752fbb5ec9e
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Tue Jun 26 09:28:51 2018 +0800
SCB-244 Clean up the dependency versions
---
pom.xml | 7 +++----
saga-demo/saga-servicecomb-demo/pom.xml | 4 ++--
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4e11d2d..8f91a95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,8 +49,7 @@
<dubbo.version>2.6.1</dubbo.version>
<spring.boot.version>1.5.13.RELEASE</spring.boot.version>
<spring.boot2.version>2.0.2.RELEASE</spring.boot2.version>
- <spring.cloud.version>Camden.SR6</spring.cloud.version>
- <java.chassis.version>1.0.0-m1</java.chassis.version>
+ <java.chassis.version>1.0.0-m2</java.chassis.version>
<spring.version>4.3.7.RELEASE</spring.version>
<akka.version>2.5.6</akka.version>
<rat.version>0.12</rat.version>
@@ -64,7 +63,7 @@
<jaxb.version>2.3.0</jaxb.version>
<javax.activation.version>1.1.1</javax.activation.version>
<maven-dependency-plugin.version>3.0.2</maven-dependency-plugin.version>
- <netty.version>2.0.7.Final</netty.version>
+ <netty.boringssl.version>2.0.7.Final</netty.boringssl.version>
<java-chassis.version>1.0.0-m2</java-chassis.version>
</properties>
@@ -321,7 +320,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
- <version>${netty.version}</version>
+ <version>${netty.boringssl.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
diff --git a/saga-demo/saga-servicecomb-demo/pom.xml b/saga-demo/saga-servicecomb-demo/pom.xml
index 6dec185..7f5f9d8 100644
--- a/saga-demo/saga-servicecomb-demo/pom.xml
+++ b/saga-demo/saga-servicecomb-demo/pom.xml
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.servicecomb</groupId>
<artifactId>java-chassis-dependencies</artifactId>
- <version>${java-chassis.version}</version>
+ <version>${java.chassis.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -141,4 +141,4 @@
</build>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
[incubator-servicecomb-saga] 03/03: SCB-244 Polish the log of
SagaConsumerHandler and SagaProviderHandler.
Posted by ni...@apache.org.
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
commit b9dc389ae9718e953fe5beccc99c0f0cab35770d
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Tue Jun 26 09:47:05 2018 +0800
SCB-244 Polish the log of SagaConsumerHandler and SagaProviderHandler.
---
.../saga/omega/transport/servicecomb/SagaConsumerHandler.java | 4 ++--
.../saga/omega/transport/servicecomb/SagaProviderHandler.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/saga/omega/transport/servicecomb/SagaConsumerHandler.java b/omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/saga/omega/transport/servicecomb/SagaConsumerHandler.java
index 78a1045..2269853 100644
--- a/omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/saga/omega/transport/servicecomb/SagaConsumerHandler.java
+++ b/omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/saga/omega/transport/servicecomb/SagaConsumerHandler.java
@@ -41,7 +41,7 @@ public class SagaConsumerHandler implements Handler {
try {
context = BeanUtils.getBean("omegaContext");
} catch (NullPointerException npe) {
- LOG.warn("SagaConsumerHandler is not disabled, it's just cannot inject transaction ID.");
+ LOG.warn("SagaConsumerHandler cannot work rightly, please make sure omegaContext is in the spring application context.");
}
this.omegaContext = context;
}
@@ -62,7 +62,7 @@ public class SagaConsumerHandler implements Handler {
LOCAL_TX_ID_KEY,
omegaContext.localTxId());
} else {
- LOG.info("SagaConsumerHandler is not disabled, it's just cannot inject transaction ID.");
+ LOG.info("Cannot inject transaction ID, as the OmegaContext is null or cannot get the globalTxId.");
}
invocation.next(asyncResponse);
diff --git a/omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/saga/omega/transport/servicecomb/SagaProviderHandler.java b/omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/saga/omega/transport/servicecomb/SagaProviderHandler.java
index 2dfcab5..8dbeb54 100644
--- a/omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/saga/omega/transport/servicecomb/SagaProviderHandler.java
+++ b/omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/saga/omega/transport/servicecomb/SagaProviderHandler.java
@@ -41,7 +41,7 @@ public class SagaProviderHandler implements Handler {
try {
context = BeanUtils.getBean("omegaContext");
} catch (NullPointerException npe) {
- LOG.warn("SagaProviderHandler is not disabled, it's just cannot inject transaction ID.");
+ LOG.warn("SagaProviderHandler cannot work rightly, please make sure omegaContext is in the spring application context.\"");
}
this.omegaContext = context;
}
@@ -62,7 +62,7 @@ public class SagaProviderHandler implements Handler {
omegaContext.setLocalTxId(invocation.getContext().get(LOCAL_TX_ID_KEY));
}
} else {
- LOG.info("SagaProviderHandler is not disabled, it's just cannot inject transaction ID.");
+ LOG.info("Cannot inject transaction ID, as the OmegaContext is null or cannot get the globalTxId.");
}
invocation.next(asyncResponse);
[incubator-servicecomb-saga] 02/03: Rename the
saga-spring-cloud-demo to saga-spring-demo
Posted by ni...@apache.org.
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
commit 709c77f16f338882ae552032ed405f7b0f9aa13e
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Tue Jun 26 09:34:46 2018 +0800
Rename the saga-spring-cloud-demo to saga-spring-demo
---
saga-demo/pom.xml | 2 +-
saga-demo/{saga-spring-cloud-demo => saga-spring-demo}/README.md | 0
.../{saga-spring-cloud-demo => saga-spring-demo}/booking/pom.xml | 4 ++--
.../org/apache/servicecomb/saga/demo/pack/booking/Application.java | 0
.../apache/servicecomb/saga/demo/pack/booking/BookingController.java | 0
.../apache/servicecomb/saga/demo/pack/booking/MyConfiguration.java | 0
.../booking/src/main/resources/application.yaml | 0
.../hotel => saga-spring-demo/booking}/src/main/resources/log4j2.xml | 0
.../booking/src/main/resources/static/index.html | 0
saga-demo/{saga-spring-cloud-demo => saga-spring-demo}/car/pom.xml | 4 ++--
.../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
.../docker-compose-alpha.yaml | 0
.../docker-compose-demo.yaml | 0
.../docker-compose.mysql.yaml | 0
.../{saga-spring-cloud-demo => saga-spring-demo}/docker-compose.yaml | 0
saga-demo/{saga-spring-cloud-demo => saga-spring-demo}/hotel/pom.xml | 4 ++--
.../java/org/apache/servicecomb/saga/demo/pack/hotel/Application.java | 0
.../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
.../booking => saga-spring-demo/hotel}/src/main/resources/log4j2.xml | 0
saga-demo/{saga-spring-cloud-demo => saga-spring-demo}/pom.xml | 4 ++--
saga-demo/{saga-spring-cloud-demo => saga-spring-demo}/saga-demo.sh | 0
29 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/saga-demo/pom.xml b/saga-demo/pom.xml
index e321a16..2778ea2 100644
--- a/saga-demo/pom.xml
+++ b/saga-demo/pom.xml
@@ -31,7 +31,7 @@
<packaging>pom</packaging>
<modules>
<module>saga-dubbo-demo</module>
- <module>saga-spring-cloud-demo</module>
+ <module>saga-spring-demo</module>
<module>saga-servicecomb-demo</module>
</modules>
diff --git a/saga-demo/saga-spring-cloud-demo/README.md b/saga-demo/saga-spring-demo/README.md
similarity index 100%
rename from saga-demo/saga-spring-cloud-demo/README.md
rename to saga-demo/saga-spring-demo/README.md
diff --git a/saga-demo/saga-spring-cloud-demo/booking/pom.xml b/saga-demo/saga-spring-demo/booking/pom.xml
similarity index 96%
rename from saga-demo/saga-spring-cloud-demo/booking/pom.xml
rename to saga-demo/saga-spring-demo/booking/pom.xml
index 0f0275a..b1d77c8 100644
--- a/saga-demo/saga-spring-cloud-demo/booking/pom.xml
+++ b/saga-demo/saga-spring-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>saga-spring-cloud-demo</artifactId>
+ <artifactId>saga-spring-demo</artifactId>
<groupId>org.apache.servicecomb.saga.demo</groupId>
<version>0.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>booking</artifactId>
- <name>Saga::Demo::Spring-Cloud-Demo::Booking</name>
+ <name>Saga::Demo::Spring-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/Application.java b/saga-demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/Application.java
similarity index 100%
rename from saga-demo/saga-spring-cloud-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/Application.java
rename to saga-demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/Application.java
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-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/BookingController.java
similarity index 100%
rename from saga-demo/saga-spring-cloud-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/BookingController.java
rename to saga-demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/BookingController.java
diff --git a/saga-demo/saga-spring-cloud-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/MyConfiguration.java b/saga-demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/MyConfiguration.java
similarity index 100%
rename from saga-demo/saga-spring-cloud-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/MyConfiguration.java
rename to saga-demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/MyConfiguration.java
diff --git a/saga-demo/saga-spring-cloud-demo/booking/src/main/resources/application.yaml b/saga-demo/saga-spring-demo/booking/src/main/resources/application.yaml
similarity index 100%
rename from saga-demo/saga-spring-cloud-demo/booking/src/main/resources/application.yaml
rename to saga-demo/saga-spring-demo/booking/src/main/resources/application.yaml
diff --git a/saga-demo/saga-spring-cloud-demo/hotel/src/main/resources/log4j2.xml b/saga-demo/saga-spring-demo/booking/src/main/resources/log4j2.xml
similarity index 100%
rename from saga-demo/saga-spring-cloud-demo/hotel/src/main/resources/log4j2.xml
rename to saga-demo/saga-spring-demo/booking/src/main/resources/log4j2.xml
diff --git a/saga-demo/saga-spring-cloud-demo/booking/src/main/resources/static/index.html b/saga-demo/saga-spring-demo/booking/src/main/resources/static/index.html
similarity index 100%
rename from saga-demo/saga-spring-cloud-demo/booking/src/main/resources/static/index.html
rename to saga-demo/saga-spring-demo/booking/src/main/resources/static/index.html
diff --git a/saga-demo/saga-spring-cloud-demo/car/pom.xml b/saga-demo/saga-spring-demo/car/pom.xml
similarity index 96%
rename from saga-demo/saga-spring-cloud-demo/car/pom.xml
rename to saga-demo/saga-spring-demo/car/pom.xml
index 389da02..169c13e 100644
--- a/saga-demo/saga-spring-cloud-demo/car/pom.xml
+++ b/saga-demo/saga-spring-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>saga-spring-cloud-demo</artifactId>
+ <artifactId>saga-spring-demo</artifactId>
<groupId>org.apache.servicecomb.saga.demo</groupId>
<version>0.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>car</artifactId>
- <name>Saga::Demo::Spring-Cloud-Demo::Car</name>
+ <name>Saga::Demo::Spring-Demo::Car</name>
<dependencies>
<dependency>
diff --git a/saga-demo/saga-spring-cloud-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/Application.java b/saga-demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/Application.java
similarity index 100%
rename from saga-demo/saga-spring-cloud-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/Application.java
rename to saga-demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/Application.java
diff --git a/saga-demo/saga-spring-cloud-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBooking.java b/saga-demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBooking.java
similarity index 100%
rename from saga-demo/saga-spring-cloud-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBooking.java
rename to saga-demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBooking.java
diff --git a/saga-demo/saga-spring-cloud-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingController.java b/saga-demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingController.java
similarity index 100%
rename from saga-demo/saga-spring-cloud-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingController.java
rename to saga-demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingController.java
diff --git a/saga-demo/saga-spring-cloud-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingService.java b/saga-demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingService.java
similarity index 100%
rename from saga-demo/saga-spring-cloud-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingService.java
rename to saga-demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingService.java
diff --git a/saga-demo/saga-spring-cloud-demo/car/src/main/resources/application.yaml b/saga-demo/saga-spring-demo/car/src/main/resources/application.yaml
similarity index 100%
rename from saga-demo/saga-spring-cloud-demo/car/src/main/resources/application.yaml
rename to saga-demo/saga-spring-demo/car/src/main/resources/application.yaml
diff --git a/saga-demo/saga-spring-cloud-demo/car/src/main/resources/log4j2.xml b/saga-demo/saga-spring-demo/car/src/main/resources/log4j2.xml
similarity index 100%
rename from saga-demo/saga-spring-cloud-demo/car/src/main/resources/log4j2.xml
rename to saga-demo/saga-spring-demo/car/src/main/resources/log4j2.xml
diff --git a/saga-demo/saga-spring-cloud-demo/docker-compose-alpha.yaml b/saga-demo/saga-spring-demo/docker-compose-alpha.yaml
similarity index 100%
rename from saga-demo/saga-spring-cloud-demo/docker-compose-alpha.yaml
rename to saga-demo/saga-spring-demo/docker-compose-alpha.yaml
diff --git a/saga-demo/saga-spring-cloud-demo/docker-compose-demo.yaml b/saga-demo/saga-spring-demo/docker-compose-demo.yaml
similarity index 100%
rename from saga-demo/saga-spring-cloud-demo/docker-compose-demo.yaml
rename to saga-demo/saga-spring-demo/docker-compose-demo.yaml
diff --git a/saga-demo/saga-spring-cloud-demo/docker-compose.mysql.yaml b/saga-demo/saga-spring-demo/docker-compose.mysql.yaml
similarity index 100%
rename from saga-demo/saga-spring-cloud-demo/docker-compose.mysql.yaml
rename to saga-demo/saga-spring-demo/docker-compose.mysql.yaml
diff --git a/saga-demo/saga-spring-cloud-demo/docker-compose.yaml b/saga-demo/saga-spring-demo/docker-compose.yaml
similarity index 100%
rename from saga-demo/saga-spring-cloud-demo/docker-compose.yaml
rename to saga-demo/saga-spring-demo/docker-compose.yaml
diff --git a/saga-demo/saga-spring-cloud-demo/hotel/pom.xml b/saga-demo/saga-spring-demo/hotel/pom.xml
similarity index 96%
rename from saga-demo/saga-spring-cloud-demo/hotel/pom.xml
rename to saga-demo/saga-spring-demo/hotel/pom.xml
index a4ba965..57c8557 100644
--- a/saga-demo/saga-spring-cloud-demo/hotel/pom.xml
+++ b/saga-demo/saga-spring-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>saga-spring-cloud-demo</artifactId>
+ <artifactId>saga-spring-demo</artifactId>
<groupId>org.apache.servicecomb.saga.demo</groupId>
<version>0.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>hotel</artifactId>
- <name>Saga::Demo::Spring-Cloud-Demo::Hotel</name>
+ <name>Saga::Demo::Spring-Demo::Hotel</name>
<dependencies>
<dependency>
diff --git a/saga-demo/saga-spring-cloud-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/Application.java b/saga-demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/Application.java
similarity index 100%
rename from saga-demo/saga-spring-cloud-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/Application.java
rename to saga-demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/Application.java
diff --git a/saga-demo/saga-spring-cloud-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBooking.java b/saga-demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBooking.java
similarity index 100%
rename from saga-demo/saga-spring-cloud-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBooking.java
rename to saga-demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBooking.java
diff --git a/saga-demo/saga-spring-cloud-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingController.java b/saga-demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingController.java
similarity index 100%
rename from saga-demo/saga-spring-cloud-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingController.java
rename to saga-demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingController.java
diff --git a/saga-demo/saga-spring-cloud-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingService.java b/saga-demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingService.java
similarity index 100%
rename from saga-demo/saga-spring-cloud-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingService.java
rename to saga-demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingService.java
diff --git a/saga-demo/saga-spring-cloud-demo/hotel/src/main/resources/application.yaml b/saga-demo/saga-spring-demo/hotel/src/main/resources/application.yaml
similarity index 100%
rename from saga-demo/saga-spring-cloud-demo/hotel/src/main/resources/application.yaml
rename to saga-demo/saga-spring-demo/hotel/src/main/resources/application.yaml
diff --git a/saga-demo/saga-spring-cloud-demo/booking/src/main/resources/log4j2.xml b/saga-demo/saga-spring-demo/hotel/src/main/resources/log4j2.xml
similarity index 100%
rename from saga-demo/saga-spring-cloud-demo/booking/src/main/resources/log4j2.xml
rename to saga-demo/saga-spring-demo/hotel/src/main/resources/log4j2.xml
diff --git a/saga-demo/saga-spring-cloud-demo/pom.xml b/saga-demo/saga-spring-demo/pom.xml
similarity index 94%
rename from saga-demo/saga-spring-cloud-demo/pom.xml
rename to saga-demo/saga-spring-demo/pom.xml
index 8412ecc..63aff40 100644
--- a/saga-demo/saga-spring-cloud-demo/pom.xml
+++ b/saga-demo/saga-spring-demo/pom.xml
@@ -24,8 +24,8 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>saga-spring-cloud-demo</artifactId>
- <name>Saga::Demo::Spring-Cloud-Demo</name>
+ <artifactId>saga-spring-demo</artifactId>
+ <name>Saga::Demo::Spring-Demo</name>
<packaging>pom</packaging>
<modules>
diff --git a/saga-demo/saga-spring-cloud-demo/saga-demo.sh b/saga-demo/saga-spring-demo/saga-demo.sh
similarity index 100%
rename from saga-demo/saga-spring-cloud-demo/saga-demo.sh
rename to saga-demo/saga-spring-demo/saga-demo.sh