Merge 35074cb into 76cd97d

apache · Dec 17, 2018 · 7aaada1 · 7aaada1
2 parents 76cd97d + 35074cb
commit 7aaada1
Show file tree

Hide file tree

Showing 789 changed files with 1,234 additions and 20,447 deletions.
diff --git a/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml b/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml
@@ -21,11 +21,11 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>acceptance-tests</artifactId>
-    <groupId>org.apache.servicecomb.saga</groupId>
+    <groupId>org.apache.servicecomb.pack</groupId>
     <version>0.3.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <name>Saga:Acceptance Tests::Pack::Dubbo</name>
+  <name>Pack:Acceptance Tests::Dubbo</name>
   <artifactId>acceptance-pack-dubbo</artifactId>
 
   <dependencies>

diff --git a/...ceptance/dubbodemo/DubboDemoStepdefs.java → ...ceptance/dubbodemo/DubboDemoStepdefs.java b/...ceptance/dubbodemo/DubboDemoStepdefs.java → ...ceptance/dubbodemo/DubboDemoStepdefs.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.servicecomb.saga.acceptance.dubbodemo;
+package org.apache.servicecomb.pack.acceptance.dubbodemo;
 
 import static io.restassured.RestAssured.given;
 import static java.util.concurrent.TimeUnit.SECONDS;

diff --git a/...a/acceptance/dubbodemo/RunCucumberIT.java → ...k/acceptance/dubbodemo/RunCucumberIT.java b/...a/acceptance/dubbodemo/RunCucumberIT.java → ...k/acceptance/dubbodemo/RunCucumberIT.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.servicecomb.saga.acceptance.dubbodemo;
+package org.apache.servicecomb.pack.acceptance.dubbodemo;
 
 import org.junit.runner.RunWith;
 

diff --git a/acceptance-tests/acceptance-pack-spring-demo/pom.xml b/acceptance-tests/acceptance-pack-spring-demo/pom.xml
@@ -21,13 +21,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>acceptance-tests</artifactId>
-    <groupId>org.apache.servicecomb.saga</groupId>
+    <groupId>org.apache.servicecomb.pack</groupId>
     <version>0.3.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>acceptance-pack-spring</artifactId>
-  <name>Saga:Acceptance Tests::Pack::Spring</name>
+  <name>Pack:Acceptance Tests::Spring</name>
 
   <dependencies>
     <dependency>

diff --git a/...apache/servicecomb/saga/PackStepdefs.java → ...apache/servicecomb/pack/PackStepdefs.java b/...apache/servicecomb/saga/PackStepdefs.java → ...apache/servicecomb/pack/PackStepdefs.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.servicecomb.saga;
+package org.apache.servicecomb.pack;
 
 import static io.restassured.RestAssured.given;
 import static java.util.concurrent.TimeUnit.SECONDS;

diff --git a/...pache/servicecomb/saga/RunCucumberIT.java → ...pache/servicecomb/pack/RunCucumberIT.java b/...pache/servicecomb/saga/RunCucumberIT.java → ...pache/servicecomb/pack/RunCucumberIT.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.servicecomb.saga;
+package org.apache.servicecomb.pack;
 
 import org.junit.runner.RunWith;
 

diff --git a/acceptance-tests/acceptance-pack-spring-demo/src/test/resources/booking_exception.btm b/acceptance-tests/acceptance-pack-spring-demo/src/test/resources/booking_exception.btm
@@ -19,7 +19,7 @@
 ###############################################################
 
 RULE throw exception
-CLASS org.apache.servicecomb.saga.demo.pack.booking.BookingController
+CLASS org.apache.servicecomb.pack.demo.booking.BookingController
 METHOD postCarBooking
 AT ENTRY
 IF TRUE

diff --git a/acceptance-tests/acceptance-pack-spring-demo/src/test/resources/booking_timeout.btm b/acceptance-tests/acceptance-pack-spring-demo/src/test/resources/booking_timeout.btm
@@ -19,15 +19,15 @@
 ###############################################################
 
 RULE set the saga timeout to 5s
-INTERFACE org.apache.servicecomb.saga.omega.context.annotations.SagaStart
+INTERFACE org.apache.servicecomb.pack.omega.context.annotations.SagaStart
 METHOD timeout
 AT EXIT
 IF TRUE
 DO RETURN 5
 ENDRULE
 
 RULE sleep when postBooking until timeout happens
-CLASS org.apache.servicecomb.saga.demo.pack.booking.BookingController
+CLASS org.apache.servicecomb.pack.demo.booking.BookingController
 METHOD postBooking
 AT ENTRY
 IF TRUE

diff --git a/acceptance-tests/acceptance-pack-tcc-spring-demo/pom.xml b/acceptance-tests/acceptance-pack-tcc-spring-demo/pom.xml
@@ -21,13 +21,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>acceptance-tests</artifactId>
-    <groupId>org.apache.servicecomb.saga</groupId>
+    <groupId>org.apache.servicecomb.pack</groupId>
     <version>0.3.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>acceptance-pack-tcc-spring-demo</artifactId>
-  <name>Saga:Acceptance Tests::Pack::TCC::Spring</name>
+  <name>Pack:Acceptance Tests::TCC::Spring</name>
 
   <dependencies>
     <dependency>

diff --git a/...apache/servicecomb/saga/PackStepdefs.java → ...apache/servicecomb/pack/PackStepdefs.java b/...apache/servicecomb/saga/PackStepdefs.java → ...apache/servicecomb/pack/PackStepdefs.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.servicecomb.saga;
+package org.apache.servicecomb.pack;
 
 import static io.restassured.RestAssured.given;
 import static java.util.concurrent.TimeUnit.SECONDS;

diff --git a/...pache/servicecomb/saga/RunCucumberIT.java → ...pache/servicecomb/pack/RunCucumberIT.java b/...pache/servicecomb/saga/RunCucumberIT.java → ...pache/servicecomb/pack/RunCucumberIT.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.servicecomb.saga;
+package org.apache.servicecomb.pack;
 
 import org.junit.runner.RunWith;
 

diff --git a/acceptance-tests/pom.xml b/acceptance-tests/pom.xml
@@ -21,13 +21,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>saga</artifactId>
-    <groupId>org.apache.servicecomb.saga</groupId>
+    <groupId>org.apache.servicecomb.pack</groupId>
     <version>0.3.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>acceptance-tests</artifactId>
-  <name>Saga:Acceptance Tests</name>
+  <name>Pack:Acceptance Tests</name>
   <packaging>pom</packaging>
   <modules>
     <module>acceptance-pack-dubbo-demo</module>

diff --git a/alpha/README.md b/alpha/README.md
@@ -1,7 +1,7 @@
 # alpha-server
 
 The alpha-server works as the pack leader to keep the consistency of transactions.
-For more information, see [saga pack design](https://github.com/apache/servicecomb-saga/blob/master/docs/design.md)
+For more information, see [pack design](https://github.com/apache/servicecomb-pack/blob/master/docs/design.md)
 
 ## Build and Run
 

diff --git a/alpha/alpha-core/pom.xml b/alpha/alpha-core/pom.xml
@@ -21,17 +21,17 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>alpha</artifactId>
-    <groupId>org.apache.servicecomb.saga</groupId>
+    <groupId>org.apache.servicecomb.pack</groupId>
     <version>0.3.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>alpha-core</artifactId>
-  <name>Saga::Alpha::Core</name>
+  <name>Pack::Alpha::Core</name>
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.servicecomb.saga</groupId>
+      <groupId>org.apache.servicecomb.pack</groupId>
       <artifactId>pack-common</artifactId>
     </dependency>
     <dependency>

diff --git a/...ecomb/saga/alpha/core/AlphaException.java → ...ecomb/pack/alpha/core/AlphaException.java b/...ecomb/saga/alpha/core/AlphaException.java → ...ecomb/pack/alpha/core/AlphaException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.servicecomb.saga.alpha.core;
+package org.apache.servicecomb.pack.alpha.core;
 
 public class AlphaException extends RuntimeException {
   public AlphaException(String cause) {

diff --git a/.../servicecomb/saga/alpha/core/Command.java → .../servicecomb/pack/alpha/core/Command.java b/.../servicecomb/saga/alpha/core/Command.java → .../servicecomb/pack/alpha/core/Command.java
@@ -15,9 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.servicecomb.saga.alpha.core;
-
-import static org.apache.servicecomb.saga.alpha.core.TaskStatus.NEW;
+package org.apache.servicecomb.pack.alpha.core;
 
 import java.util.Date;
 
@@ -85,7 +83,7 @@ public Command(long id,
       String compensationMethod,
       byte[] payloads) {
 
-    this(id, serviceName, instanceId, globalTxId, localTxId, parentTxId, compensationMethod, payloads, NEW.name());
+    this(id, serviceName, instanceId, globalTxId, localTxId, parentTxId, compensationMethod, payloads, TaskStatus.NEW.name());
   }
 
   public Command(TxEvent event) {

diff --git a/...mb/saga/alpha/core/CommandRepository.java → ...mb/pack/alpha/core/CommandRepository.java b/...mb/saga/alpha/core/CommandRepository.java → ...mb/pack/alpha/core/CommandRepository.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.servicecomb.saga.alpha.core;
+package org.apache.servicecomb.pack.alpha.core;
 
 import java.util.List;
 

diff --git a/...ga/alpha/core/CompositeOmegaCallback.java → ...ck/alpha/core/CompositeOmegaCallback.java b/...ga/alpha/core/CompositeOmegaCallback.java → ...ck/alpha/core/CompositeOmegaCallback.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.servicecomb.saga.alpha.core;
+package org.apache.servicecomb.pack.alpha.core;
 
 import static java.util.Collections.emptyMap;
 

diff --git a/...icecomb/saga/alpha/core/EventScanner.java → ...icecomb/pack/alpha/core/EventScanner.java b/...icecomb/saga/alpha/core/EventScanner.java → ...icecomb/pack/alpha/core/EventScanner.java
@@ -15,14 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.servicecomb.saga.alpha.core;
+package org.apache.servicecomb.pack.alpha.core;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static org.apache.servicecomb.saga.alpha.core.TaskStatus.NEW;
-import static org.apache.servicecomb.saga.common.EventType.SagaEndedEvent;
-import static org.apache.servicecomb.saga.common.EventType.TxAbortedEvent;
-import static org.apache.servicecomb.saga.common.EventType.TxEndedEvent;
-import static org.apache.servicecomb.saga.common.EventType.TxStartedEvent;
+import static org.apache.servicecomb.pack.common.EventType.SagaEndedEvent;
+import static org.apache.servicecomb.pack.common.EventType.TxAbortedEvent;
+import static org.apache.servicecomb.pack.common.EventType.TxEndedEvent;
+import static org.apache.servicecomb.pack.common.EventType.TxStartedEvent;
 
 import java.lang.invoke.MethodHandles;
 import java.util.List;
@@ -235,6 +234,6 @@ private TxTimeout txTimeoutOf(TxEvent event) {
         event.parentTxId(),
         event.type(),
         event.expiryTime(),
-        NEW.name());
+        TaskStatus.NEW.name());
   }
 }
diff --git a/...cecomb/saga/alpha/core/OmegaCallback.java → ...cecomb/pack/alpha/core/OmegaCallback.java b/...cecomb/saga/alpha/core/OmegaCallback.java → ...cecomb/pack/alpha/core/OmegaCallback.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.servicecomb.saga.alpha.core;
+package org.apache.servicecomb.pack.alpha.core;
 
 public interface OmegaCallback {
   void compensate(TxEvent event);

diff --git a/...mb/saga/alpha/core/PendingTaskRunner.java → ...mb/pack/alpha/core/PendingTaskRunner.java b/...mb/saga/alpha/core/PendingTaskRunner.java → ...mb/pack/alpha/core/PendingTaskRunner.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.servicecomb.saga.alpha.core;
+package org.apache.servicecomb.pack.alpha.core;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 

diff --git a/...aga/alpha/core/PushBackOmegaCallback.java → ...ack/alpha/core/PushBackOmegaCallback.java b/...aga/alpha/core/PushBackOmegaCallback.java → ...ack/alpha/core/PushBackOmegaCallback.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.servicecomb.saga.alpha.core;
+package org.apache.servicecomb.pack.alpha.core;
 
 import java.lang.invoke.MethodHandles;
 import java.util.concurrent.BlockingQueue;

diff --git a/...rvicecomb/saga/alpha/core/TaskStatus.java → ...rvicecomb/pack/alpha/core/TaskStatus.java b/...rvicecomb/saga/alpha/core/TaskStatus.java → ...rvicecomb/pack/alpha/core/TaskStatus.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.servicecomb.saga.alpha.core;
+package org.apache.servicecomb.pack.alpha.core;
 
 public enum TaskStatus {
   NEW,

diff --git a/.../saga/alpha/core/TxConsistentService.java → .../pack/alpha/core/TxConsistentService.java b/.../saga/alpha/core/TxConsistentService.java → .../pack/alpha/core/TxConsistentService.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.servicecomb.saga.alpha.core;
+package org.apache.servicecomb.pack.alpha.core;
 
-import static org.apache.servicecomb.saga.common.EventType.SagaEndedEvent;
-import static org.apache.servicecomb.saga.common.EventType.TxAbortedEvent;
-import static org.apache.servicecomb.saga.common.EventType.TxStartedEvent;
+import static org.apache.servicecomb.pack.common.EventType.SagaEndedEvent;
+import static org.apache.servicecomb.pack.common.EventType.TxAbortedEvent;
+import static org.apache.servicecomb.pack.common.EventType.TxStartedEvent;
 
 import java.lang.invoke.MethodHandles;
 import java.util.Arrays;

diff --git a/.../servicecomb/saga/alpha/core/TxEvent.java → .../servicecomb/pack/alpha/core/TxEvent.java b/.../servicecomb/saga/alpha/core/TxEvent.java → .../servicecomb/pack/alpha/core/TxEvent.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.servicecomb.saga.alpha.core;
+package org.apache.servicecomb.pack.alpha.core;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 

diff --git a/...mb/saga/alpha/core/TxEventRepository.java → ...mb/pack/alpha/core/TxEventRepository.java b/...mb/saga/alpha/core/TxEventRepository.java → ...mb/pack/alpha/core/TxEventRepository.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.servicecomb.saga.alpha.core;
+package org.apache.servicecomb.pack.alpha.core;
 
 import java.util.List;
 import java.util.Optional;
-import org.apache.servicecomb.saga.common.EventType;
+import org.apache.servicecomb.pack.common.EventType;
 
 /**
  * Repository for {@link TxEvent}

diff --git a/...ervicecomb/saga/alpha/core/TxTimeout.java → ...ervicecomb/pack/alpha/core/TxTimeout.java b/...ervicecomb/saga/alpha/core/TxTimeout.java → ...ervicecomb/pack/alpha/core/TxTimeout.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.servicecomb.saga.alpha.core;
+package org.apache.servicecomb.pack.alpha.core;
 
 import java.util.Date;
 

diff --git a/.../saga/alpha/core/TxTimeoutRepository.java → .../pack/alpha/core/TxTimeoutRepository.java b/.../saga/alpha/core/TxTimeoutRepository.java → .../pack/alpha/core/TxTimeoutRepository.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.servicecomb.saga.alpha.core;
+package org.apache.servicecomb.pack.alpha.core;
 
 import java.util.List;