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/12/17 12:14:34 UTC
[servicecomb-pack] branch master updated (76cd97d -> a89c7cd)
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/servicecomb-pack.git.
from 76cd97d SCB-1081 clean up the code format
new 865a134 SCB-976 removed the saga-core related modules
new 0049603 SCB-976 Updated the pom file for removing modules
new 8f130c2 SCB-976 Updated the group id to org.apache.servicecomb.pack
new be1eb1c SCB-976 Removed the Saga related name from poms and directories
new fbae40c SCB-976 Update the maven group to org.apache.servicecomb.pack in the demo module
new 0a0c782 SCB-976 Renamed the package name in the pack-common
new 7a68081 SCB-976 Renamed the grpc package name
new 00cb370 SCB-976 Renamed the package name of omega modules
new a54af97 SCB-976 Updated the package name in alpha server
new cfeb5e0 SCB-976 Rename the package name of integration tests and accept tests
new b56f7e0 SCB-976 Updated the package names of demo
new 04e1e65 SCB-976 Tried to fix the travis build
new a89c7cd SCB-976 Renamed the package name of tcc-spring-demo
The 13 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:
.../acceptance-pack-dubbo-demo/pom.xml | 4 +-
.../acceptance/dubbodemo/DubboDemoStepdefs.java | 175 +++++
.../pack/acceptance/dubbodemo/RunCucumberIT.java | 29 +
.../acceptance/dubbodemo/DubboDemoStepdefs.java | 175 -----
.../saga/acceptance/dubbodemo/RunCucumberIT.java | 29 -
.../acceptance-pack-spring-demo/pom.xml | 4 +-
.../org/apache/servicecomb/pack/PackStepdefs.java | 211 ++++++
.../org/apache/servicecomb/pack/RunCucumberIT.java | 29 +
.../org/apache/servicecomb/saga/PackStepdefs.java | 211 ------
.../org/apache/servicecomb/saga/RunCucumberIT.java | 29 -
.../src/test/resources/booking_exception.btm | 2 +-
.../src/test/resources/booking_timeout.btm | 4 +-
.../acceptance-pack-tcc-spring-demo/pom.xml | 4 +-
.../org/apache/servicecomb/pack/PackStepdefs.java | 189 ++++++
.../org/apache/servicecomb/pack/RunCucumberIT.java | 29 +
.../org/apache/servicecomb/saga/PackStepdefs.java | 189 ------
.../org/apache/servicecomb/saga/RunCucumberIT.java | 29 -
acceptance-tests/pom.xml | 4 +-
alpha/README.md | 2 +-
alpha/alpha-core/pom.xml | 6 +-
.../pack/alpha/core/AlphaException.java | 24 +
.../servicecomb/pack/alpha/core/Command.java | 148 +++++
.../pack/alpha/core/CommandRepository.java | 31 +
.../pack/alpha/core/CompositeOmegaCallback.java | 62 ++
.../servicecomb/pack/alpha/core/EventScanner.java | 239 +++++++
.../servicecomb/pack/alpha/core/OmegaCallback.java | 25 +
.../pack/alpha/core/PendingTaskRunner.java | 45 ++
.../pack/alpha/core/PushBackOmegaCallback.java | 58 ++
.../servicecomb/pack/alpha/core/TaskStatus.java | 24 +
.../pack/alpha/core/TxConsistentService.java | 62 ++
.../servicecomb/pack/alpha/core/TxEvent.java | 237 +++++++
.../pack/alpha/core/TxEventRepository.java | 121 ++++
.../servicecomb/pack/alpha/core/TxTimeout.java | 111 ++++
.../pack/alpha/core/TxTimeoutRepository.java | 28 +
.../saga/alpha/core/AlphaException.java | 24 -
.../servicecomb/saga/alpha/core/Command.java | 150 -----
.../saga/alpha/core/CommandRepository.java | 31 -
.../saga/alpha/core/CompositeOmegaCallback.java | 62 --
.../servicecomb/saga/alpha/core/EventScanner.java | 240 -------
.../servicecomb/saga/alpha/core/OmegaCallback.java | 25 -
.../saga/alpha/core/PendingTaskRunner.java | 45 --
.../saga/alpha/core/PushBackOmegaCallback.java | 58 --
.../servicecomb/saga/alpha/core/TaskStatus.java | 24 -
.../saga/alpha/core/TxConsistentService.java | 62 --
.../servicecomb/saga/alpha/core/TxEvent.java | 237 -------
.../saga/alpha/core/TxEventRepository.java | 121 ----
.../servicecomb/saga/alpha/core/TxTimeout.java | 111 ----
.../saga/alpha/core/TxTimeoutRepository.java | 28 -
.../alpha/core/CompositeOmegaCallbackTest.java | 170 +++++
.../pack/alpha/core/PendingTaskRunnerTest.java | 60 ++
.../pack/alpha/core/PushBackOmegaCallbackTest.java | 65 ++
.../pack/alpha/core/TxConsistentServiceTest.java | 163 +++++
.../servicecomb/pack/alpha/core/TxEventMaker.java | 37 ++
.../alpha/core/CompositeOmegaCallbackTest.java | 169 -----
.../saga/alpha/core/PendingTaskRunnerTest.java | 60 --
.../saga/alpha/core/PushBackOmegaCallbackTest.java | 65 --
.../saga/alpha/core/TxConsistentServiceTest.java | 163 -----
.../servicecomb/saga/alpha/core/TxEventMaker.java | 37 --
alpha/alpha-server/pom.xml | 14 +-
.../pack/alpha/server/AlphaApplication.java | 37 ++
.../servicecomb/pack/alpha/server/AlphaConfig.java | 155 +++++
.../pack/alpha/server/AlphaEventController.java | 81 +++
.../pack/alpha/server/CommandEntityRepository.java | 71 ++
.../pack/alpha/server/GrpcOmegaCallback.java | 55 ++
.../pack/alpha/server/GrpcServerConfig.java | 75 +++
.../pack/alpha/server/GrpcStartable.java | 115 ++++
.../pack/alpha/server/GrpcTxEventEndpointImpl.java | 102 +++
.../pack/alpha/server/ServerStartable.java | 25 +
.../pack/alpha/server/SpringCommandRepository.java | 103 +++
.../pack/alpha/server/SpringTxEventRepository.java | 88 +++
.../alpha/server/SpringTxTimeoutRepository.java | 71 ++
.../alpha/server/TxEventEnvelopeRepository.java | 266 ++++++++
.../alpha/server/TxTimeoutEntityRepository.java | 64 ++
.../console/saga/SagaTransactionsController.java | 255 +++++++
.../alpha/server/console/saga/model/Stats.java | 108 +++
.../alpha/server/tcc/AlphaTccEventController.java | 80 +++
.../pack/alpha/server/tcc/GrpcTccEventService.java | 103 +++
.../alpha/server/tcc/callback/CallbackEngine.java | 25 +
.../server/tcc/callback/GrpcOmegaTccCallback.java | 53 ++
.../alpha/server/tcc/callback/OmegaCallback.java | 29 +
.../server/tcc/callback/OmegaCallbackWrapper.java | 55 ++
.../tcc/callback/OmegaCallbacksRegistry.java | 99 +++
.../server/tcc/callback/TccCallbackEngine.java | 68 ++
.../server/tcc/callback/TccPendingTaskRunner.java | 63 ++
.../pack/alpha/server/tcc/jpa/EventConverter.java | 160 +++++
.../pack/alpha/server/tcc/jpa/GlobalTxEvent.java | 139 ++++
.../server/tcc/jpa/GlobalTxEventRepository.java | 50 ++
.../alpha/server/tcc/jpa/ParticipatedEvent.java | 153 +++++
.../tcc/jpa/ParticipatedEventRepository.java | 32 +
.../pack/alpha/server/tcc/jpa/TccTxEvent.java | 170 +++++
.../server/tcc/jpa/TccTxEventDBRepository.java | 36 +
.../pack/alpha/server/tcc/jpa/TccTxType.java | 26 +
.../tcc/service/MemoryTxEventRepository.java | 136 ++++
.../server/tcc/service/RDBTxEventRepository.java | 123 ++++
.../alpha/server/tcc/service/TccEventScanner.java | 58 ++
.../server/tcc/service/TccTxEventRepository.java | 56 ++
.../server/tcc/service/TccTxEventService.java | 133 ++++
.../saga/alpha/server/AlphaApplication.java | 37 --
.../servicecomb/saga/alpha/server/AlphaConfig.java | 155 -----
.../saga/alpha/server/AlphaEventController.java | 81 ---
.../saga/alpha/server/CommandEntityRepository.java | 71 --
.../saga/alpha/server/GrpcOmegaCallback.java | 55 --
.../saga/alpha/server/GrpcServerConfig.java | 75 ---
.../saga/alpha/server/GrpcStartable.java | 115 ----
.../saga/alpha/server/GrpcTxEventEndpointImpl.java | 102 ---
.../saga/alpha/server/ServerStartable.java | 25 -
.../saga/alpha/server/SpringCommandRepository.java | 103 ---
.../saga/alpha/server/SpringTxEventRepository.java | 88 ---
.../alpha/server/SpringTxTimeoutRepository.java | 71 --
.../alpha/server/TxEventEnvelopeRepository.java | 266 --------
.../alpha/server/TxTimeoutEntityRepository.java | 64 --
.../console/saga/SagaTransactionsController.java | 255 -------
.../alpha/server/console/saga/model/Stats.java | 108 ---
.../alpha/server/tcc/AlphaTccEventController.java | 81 ---
.../saga/alpha/server/tcc/GrpcTccEventService.java | 103 ---
.../alpha/server/tcc/callback/CallbackEngine.java | 25 -
.../server/tcc/callback/GrpcOmegaTccCallback.java | 52 --
.../alpha/server/tcc/callback/OmegaCallback.java | 29 -
.../server/tcc/callback/OmegaCallbackWrapper.java | 54 --
.../tcc/callback/OmegaCallbacksRegistry.java | 101 ---
.../server/tcc/callback/TccCallbackEngine.java | 67 --
.../server/tcc/callback/TccPendingTaskRunner.java | 63 --
.../saga/alpha/server/tcc/jpa/EventConverter.java | 160 -----
.../saga/alpha/server/tcc/jpa/GlobalTxEvent.java | 139 ----
.../server/tcc/jpa/GlobalTxEventRepository.java | 50 --
.../alpha/server/tcc/jpa/ParticipatedEvent.java | 153 -----
.../tcc/jpa/ParticipatedEventRepository.java | 32 -
.../saga/alpha/server/tcc/jpa/TccTxEvent.java | 170 -----
.../server/tcc/jpa/TccTxEventDBRepository.java | 37 --
.../saga/alpha/server/tcc/jpa/TccTxType.java | 26 -
.../tcc/service/MemoryTxEventRepository.java | 135 ----
.../server/tcc/service/RDBTxEventRepository.java | 122 ----
.../alpha/server/tcc/service/TccEventScanner.java | 58 --
.../server/tcc/service/TccTxEventRepository.java | 55 --
.../server/tcc/service/TccTxEventService.java | 132 ----
.../src/main/resources/META-INF/aop.xml | 2 +-
.../alpha/server/AlphaEventControllerTest.java | 80 +++
.../pack/alpha/server/AlphaIntegrationTest.java | 606 +++++++++++++++++
.../alpha/server/AlphaIntegrationWithSSLTest.java | 73 ++
.../saga/SagaTransactionsControllerTest.java | 198 ++++++
.../server/tcc/AlphaTccEventControllerTest.java | 85 +++
.../alpha/server/tcc/AlphaTccServerTestBase.java | 307 +++++++++
.../alpha/server/tcc/MemoryAlphaTccServerTest.java | 40 ++
.../alpha/server/tcc/RdbAlphaTccServerTest.java | 38 ++
.../pack/alpha/server/tcc/TccApplication.java | 31 +
.../alpha/server/tcc/TccCallbackEngineTest.java | 149 +++++
.../pack/alpha/server/tcc/TccConfiguration.java | 69 ++
.../tcc/TccCoordinateCommandStreamObserver.java | 56 ++
.../alpha/server/tcc/jpa/EventConverterTest.java | 37 ++
.../tcc/service/MemoryEventRegistryTest.java | 115 ++++
.../server/tcc/service/TccTxEventServiceTest.java | 209 ++++++
.../service/TccTxEventServiceTransactionTest.java | 117 ++++
.../alpha/server/AlphaEventControllerTest.java | 80 ---
.../saga/alpha/server/AlphaIntegrationTest.java | 606 -----------------
.../alpha/server/AlphaIntegrationWithSSLTest.java | 73 --
.../saga/SagaTransactionsControllerTest.java | 198 ------
.../server/tcc/AlphaTccEventControllerTest.java | 86 ---
.../alpha/server/tcc/AlphaTccServerTestBase.java | 306 ---------
.../alpha/server/tcc/MemoryAlphaTccServerTest.java | 40 --
.../alpha/server/tcc/RdbAlphaTccServerTest.java | 38 --
.../saga/alpha/server/tcc/TccApplication.java | 31 -
.../alpha/server/tcc/TccCallbackEngineTest.java | 148 -----
.../saga/alpha/server/tcc/TccConfiguration.java | 69 --
.../tcc/TccCoordinateCommandStreamObserver.java | 56 --
.../alpha/server/tcc/jpa/EventConverterTest.java | 37 --
.../tcc/service/MemoryEventRegistryTest.java | 115 ----
.../server/tcc/service/TccTxEventServiceTest.java | 208 ------
.../service/TccTxEventServiceTransactionTest.java | 116 ----
alpha/pom.xml | 4 +-
demo/pom.xml | 144 ++++
{saga-demo => demo}/saga-dubbo-demo/README.md | 0
.../saga-dubbo-demo}/docker-compose-alpha.yaml | 0
.../saga-dubbo-demo/docker-compose-demo.yaml | 0
.../saga-dubbo-demo/docker-compose.mysql.yaml | 0
.../saga-dubbo-demo/docker-compose.yaml | 0
demo/saga-dubbo-demo/pom.xml | 124 ++++
.../saga-dubbo-demo/saga-dubbo-demo.sh | 0
demo/saga-dubbo-demo/service-api/pom.xml | 40 ++
.../servicecomb/pack/demo/dubbo/api/IService.java | 25 +
.../servicecomb/pack/demo/dubbo/api/IServiceA.java | 20 +
.../servicecomb/pack/demo/dubbo/api/IServiceB.java | 20 +
.../servicecomb/pack/demo/dubbo/api/IServiceC.java | 20 +
.../src/main/resources/dubbo.properties | 0
demo/saga-dubbo-demo/service-pub/pom.xml | 31 +
.../pack/demo/dubbo/pub/AbsService.java | 39 ++
.../pack/demo/dubbo/pub/IInvokeCode.java | 37 ++
.../pack/demo/dubbo/pub/InvokeContext.java | 55 ++
.../servicecomb/pack/demo/dubbo/pub/ServiceVO.java | 50 ++
demo/saga-dubbo-demo/servicea/pom.xml | 94 +++
.../pack/demo/dubbo/servicea/ApplicationA.java | 31 +
.../pack/demo/dubbo/servicea/ServiceA.java | 77 +++
.../dubbo/servicea/web/DubboDemoController.java | 168 +++++
.../demo/dubbo/servicea/web/MvcConfigurer.java | 39 ++
.../servicea/src/main/resources/application.yaml | 0
.../servicea/src/main/resources/dubbo-context.xml | 31 +
.../servicea}/src/main/resources/jdbc.xml | 0
.../servicea}/src/main/resources/log4j2.xml | 0
.../servicea/src/main/resources/schema-mysql.sql | 0
.../src/main/resources/schema-postgresql.sql | 0
.../servicea/src/main/resources/static/index.html | 0
demo/saga-dubbo-demo/serviceb/pom.xml | 90 +++
.../pack/demo/dubbo/serviceb/ApplicationB.java | 32 +
.../pack/demo/dubbo/serviceb/ServiceB.java | 68 ++
.../serviceb/src/main/resources/application.yaml | 0
.../serviceb/src/main/resources/dubbo-context.xml | 30 +
.../serviceb/src/main/resources/jdbc.xml | 0
.../serviceb}/src/main/resources/log4j2.xml | 0
.../serviceb/src/main/resources/schema-mysql.sql | 0
.../src/main/resources/schema-postgresql.sql | 0
demo/saga-dubbo-demo/servicec/pom.xml | 90 +++
.../pack/demo/dubbo/servicec/ApplicationC.java | 31 +
.../pack/demo/dubbo/servicec/ServiceC.java | 60 ++
.../servicec/src/main/resources/application.yaml | 0
.../servicec/src/main/resources/dubbo-context.xml | 28 +
.../servicec}/src/main/resources/jdbc.xml | 0
.../servicec}/src/main/resources/log4j2.xml | 0
.../servicec/src/main/resources/schema-mysql.sql | 0
.../src/main/resources/schema-postgresql.sql | 0
.../saga-dubbo-demo/sql/schema-mysql.sql | 0
{saga-demo => demo}/saga-k8s-resources/README.md | 0
.../saga-k8s-resources/base/alpha.yaml | 0
.../saga-k8s-resources/base/jmeter-collector.yaml | 0
.../saga-k8s-resources/base/postgresql.yaml | 0
.../saga-k8s-resources/spring-demo/booking.yaml | 0
.../saga-k8s-resources/spring-demo/car.yaml | 0
.../saga-k8s-resources/spring-demo/hotel.yaml | 0
.../spring-demo/test/jmeter.configmap.yaml | 0
.../spring-demo/test/jmeter.yaml | 0
.../saga-servicecomb-demo/README.md | 0
.../saga-servicecomb-demo/docker-compose.yaml | 0
demo/saga-servicecomb-demo/pom.xml | 141 ++++
.../saga-servicecomb-demo/saga-servicecomb-demo.sh | 0
demo/saga-servicecomb-demo/scb-booking/pom.xml | 32 +
.../pack/demo/scb/booking/BookingApplication.java | 32 +
.../pack/demo/scb/booking/BookingController.java | 54 ++
.../src/main/resources/application.yaml | 0
.../scb-booking}/src/main/resources/log4j2.xml | 0
.../src/main/resources/microservice.yaml | 0
demo/saga-servicecomb-demo/scb-car/pom.xml | 32 +
.../pack/demo/scb/car/CarApplication.java | 32 +
.../servicecomb/pack/demo/scb/car/CarBooking.java | 74 +++
.../pack/demo/scb/car/CarBookingController.java | 62 ++
.../pack/demo/scb/car/CarBookingService.java | 51 ++
.../scb-car}/src/main/resources/application.yaml | 0
.../scb-car}/src/main/resources/log4j2.xml | 0
.../scb-car/src/main/resources/microservice.yaml | 0
demo/saga-servicecomb-demo/scb-hotel/pom.xml | 32 +
.../pack/demo/scb/hotel/HotelApplication.java | 32 +
.../pack/demo/scb/hotel/HotelBooking.java | 74 +++
.../demo/scb/hotel/HotelBookingController.java | 62 ++
.../pack/demo/scb/hotel/HotelBookingService.java | 54 ++
.../scb-hotel}/src/main/resources/application.yaml | 0
.../scb-hotel}/src/main/resources/log4j2.xml | 0
.../scb-hotel/src/main/resources/microservice.yaml | 0
{saga-demo => demo}/saga-spring-demo/README.md | 0
demo/saga-spring-demo/booking/pom.xml | 98 +++
.../servicecomb/pack/demo/booking/Application.java | 30 +
.../pack/demo/booking/BookingController.java | 67 ++
.../pack/demo/booking/MyConfiguration.java | 36 +
.../booking}/src/main/resources/application.yaml | 0
.../booking/src/main/resources/log4j2.xml | 0
.../booking/src/main/resources/static/index.html | 0
demo/saga-spring-demo/car/pom.xml | 98 +++
.../servicecomb/pack/demo/car/Application.java | 30 +
.../servicecomb/pack/demo/car/CarBooking.java | 74 +++
.../pack/demo/car/CarBookingController.java | 59 ++
.../pack/demo/car/CarBookingService.java | 52 ++
.../car}/src/main/resources/application.yaml | 0
.../car}/src/main/resources/log4j2.xml | 0
.../docker-compose-alpha-perf.yaml | 0
.../saga-spring-demo/docker-compose-alpha.yaml | 0
.../saga-spring-demo/docker-compose-demo.yaml | 0
.../saga-spring-demo}/docker-compose.mysql.yaml | 0
.../saga-spring-demo/docker-compose.yaml | 0
demo/saga-spring-demo/hotel/pom.xml | 98 +++
.../servicecomb/pack/demo/hotel/Application.java | 30 +
.../servicecomb/pack/demo/hotel/HotelBooking.java | 74 +++
.../pack/demo/hotel/HotelBookingController.java | 60 ++
.../pack/demo/hotel/HotelBookingService.java | 54 ++
.../hotel}/src/main/resources/application.yaml | 0
.../hotel}/src/main/resources/log4j2.xml | 0
demo/saga-spring-demo/pom.xml | 47 ++
{saga-demo => demo}/saga-spring-demo/saga-demo.sh | 0
{saga-demo => demo}/tcc-spring-demo/README.md | 0
.../tcc-spring-demo}/docker-compose-alpha.yaml | 0
.../tcc-spring-demo/docker-compose-demo.yaml | 0
.../tcc-spring-demo}/docker-compose.mysql.yaml | 0
.../tcc-spring-demo/docker-compose.yaml | 0
demo/tcc-spring-demo/inventory/pom.xml | 119 ++++
.../pack/demo/inventory/InventoryService.java | 83 +++
.../servicecomb/pack/demo/inventory/Product.java | 77 +++
.../pack/demo/inventory/ProductController.java | 66 ++
.../pack/demo/inventory/ProductDao.java | 28 +
.../pack/demo/inventory/ProductOrder.java | 82 +++
.../demo/inventory/TccInventoryApplication.java | 45 ++
.../inventory/src/main/resources/application.yaml | 0
.../inventory}/src/main/resources/log4j2.xml | 0
.../pack/demo/inventory/InventoryServiceTest.java | 119 ++++
.../pack/demo/inventory/ProductControllerTest.java | 84 +++
.../pack/demo/inventory/TestApplication.java | 25 +
demo/tcc-spring-demo/ordering/pom.xml | 81 +++
.../pack/demo/ordering/OrderingController.java | 60 ++
.../pack/demo/ordering/TccOrderingApplication.java | 30 +
.../ordering/src/main/resources/application.yaml | 0
.../ordering}/src/main/resources/log4j2.xml | 0
demo/tcc-spring-demo/payment/pom.xml | 117 ++++
.../servicecomb/pack/demo/payment/Account.java | 81 +++
.../servicecomb/pack/demo/payment/AccountDao.java | 26 +
.../servicecomb/pack/demo/payment/Payment.java | 81 +++
.../pack/demo/payment/PaymentController.java | 64 ++
.../pack/demo/payment/PaymentService.java | 90 +++
.../pack/demo/payment/TccPaymentApplication.java | 44 ++
.../payment/src/main/resources/application.yaml | 0
.../payment}/src/main/resources/log4j2.xml | 0
.../pack/demo/payment/PaymentControllerTest.java | 84 +++
.../pack/demo/payment/PaymentServiceTest.java | 146 ++++
.../pack/demo/payment/TestApplication.java | 25 +
demo/tcc-spring-demo/pom.xml | 60 ++
{saga-demo => demo}/tcc-spring-demo/saga-demo.sh | 0
distribution/pom.xml | 118 ++++
.../src/assembly/bin.xml | 0
.../src/assembly/src.xml | 0
.../src/release/LICENSE | 0
.../src/release/NOTICE | 0
.../src/release/licenses/LICENSE-asm | 0
.../src/release/licenses/LICENSE-boringssl | 0
.../src/release/licenses/LICENSE-epl-v10 | 0
.../src/release/licenses/LICENSE-esotericsoftware | 0
.../src/release/licenses/LICENSE-javax | 0
.../src/release/licenses/LICENSE-logback | 0
.../src/release/licenses/LICENSE-ngxadmin | 0
.../src/release/licenses/LICENSE-openfeign | 0
.../src/release/licenses/LICENSE-postgresql | 0
.../src/release/licenses/LICENSE-protobuf | 0
.../src/release/licenses/LICENSE-slf4j | 0
.../src/release/licenses/NOTICE-grpc | 0
.../src/release/licenses/NOTICE-netty | 0
.../src/release/licenses/NOTICE-netty-tcnative | 0
.../src/release/licenses/NOTICE-tomcat | 0
docker-build-config/pom.xml | 4 +-
docs/api/api.md | 288 --------
docs/old_saga.md | 53 --
integration-tests/coverage-aggregate/pom.xml | 50 +-
integration-tests/pack-tests/pom.xml | 16 +-
.../tests/CommandEnvelopeRepository.java | 24 +
.../integration/tests/GreetingApplication.java | 41 ++
.../pack/integration/tests/GreetingController.java | 88 +++
.../pack/integration/tests/GreetingService.java | 88 +++
.../servicecomb/pack/integration/tests/PackIT.java | 317 +++++++++
.../tests/TxEventEnvelopeRepository.java | 31 +
.../pack/tests/CommandEnvelopeRepository.java | 24 -
.../pack/tests/GreetingApplication.java | 41 --
.../integration/pack/tests/GreetingController.java | 88 ---
.../integration/pack/tests/GreetingService.java | 88 ---
.../saga/integration/pack/tests/PackIT.java | 317 ---------
.../pack/tests/TxEventEnvelopeRepository.java | 31 -
integration-tests/pom.xml | 6 +-
omega/omega-connector/omega-connector-grpc/pom.xml | 8 +-
.../omega/connector/grpc/AlphaClusterConfig.java | 206 ++++++
.../omega/connector/grpc/core/FastestSender.java | 44 ++
.../connector/grpc/core/GrpcOnErrorHandler.java | 94 +++
.../connector/grpc/core/LoadBalanceContext.java | 64 ++
.../grpc/core/LoadBalanceContextBuilder.java | 155 +++++
.../grpc/core/LoadBalanceSenderAdapter.java | 107 +++
.../connector/grpc/core/MessageSenderPicker.java | 41 ++
.../connector/grpc/core/PendingTaskRunner.java | 63 ++
.../grpc/core/PushBackReconnectRunnable.java | 79 +++
.../grpc/core/ReconnectStreamObserver.java | 51 ++
.../omega/connector/grpc/core/SenderExecutor.java | 25 +
.../omega/connector/grpc/core/TransactionType.java | 22 +
.../grpc/saga/GrpcCompensateStreamObserver.java | 59 ++
.../grpc/saga/GrpcSagaClientMessageSender.java | 120 ++++
.../grpc/saga/RetryableMessageSender.java | 67 ++
.../connector/grpc/saga/SagaLoadBalanceSender.java | 53 ++
.../grpc/tcc/GrpcCoordinateStreamObserver.java | 49 ++
.../grpc/tcc/GrpcTccClientMessageSender.java | 157 +++++
.../connector/grpc/tcc/TccLoadBalanceSender.java | 104 +++
.../omega/connector/grpc/AlphaClusterConfig.java | 206 ------
.../omega/connector/grpc/core/FastestSender.java | 44 --
.../connector/grpc/core/GrpcOnErrorHandler.java | 94 ---
.../connector/grpc/core/LoadBalanceContext.java | 64 --
.../grpc/core/LoadBalanceContextBuilder.java | 154 -----
.../grpc/core/LoadBalanceSenderAdapter.java | 107 ---
.../connector/grpc/core/MessageSenderPicker.java | 41 --
.../connector/grpc/core/PendingTaskRunner.java | 63 --
.../grpc/core/PushBackReconnectRunnable.java | 79 ---
.../grpc/core/ReconnectStreamObserver.java | 51 --
.../omega/connector/grpc/core/SenderExecutor.java | 25 -
.../omega/connector/grpc/core/TransactionType.java | 22 -
.../grpc/saga/GrpcCompensateStreamObserver.java | 59 --
.../grpc/saga/GrpcSagaClientMessageSender.java | 120 ----
.../grpc/saga/RetryableMessageSender.java | 67 --
.../connector/grpc/saga/SagaLoadBalanceSender.java | 52 --
.../grpc/tcc/GrpcCoordinateStreamObserver.java | 48 --
.../grpc/tcc/GrpcTccClientMessageSender.java | 156 -----
.../connector/grpc/tcc/TccLoadBalanceSender.java | 103 ---
.../grpc/LoadBalanceContextBuilderTest.java | 145 ++++
.../connector/grpc/LoadBalanceSenderTestBase.java | 46 ++
.../grpc/PushBackReconnectRunnableTest.java | 83 +++
.../grpc/saga/RetryableMessageSenderTest.java | 90 +++
.../saga/SagaLoadBalanceSenderWithTLSTest.java | 151 +++++
.../grpc/saga/SagaLoadBalancedSenderTest.java | 348 ++++++++++
.../grpc/saga/SagaLoadBalancedSenderTestBase.java | 196 ++++++
.../grpc/tcc/GrpcTccClientMessageSenderTest.java | 260 ++++++++
.../connector/grpc/tcc/MyTccEventServiceImpl.java | 119 ++++
.../grpc/tcc/TccLoadBalanceSenderTest.java | 314 +++++++++
.../grpc/LoadBalanceContextBuilderTest.java | 145 ----
.../connector/grpc/LoadBalanceSenderTestBase.java | 46 --
.../grpc/PushBackReconnectRunnableTest.java | 83 ---
.../grpc/saga/RetryableMessageSenderTest.java | 90 ---
.../saga/SagaLoadBalanceSenderWithTLSTest.java | 151 -----
.../grpc/saga/SagaLoadBalancedSenderTest.java | 348 ----------
.../grpc/saga/SagaLoadBalancedSenderTestBase.java | 199 ------
.../grpc/tcc/GrpcTccClientMessageSenderTest.java | 261 --------
.../connector/grpc/tcc/MyTccEventServiceImpl.java | 119 ----
.../grpc/tcc/TccLoadBalanceSenderTest.java | 314 ---------
omega/omega-connector/pom.xml | 4 +-
omega/omega-context/pom.xml | 4 +-
.../pack/omega/context/CallbackContext.java | 73 ++
.../pack/omega/context/IdGenerator.java | 25 +
.../pack/omega/context/OmegaContext.java | 75 +++
.../pack/omega/context/ServiceConfig.java | 43 ++
.../pack/omega/context/UniqueIdGenerator.java | 27 +
.../pack/omega/context/annotations/SagaStart.java | 40 ++
.../pack/omega/context/annotations/TccStart.java | 39 ++
.../saga/omega/context/CallbackContext.java | 73 --
.../saga/omega/context/IdGenerator.java | 25 -
.../saga/omega/context/OmegaContext.java | 78 ---
.../saga/omega/context/ServiceConfig.java | 43 --
.../saga/omega/context/UniqueIdGenerator.java | 27 -
.../saga/omega/context/annotations/SagaStart.java | 40 --
.../saga/omega/context/annotations/TccStart.java | 39 --
.../pack/omega/context/OmegaContextTest.java | 112 ++++
.../pack/omega/context/UniqueIdGeneratorTest.java | 64 ++
.../saga/omega/context/OmegaContextTest.java | 112 ----
.../saga/omega/context/UniqueIdGeneratorTest.java | 64 --
omega/omega-format/pom.xml | 6 +-
.../pack/omega/format/KryoMessageFormat.java | 69 ++
.../pack/omega/format/MessageFormat.java | 24 +
.../saga/omega/format/KryoMessageFormat.java | 69 --
.../saga/omega/format/MessageFormat.java | 24 -
.../pack/omega/format/KryoMessageFormatTest.java | 41 ++
.../pack/omega/format/MessageFormatTestBase.java | 176 +++++
.../saga/omega/format/KryoMessageFormatTest.java | 41 --
.../saga/omega/format/MessageFormatTestBase.java | 178 -----
omega/omega-spring-starter/pom.xml | 10 +-
.../servicecomb/pack/omega/spring/EnableOmega.java | 39 ++
.../pack/omega/spring/OmegaSpringConfig.java | 164 +++++
.../servicecomb/saga/omega/spring/EnableOmega.java | 38 --
.../saga/omega/spring/OmegaSpringConfig.java | 164 -----
omega/omega-spring-tx/pom.xml | 12 +-
.../omega/transaction/spring/CallbackType.java | 29 +
.../spring/CompensableAnnotationProcessor.java | 58 ++
.../spring/CompensableMethodCheckingCallback.java | 43 ++
.../transaction/spring/ExecutorFieldCallback.java | 164 +++++
.../transaction/spring/MethodCheckingCallback.java | 98 +++
.../spring/ParticipateAnnotationProcessor.java | 58 ++
.../spring/ParticipateMethodCheckingCallback.java | 39 ++
.../spring/TransactionAspectConfig.java | 92 +++
.../spring/annotations/OmegaContextAware.java | 30 +
.../omega/transaction/spring/CallbackType.java | 29 -
.../spring/CompensableAnnotationProcessor.java | 58 --
.../spring/CompensableMethodCheckingCallback.java | 43 --
.../transaction/spring/ExecutorFieldCallback.java | 164 -----
.../transaction/spring/MethodCheckingCallback.java | 98 ---
.../spring/ParticipateAnnotationProcessor.java | 58 --
.../spring/ParticipateMethodCheckingCallback.java | 39 --
.../spring/TransactionAspectConfig.java | 92 ---
.../spring/annotations/OmegaContextAware.java | 30 -
.../spring/CompensableAnnotationCheckingTest.java | 71 ++
.../omega/transaction/spring/MessageConfig.java | 150 +++++
.../spring/MisconfiguredAnnotation.java | 29 +
.../spring/MisconfiguredRetriesService.java | 31 +
.../transaction/spring/MisconfiguredService.java | 31 +
.../transaction/spring/TccInterceptorTest.java | 155 +++++
.../omega/transaction/spring/TccUserService.java | 62 ++
.../transaction/spring/TccUserServiceMain.java | 35 +
.../spring/TransactionInterceptionTest.java | 407 ++++++++++++
.../transaction/spring/TransactionTestMain.java | 28 +
.../spring/TransactionalUserService.java | 82 +++
.../pack/omega/transaction/spring/User.java | 82 +++
.../omega/transaction/spring/UserRepository.java | 24 +
.../spring/CompensableAnnotationCheckingTest.java | 71 --
.../omega/transaction/spring/MessageConfig.java | 150 -----
.../spring/MisconfiguredAnnotation.java | 29 -
.../spring/MisconfiguredRetriesService.java | 31 -
.../transaction/spring/MisconfiguredService.java | 31 -
.../transaction/spring/TccInterceptorTest.java | 157 -----
.../omega/transaction/spring/TccUserService.java | 62 --
.../transaction/spring/TccUserServiceMain.java | 35 -
.../spring/TransactionInterceptionTest.java | 408 ------------
.../transaction/spring/TransactionTestMain.java | 28 -
.../spring/TransactionalUserService.java | 82 ---
.../saga/omega/transaction/spring/User.java | 82 ---
.../omega/transaction/spring/UserRepository.java | 24 -
omega/omega-transaction/pom.xml | 8 +-
.../pack/omega/transaction/AlphaResponse.java | 30 +
.../omega/transaction/CompensableInterceptor.java | 48 ++
.../transaction/CompensationMessageHandler.java | 38 ++
.../pack/omega/transaction/DefaultRecovery.java | 86 +++
.../omega/transaction/EventAwareInterceptor.java | 29 +
.../pack/omega/transaction/ForwardRecovery.java | 76 +++
.../omega/transaction/MessageDeserializer.java | 22 +
.../pack/omega/transaction/MessageHandler.java | 22 +
.../pack/omega/transaction/MessageSender.java | 30 +
.../pack/omega/transaction/MessageSerializer.java | 22 +
.../transaction/NoOpEventAwareInterceptor.java | 40 ++
.../pack/omega/transaction/OmegaException.java | 28 +
.../pack/omega/transaction/RecoveryPolicy.java | 27 +
.../omega/transaction/RecoveryPolicyFactory.java | 33 +
.../pack/omega/transaction/SagaEndedEvent.java | 26 +
.../pack/omega/transaction/SagaMessageSender.java | 23 +
.../transaction/SagaStartAnnotationProcessor.java | 56 ++
.../pack/omega/transaction/SagaStartAspect.java | 74 +++
.../pack/omega/transaction/SagaStartedEvent.java | 27 +
.../pack/omega/transaction/TransactionAspect.java | 61 ++
.../pack/omega/transaction/TxAbortedEvent.java | 43 ++
.../pack/omega/transaction/TxCompensatedEvent.java | 26 +
.../pack/omega/transaction/TxEndedEvent.java | 26 +
.../pack/omega/transaction/TxEvent.java | 105 +++
.../pack/omega/transaction/TxStartedEvent.java | 29 +
.../omega/transaction/annotations/Compensable.java | 75 +++
.../omega/transaction/annotations/Participate.java | 64 ++
.../transaction/tcc/CoordinateMessageHandler.java | 53 ++
.../transaction/tcc/DefaultParametersContext.java | 40 ++
.../omega/transaction/tcc/ParametersContext.java | 24 +
.../omega/transaction/tcc/TccEventService.java | 44 ++
.../omega/transaction/tcc/TccMessageHandler.java | 22 +
.../omega/transaction/tcc/TccMessageSender.java | 37 ++
.../transaction/tcc/TccParticipatorAspect.java | 87 +++
.../tcc/TccStartAnnotationProcessor.java | 56 ++
.../pack/omega/transaction/tcc/TccStartAspect.java | 75 +++
.../transaction/tcc/events/CoordinatedEvent.java | 68 ++
.../transaction/tcc/events/ParticipatedEvent.java | 77 +++
.../transaction/tcc/events/TccEndedEvent.java | 54 ++
.../transaction/tcc/events/TccStartedEvent.java | 42 ++
.../saga/omega/transaction/AlphaResponse.java | 30 -
.../omega/transaction/CompensableInterceptor.java | 48 --
.../transaction/CompensationMessageHandler.java | 38 --
.../saga/omega/transaction/DefaultRecovery.java | 86 ---
.../omega/transaction/EventAwareInterceptor.java | 29 -
.../saga/omega/transaction/ForwardRecovery.java | 76 ---
.../omega/transaction/MessageDeserializer.java | 22 -
.../saga/omega/transaction/MessageHandler.java | 22 -
.../saga/omega/transaction/MessageSender.java | 30 -
.../saga/omega/transaction/MessageSerializer.java | 22 -
.../transaction/NoOpEventAwareInterceptor.java | 40 --
.../saga/omega/transaction/OmegaException.java | 28 -
.../saga/omega/transaction/RecoveryPolicy.java | 27 -
.../omega/transaction/RecoveryPolicyFactory.java | 33 -
.../saga/omega/transaction/SagaEndedEvent.java | 26 -
.../saga/omega/transaction/SagaMessageSender.java | 23 -
.../transaction/SagaStartAnnotationProcessor.java | 56 --
.../saga/omega/transaction/SagaStartAspect.java | 74 ---
.../saga/omega/transaction/SagaStartedEvent.java | 27 -
.../saga/omega/transaction/TransactionAspect.java | 61 --
.../saga/omega/transaction/TxAbortedEvent.java | 43 --
.../saga/omega/transaction/TxCompensatedEvent.java | 26 -
.../saga/omega/transaction/TxEndedEvent.java | 26 -
.../saga/omega/transaction/TxEvent.java | 105 ---
.../saga/omega/transaction/TxStartedEvent.java | 29 -
.../omega/transaction/annotations/Compensable.java | 75 ---
.../omega/transaction/annotations/Participate.java | 64 --
.../transaction/tcc/CoordinateMessageHandler.java | 53 --
.../transaction/tcc/DefaultParametersContext.java | 40 --
.../omega/transaction/tcc/ParametersContext.java | 24 -
.../omega/transaction/tcc/TccEventService.java | 44 --
.../omega/transaction/tcc/TccMessageHandler.java | 22 -
.../omega/transaction/tcc/TccMessageSender.java | 37 --
.../transaction/tcc/TccParticipatorAspect.java | 87 ---
.../tcc/TccStartAnnotationProcessor.java | 56 --
.../saga/omega/transaction/tcc/TccStartAspect.java | 75 ---
.../transaction/tcc/events/CoordinatedEvent.java | 68 --
.../transaction/tcc/events/ParticipatedEvent.java | 77 ---
.../transaction/tcc/events/TccEndedEvent.java | 54 --
.../transaction/tcc/events/TccStartedEvent.java | 42 --
.../transaction/CompensableInterceptorTest.java | 129 ++++
.../CompensationMessageHandlerTest.java | 96 +++
.../omega/transaction/DefaultRecoveryTest.java | 205 ++++++
.../omega/transaction/ForwardRecoveryTest.java | 185 ++++++
.../SagaStartAnnotationProcessorTest.java | 134 ++++
.../omega/transaction/SagaStartAspectTest.java | 144 ++++
.../omega/transaction/TransactionAspectTest.java | 225 +++++++
.../tcc/CoordinateMessageHandlerTest.java | 114 ++++
.../transaction/tcc/TccParticipatorAspectTest.java | 184 +++++
.../tcc/TccStartAnnotationProcessorTest.java | 159 +++++
.../omega/transaction/tcc/TccStartAspectTest.java | 169 +++++
.../transaction/CompensableInterceptorTest.java | 129 ----
.../CompensationMessageHandlerTest.java | 96 ---
.../omega/transaction/DefaultRecoveryTest.java | 205 ------
.../omega/transaction/ForwardRecoveryTest.java | 185 ------
.../SagaStartAnnotationProcessorTest.java | 134 ----
.../omega/transaction/SagaStartAspectTest.java | 144 ----
.../omega/transaction/TransactionAspectTest.java | 225 -------
.../tcc/CoordinateMessageHandlerTest.java | 114 ----
.../transaction/tcc/TccParticipatorAspectTest.java | 184 -----
.../tcc/TccStartAnnotationProcessorTest.java | 159 -----
.../omega/transaction/tcc/TccStartAspectTest.java | 169 -----
.../omega-transport/omega-transport-dubbo/pom.xml | 2 +-
.../transport/dubbo/SagaDubboConsumerFilter.java | 68 ++
.../transport/dubbo/SagaDubboProviderFilter.java | 72 ++
.../transport/dubbo/SagaDubboConsumerFilter.java | 69 --
.../transport/dubbo/SagaDubboProviderFilter.java | 73 --
.../META-INF/dubbo/com.alibaba.dubbo.rpc.Filter | 4 +-
.../src/test/java/SagaDubboConsumerFilterTest.java | 79 ---
.../src/test/java/SagaDubboProviderFilterTest.java | 76 ---
.../dubbo/SagaDubboConsumerFilterTest.java | 79 +++
.../dubbo/SagaDubboProviderFilterTest.java | 75 +++
.../omega-transport/omega-transport-feign/pom.xml | 2 +-
.../transport/feign/FeignAutoConfiguration.java | 36 +
.../feign/FeignClientRequestInterceptor.java | 57 ++
.../transport/feign/FeignAutoConfiguration.java | 36 -
.../feign/FeignClientRequestInterceptor.java | 57 --
.../feign/FeignAutoConfigurationTest.java | 83 +++
.../feign/FeignAutoConfigurationTest.java | 83 ---
.../omega-transport-resttemplate/pom.xml | 4 +-
.../transport/resttemplate/RestTemplateConfig.java | 42 ++
.../TransactionClientHttpRequestInterceptor.java | 59 ++
.../TransactionHandlerInterceptor.java | 68 ++
.../omega/transport/resttemplate/WebConfig.java | 55 ++
.../transport/resttemplate/RestTemplateConfig.java | 42 --
.../TransactionClientHttpRequestInterceptor.java | 60 --
.../TransactionHandlerInterceptor.java | 68 --
.../omega/transport/resttemplate/WebConfig.java | 55 --
.../src/main/resources/META-INF/spring.factories | 4 +-
...ransactionClientHttpRequestInterceptorTest.java | 92 +++
.../TransactionHandlerInterceptorTest.java | 85 +++
...ransactionClientHttpRequestInterceptorTest.java | 92 ---
.../TransactionHandlerInterceptorTest.java | 85 ---
.../omega-transport-servicecomb/pom.xml | 2 +-
.../transport/servicecomb/SagaConsumerHandler.java | 70 ++
.../transport/servicecomb/SagaProviderHandler.java | 70 ++
.../transport/servicecomb/SagaConsumerHandler.java | 70 --
.../transport/servicecomb/SagaProviderHandler.java | 70 --
.../src/main/resources/config/cse.handler.xml | 6 +-
.../servicecomb/SagaConsumerHandlerTest.java | 87 +++
.../servicecomb/SagaProviderHandlerTest.java | 87 +++
.../servicecomb/SagaConsumerHandlerTest.java | 87 ---
.../servicecomb/SagaProviderHandlerTest.java | 88 ---
omega/omega-transport/pom.xml | 8 +-
omega/pom.xml | 8 +-
pack-common/pom.xml | 4 +-
.../apache/servicecomb/pack/common/EventType.java | 27 +
.../servicecomb/pack/common/TransactionStatus.java | 23 +
.../apache/servicecomb/saga/common/EventType.java | 27 -
.../servicecomb/saga/common/TransactionStatus.java | 23 -
pack-contracts/pack-contract-grpc/pom.xml | 4 +-
.../src/main/proto/GrpcCommon.proto | 2 +-
.../src/main/proto/GrpcTccEvent.proto | 2 +-
.../src/main/proto/GrpcTxEvent.proto | 2 +-
pack-contracts/pom.xml | 4 +-
persistence/persistence-jpa/pom.xml | 98 +++
.../jpa/EclipseLinkJpaConfiguration.java | 56 ++
.../src/main/resources/META-INF/spring.factories | 18 +
persistence/pom.xml | 37 ++
pom.xml | 96 +--
saga-core-akka/pom.xml | 120 ----
.../saga/core/actors/ActorBasedSaga.java | 65 --
.../saga/core/actors/ActorBasedSagaFactory.java | 83 ---
.../saga/core/actors/CompletionCallbackActor.java | 69 --
.../saga/core/actors/EventContextImpl.java | 60 --
.../servicecomb/saga/core/actors/RequestActor.java | 206 ------
.../saga/core/actors/RequestActorBuilder.java | 108 ---
.../saga/core/actors/RequestActorContext.java | 82 ---
.../saga/core/actors/messages/AbortMessage.java | 37 --
.../core/actors/messages/AbortRecoveryMessage.java | 33 -
.../core/actors/messages/CompensateMessage.java | 32 -
.../messages/CompensationRecoveryMessage.java | 22 -
.../saga/core/actors/messages/FailMessage.java | 33 -
.../saga/core/actors/messages/Message.java | 21 -
.../saga/core/actors/messages/TransactMessage.java | 40 --
.../messages/TransactionRecoveryMessage.java | 32 -
.../ActorBasedSagaExecutionComponentTest.java | 31 -
.../core/actors/ActorBasedSagaIntegrationTest.java | 692 -------------------
.../core/actors/CompletionCallbackActorTest.java | 140 ----
.../saga/core/actors/EventContextImplTest.java | 96 ---
.../saga/core/actors/RequestActorBuilderTest.java | 175 -----
.../saga/core/actors/RequestActorTest.java | 406 ------------
saga-core-akka/src/test/resources/application.conf | 21 -
saga-core-akka/src/test/resources/log4j2.xml | 30 -
saga-core/pom.xml | 111 ----
.../servicecomb/saga/core/BackwardRecovery.java | 54 --
.../apache/servicecomb/saga/core/Compensation.java | 55 --
.../saga/core/CompensationTaskConsumer.java | 69 --
.../servicecomb/saga/core/CompositeSagaLog.java | 40 --
.../saga/core/CompositeSagaResponse.java | 63 --
.../apache/servicecomb/saga/core/Descriptive.java | 23 -
.../apache/servicecomb/saga/core/EventContext.java | 28 -
.../servicecomb/saga/core/EventEnvelope.java | 47 --
.../apache/servicecomb/saga/core/EventStore.java | 25 -
.../servicecomb/saga/core/FailedSagaResponse.java | 50 --
.../org/apache/servicecomb/saga/core/Fallback.java | 45 --
.../servicecomb/saga/core/FallbackPolicy.java | 62 --
.../servicecomb/saga/core/ForwardRecovery.java | 67 --
.../servicecomb/saga/core/GraphBasedSaga.java | 139 ----
.../apache/servicecomb/saga/core/IdGenerator.java | 25 -
.../saga/core/LoggingRecoveryPolicy.java | 51 --
.../servicecomb/saga/core/LongIdGenerator.java | 30 -
.../servicecomb/saga/core/NoOpSagaRequest.java | 113 ----
.../apache/servicecomb/saga/core/Operation.java | 33 -
.../servicecomb/saga/core/PersistentLog.java | 22 -
.../servicecomb/saga/core/PersistentStore.java | 26 -
.../servicecomb/saga/core/RecoveryPolicy.java | 26 -
.../servicecomb/saga/core/RequestProcessTask.java | 67 --
.../servicecomb/saga/core/RestOperation.java | 78 ---
.../apache/servicecomb/saga/core/SQLOperation.java | 65 --
.../org/apache/servicecomb/saga/core/Saga.java | 27 -
.../apache/servicecomb/saga/core/SagaContext.java | 34 -
.../servicecomb/saga/core/SagaContextImpl.java | 144 ----
.../servicecomb/saga/core/SagaDefinition.java | 25 -
.../apache/servicecomb/saga/core/SagaEndTask.java | 48 --
.../servicecomb/saga/core/SagaEndedEvent.java | 38 --
.../apache/servicecomb/saga/core/SagaEvent.java | 44 --
.../servicecomb/saga/core/SagaException.java | 29 -
.../org/apache/servicecomb/saga/core/SagaLog.java | 22 -
.../apache/servicecomb/saga/core/SagaRequest.java | 44 --
.../servicecomb/saga/core/SagaRequestImpl.java | 153 -----
.../apache/servicecomb/saga/core/SagaResponse.java | 61 --
.../saga/core/SagaStartFailedException.java | 25 -
.../servicecomb/saga/core/SagaStartTask.java | 56 --
.../servicecomb/saga/core/SagaStartedEvent.java | 46 --
.../apache/servicecomb/saga/core/SagaState.java | 27 -
.../org/apache/servicecomb/saga/core/SagaTask.java | 31 -
.../servicecomb/saga/core/SagaTaskFactory.java | 98 ---
.../saga/core/SuccessfulSagaResponse.java | 43 --
.../apache/servicecomb/saga/core/TaskConsumer.java | 29 -
.../apache/servicecomb/saga/core/TaskRunner.java | 72 --
.../apache/servicecomb/saga/core/ToJsonFormat.java | 26 -
.../apache/servicecomb/saga/core/Transaction.java | 57 --
.../saga/core/TransactionAbortedEvent.java | 57 --
.../saga/core/TransactionAbortedException.java | 28 -
.../saga/core/TransactionCompensatedEvent.java | 56 --
.../servicecomb/saga/core/TransactionConsumer.java | 5 -
.../saga/core/TransactionEndedEvent.java | 56 --
.../saga/core/TransactionFailedException.java | 29 -
.../saga/core/TransactionStartedEvent.java | 45 --
.../saga/core/TransactionTaskConsumer.java | 126 ----
.../apache/servicecomb/saga/core/Transport.java | 22 -
.../saga/core/TransportFailedException.java | 28 -
.../core/application/SagaExecutionComponent.java | 87 ---
.../saga/core/application/SagaFactory.java | 30 -
.../application/interpreter/FromJsonFormat.java | 24 -
.../interpreter/RestRequestChecker.java | 55 --
.../saga/core/dag/ByLevelTraveller.java | 86 ---
.../saga/core/dag/FromLeafTraversalDirection.java | 38 --
.../saga/core/dag/FromRootTraversalDirection.java | 38 --
.../saga/core/dag/GraphBasedSagaFactory.java | 81 ---
.../servicecomb/saga/core/dag/GraphBuilder.java | 110 ---
.../saga/core/dag/GraphCycleDetector.java | 25 -
.../saga/core/dag/GraphCycleDetectorImpl.java | 76 ---
.../org/apache/servicecomb/saga/core/dag/Node.java | 88 ---
.../core/dag/SingleLeafDirectedAcyclicGraph.java | 38 --
.../servicecomb/saga/core/dag/Traveller.java | 29 -
.../saga/core/dag/TraversalDirection.java | 29 -
.../infrastructure/ContextAwareEventStore.java | 56 --
.../saga/infrastructure/EmbeddedEventStore.java | 58 --
.../servicecomb/saga/transports/RestTransport.java | 27 -
.../servicecomb/saga/transports/SQLTransport.java | 29 -
.../saga/transports/TransportFactory.java | 25 -
.../saga/core/BackwardRecoveryTest.java | 57 --
.../servicecomb/saga/core/CompensationImpl.java | 32 -
.../saga/core/CompositeSagaLogTest.java | 49 --
.../saga/core/CompositeSagaResponseTest.java | 81 ---
.../apache/servicecomb/saga/core/DummyEvent.java | 31 -
.../servicecomb/saga/core/FallbackPolicyTest.java | 91 ---
.../servicecomb/saga/core/ForwardRecoveryTest.java | 86 ---
.../servicecomb/saga/core/LongIdGeneratorTest.java | 36 -
.../servicecomb/saga/core/RestOperationTest.java | 95 ---
.../servicecomb/saga/core/RetrySagaLogTest.java | 89 ---
.../servicecomb/saga/core/SagaEndTaskTest.java | 47 --
.../servicecomb/saga/core/SagaEventMatcher.java | 68 --
.../saga/core/SagaExecutionComponentTestBase.java | 272 --------
.../servicecomb/saga/core/SagaIntegrationTest.java | 738 ---------------------
.../servicecomb/saga/core/SagaStartTaskTest.java | 64 --
.../servicecomb/saga/core/TransactionImpl.java | 32 -
.../dag/DirectedAcyclicGraphTraversalTest.java | 102 ---
.../dag/GraphBasedSagaExecutionComponentTest.java | 33 -
.../saga/core/dag/GraphBuilderTest.java | 154 -----
.../saga/core/dag/GraphCycleDetectorTest.java | 72 --
.../apache/servicecomb/saga/core/dag/NodeTest.java | 80 ---
.../infrastructure/ContextAwareEventStoreTest.java | 43 --
saga-core/src/test/resources/application.conf | 21 -
saga-core/src/test/resources/log4j2.xml | 30 -
saga-demo/conditional-transaction-demo/README.md | 177 -----
.../conditional-transaction-demo-tests/pom.xml | 301 ---------
.../saga/demo/tests/ConditionalTransactionIT.java | 155 -----
.../conditional-transaction-demo.sh | 53 --
.../docker-compose.yaml | 75 ---
.../conditional-transaction-demo/inventory/pom.xml | 79 ---
.../inventory/InventoryApplication.java | 29 -
.../transaction/inventory/InventoryController.java | 89 ---
.../inventory/InventoryControllerTest.java | 79 ---
.../membership/pom.xml | 79 ---
.../membership/MembershipApplication.java | 29 -
.../membership/MembershipController.java | 62 --
.../conditional-transaction-demo/payment/pom.xml | 80 ---
.../transaction/payment/PaymentApplication.java | 29 -
.../transaction/payment/PaymentController.java | 84 ---
.../transaction/payment/PaymentControllerTest.java | 61 --
saga-demo/conditional-transaction-demo/pom.xml | 40 --
.../conditional-transaction-demo/supplier/pom.xml | 79 ---
.../transaction/supplier/SupplierApplication.java | 29 -
.../transaction/supplier/SupplierController.java | 52 --
.../src/main/resources/META-INF/LICENSE.txt | 202 ------
.../src/main/resources/META-INF/NOTICE.txt | 11 -
.../dependency-free-transaction-demo/README.md | 170 -----
.../car-rental-service/pom.xml | 90 ---
.../saga/demo/car/rental/CarRentalApplication.java | 32 -
.../saga/demo/car/rental/CarRentalController.java | 100 ---
.../src/main/resources/microservice.yaml | 30 -
.../demo-tests/pom.xml | 333 ----------
.../apache/servicecomb/saga/demo/tests/DemoIT.java | 150 -----
.../dependency-free-transaction-demo.sh | 53 --
.../docker-compose.yaml | 101 ---
.../flight-booking-service/pom.xml | 90 ---
.../flight/booking/FlightBookingApplication.java | 32 -
.../flight/booking/FlightBookingController.java | 77 ---
.../src/main/resources/microservice.yaml | 30 -
.../hotel-reservation-service/pom.xml | 90 ---
.../reservation/HotelReservationApplication.java | 32 -
.../reservation/HotelReservationController.java | 78 ---
.../src/main/resources/microservice.yaml | 30 -
.../payment-service/pom.xml | 90 ---
.../saga/demo/payment/PaymentApplication.java | 32 -
.../saga/demo/payment/PaymentController.java | 81 ---
.../src/main/resources/microservice.yaml | 32 -
saga-demo/dependency-free-transaction-demo/pom.xml | 62 --
saga-demo/pom.xml | 146 ----
saga-demo/saga-dubbo-demo/pom.xml | 124 ----
saga-demo/saga-dubbo-demo/service-api/pom.xml | 40 --
.../servicecomb/saga/demo/dubbo/api/IService.java | 25 -
.../servicecomb/saga/demo/dubbo/api/IServiceA.java | 20 -
.../servicecomb/saga/demo/dubbo/api/IServiceB.java | 20 -
.../servicecomb/saga/demo/dubbo/api/IServiceC.java | 20 -
saga-demo/saga-dubbo-demo/service-pub/pom.xml | 31 -
.../saga/demo/dubbo/pub/AbsService.java | 39 --
.../saga/demo/dubbo/pub/IInvokeCode.java | 37 --
.../saga/demo/dubbo/pub/InvokeContext.java | 55 --
.../servicecomb/saga/demo/dubbo/pub/ServiceVO.java | 50 --
saga-demo/saga-dubbo-demo/servicea/pom.xml | 94 ---
.../saga/demo/dubbo/servicea/ApplicationA.java | 31 -
.../saga/demo/dubbo/servicea/ServiceA.java | 77 ---
.../dubbo/servicea/web/DubboDemoController.java | 169 -----
.../demo/dubbo/servicea/web/MvcConfigurer.java | 39 --
.../servicea/src/main/resources/dubbo-context.xml | 31 -
.../servicea/src/main/resources/log4j2.xml | 30 -
saga-demo/saga-dubbo-demo/serviceb/pom.xml | 90 ---
.../saga/demo/dubbo/serviceb/ApplicationB.java | 32 -
.../saga/demo/dubbo/serviceb/ServiceB.java | 68 --
.../serviceb/src/main/resources/dubbo-context.xml | 30 -
saga-demo/saga-dubbo-demo/servicec/pom.xml | 90 ---
.../saga/demo/dubbo/servicec/ApplicationC.java | 31 -
.../saga/demo/dubbo/servicec/ServiceC.java | 60 --
.../servicec/src/main/resources/dubbo-context.xml | 28 -
saga-demo/saga-servicecomb-demo/pom.xml | 141 ----
.../saga-servicecomb-demo/scb-booking/pom.xml | 32 -
.../saga/demo/scb/booking/BookingApplication.java | 32 -
.../saga/demo/scb/booking/BookingController.java | 57 --
saga-demo/saga-servicecomb-demo/scb-car/pom.xml | 32 -
.../saga/demo/scb/car/CarApplication.java | 32 -
.../servicecomb/saga/demo/scb/car/CarBooking.java | 74 ---
.../saga/demo/scb/car/CarBookingController.java | 62 --
.../saga/demo/scb/car/CarBookingService.java | 51 --
saga-demo/saga-servicecomb-demo/scb-hotel/pom.xml | 32 -
.../saga/demo/scb/hotel/HotelApplication.java | 32 -
.../saga/demo/scb/hotel/HotelBooking.java | 74 ---
.../demo/scb/hotel/HotelBookingController.java | 62 --
.../saga/demo/scb/hotel/HotelBookingService.java | 54 --
saga-demo/saga-spring-demo/booking/pom.xml | 98 ---
.../saga/demo/pack/booking/Application.java | 30 -
.../saga/demo/pack/booking/BookingController.java | 67 --
.../saga/demo/pack/booking/MyConfiguration.java | 36 -
saga-demo/saga-spring-demo/car/pom.xml | 98 ---
.../saga/demo/pack/car/Application.java | 30 -
.../servicecomb/saga/demo/pack/car/CarBooking.java | 74 ---
.../saga/demo/pack/car/CarBookingController.java | 59 --
.../saga/demo/pack/car/CarBookingService.java | 52 --
saga-demo/saga-spring-demo/hotel/pom.xml | 98 ---
.../saga/demo/pack/hotel/Application.java | 30 -
.../saga/demo/pack/hotel/HotelBooking.java | 74 ---
.../demo/pack/hotel/HotelBookingController.java | 60 --
.../saga/demo/pack/hotel/HotelBookingService.java | 54 --
saga-demo/saga-spring-demo/pom.xml | 47 --
saga-demo/tcc-spring-demo/inventory/pom.xml | 119 ----
.../saga/demo/pack/inventory/InventoryService.java | 83 ---
.../saga/demo/pack/inventory/Product.java | 77 ---
.../demo/pack/inventory/ProductController.java | 66 --
.../saga/demo/pack/inventory/ProductDao.java | 28 -
.../saga/demo/pack/inventory/ProductOrder.java | 82 ---
.../pack/inventory/TccInventoryApplication.java | 45 --
.../demo/pack/inventory/InventoryServiceTest.java | 119 ----
.../demo/pack/inventory/ProductControllerTest.java | 84 ---
.../saga/demo/pack/inventory/TestApplication.java | 25 -
saga-demo/tcc-spring-demo/ordering/pom.xml | 81 ---
.../demo/pack/ordering/OrderingController.java | 60 --
.../demo/pack/ordering/TccOrderingApplication.java | 30 -
saga-demo/tcc-spring-demo/payment/pom.xml | 117 ----
.../saga/demo/pack/payment/Account.java | 81 ---
.../saga/demo/pack/payment/AccountDao.java | 26 -
.../saga/demo/pack/payment/Payment.java | 81 ---
.../saga/demo/pack/payment/PaymentController.java | 66 --
.../saga/demo/pack/payment/PaymentService.java | 90 ---
.../demo/pack/payment/TccPaymentApplication.java | 44 --
.../demo/pack/payment/PaymentControllerTest.java | 84 ---
.../saga/demo/pack/payment/PaymentServiceTest.java | 146 ----
.../saga/demo/pack/payment/TestApplication.java | 25 -
saga-demo/tcc-spring-demo/pom.xml | 60 --
saga-discovery/pom.xml | 37 --
.../saga-discovery-servicecenter/pom.xml | 124 ----
.../center/ServiceCenterDiscoveryConfig.java | 43 --
.../src/main/resources/META-INF/spring.factories | 18 -
.../src/main/resources/microservice.yaml | 30 -
.../discovery/service/center/DummyController.java | 56 --
.../center/ServiceCenterDiscoveryApplication.java | 32 -
.../ServiceCenterDiscoveryRestTransportTest.java | 130 ----
.../src/test/resources/log4j2-test.xml | 30 -
.../src/test/resources/registry.yaml | 23 -
saga-distribution/pom.xml | 118 ----
saga-format/pom.xml | 90 ---
.../saga/core/FailedSagaRequestContext.java | 40 --
.../servicecomb/saga/core/JacksonToJsonFormat.java | 65 --
.../servicecomb/saga/core/SagaRequestContext.java | 37 --
.../saga/core/SuccessfulSagaRequestContext.java | 41 --
.../servicecomb/saga/format/ChildrenExtractor.java | 59 --
.../servicecomb/saga/format/JacksonFallback.java | 81 ---
.../saga/format/JacksonFromJsonFormat.java | 58 --
.../saga/format/JacksonRestCompensation.java | 44 --
.../saga/format/JacksonRestFallback.java | 55 --
.../saga/format/JacksonRestOperation.java | 71 --
.../saga/format/JacksonRestTransaction.java | 44 --
.../saga/format/JacksonSQLCompensation.java | 40 --
.../saga/format/JacksonSQLOperation.java | 49 --
.../saga/format/JacksonSQLTransaction.java | 40 --
.../saga/format/JacksonSagaEventFormat.java | 147 ----
.../saga/format/JsonFailedSagaResponse.java | 29 -
.../saga/format/JsonRestSagaRequest.java | 73 --
.../saga/format/JsonSQLSagaRequest.java | 69 --
.../saga/format/JsonSagaDefinition.java | 61 --
.../servicecomb/saga/format/JsonSagaRequest.java | 41 --
.../saga/format/JsonSuccessfulSagaResponse.java | 30 -
.../servicecomb/saga/format/SagaEventFormat.java | 25 -
.../servicecomb/saga/format/TransportAware.java | 27 -
.../saga/format/ChildrenExtractorTest.java | 75 ---
.../format/JacksonFromJsonFormatForSQLTest.java | 232 -------
.../saga/format/JacksonFromJsonFormatTest.java | 299 ---------
.../saga/format/JacksonRestOperationTest.java | 73 --
.../saga/format/JsonRestSagaRequestTest.java | 101 ---
.../saga/format/JsonSQLSagaRequestTest.java | 72 --
.../saga/format/JsonSagaDefinitionTest.java | 34 -
.../saga/format/SagaEventFormatTest.java | 184 -----
saga-persistence/pom.xml | 36 -
saga-persistence/saga-persistence-jpa/pom.xml | 97 ---
.../jpa/EclipseLinkJpaConfiguration.java | 56 --
.../src/main/resources/META-INF/spring.factories | 18 -
saga-spring/pom.xml | 261 --------
.../saga/spring/JpaPersistentStore.java | 69 --
.../servicecomb/saga/spring/SagaController.java | 222 -------
.../servicecomb/saga/spring/SagaEventEntity.java | 85 ---
.../servicecomb/saga/spring/SagaEventRepo.java | 44 --
.../saga/spring/SagaExecutionQueryService.java | 160 -----
.../saga/spring/SagaRecoveryListener.java | 37 --
.../saga/spring/SagaShutdownListener.java | 42 --
.../saga/spring/SagaSpringApplication.java | 39 --
.../servicecomb/saga/spring/SagaSpringConfig.java | 136 ----
saga-spring/src/main/resources/META-INF/aop.xml | 25 -
.../src/main/resources/META-INF/spring.factories | 20 -
saga-spring/src/main/resources/application.conf | 88 ---
saga-spring/src/main/resources/application.yaml | 30 -
.../src/main/resources/schema-postgresql.sql | 26 -
.../ActorBasedSagaSpringApplicationTest.java | 25 -
.../GraphBasedSagaSpringApplicationTest.java | 25 -
.../saga/spring/GreetingController.java | 42 --
.../servicecomb/saga/spring/SagaRecoveryTest.java | 181 -----
.../saga/spring/SagaServiceDiscoveryTest.java | 110 ---
.../saga/spring/SagaSpringApplicationTestBase.java | 390 -----------
saga-spring/src/test/resources/data.sql | 29 -
saga-spring/src/test/resources/log4j2-test.xml | 30 -
saga-spring/src/test/resources/registry.yaml | 23 -
saga-web/pom.xml | 125 ----
scripts/test.sh | 2 +-
transports/pom.xml | 39 --
transports/transport-httpclient-spring/pom.xml | 80 ---
.../saga/transports/HttpClientTransportConfig.java | 40 --
.../src/main/resources/META-INF/spring.factories | 19 -
.../saga/transports/RestTransportTest.java | 123 ----
.../src/test/resources/log4j2.xml | 30 -
transports/transport-httpclient/pom.xml | 63 --
.../transports/httpclient/HttpClientTransport.java | 121 ----
.../httpclient/HttpClientTransportTest.java | 192 ------
.../src/test/resources/log4j2.xml | 30 -
transports/transport-resttemplate/pom.xml | 71 --
.../resttemplate/RestTemplateTransport.java | 121 ----
web/pom.xml | 125 ++++
.../servicecomb/saga/web/SagaWebApplication.java | 0
.../src/main/resources/application.yaml | 0
.../src/main/resources/microservice.yaml | 0
.../src/main/resources/saga-frontend/README.md | 0
.../src/main/resources/saga-frontend/angular.json | 0
.../src/main/resources/saga-frontend/package.json | 0
.../saga-frontend/src/app/@core/core.module.ts | 0
.../src/app/@core/data/data.module.ts | 0
.../src/app/@core/data/saga-events.service.ts | 0
.../src/app/@core/data/state.service.ts | 0
.../src/app/@core/module-import-guard.ts | 0
.../src/app/@core/utils/analytics.service.ts | 0
.../src/app/@core/utils/util.service.ts | 0
.../@theme/components/footer/footer.component.scss | 0
.../@theme/components/footer/footer.component.ts | 0
.../@theme/components/header/header.component.html | 0
.../@theme/components/header/header.component.scss | 0
.../@theme/components/header/header.component.ts | 0
.../src/app/@theme/components/index.ts | 0
.../components/switcher/switcher.component.scss | 0
.../components/switcher/switcher.component.ts | 0
.../theme-settings/theme-settings.component.scss | 0
.../theme-settings/theme-settings.component.ts | 0
.../theme-switcher/theme-switcher.component.html | 0
.../theme-switcher/theme-switcher.component.scss | 0
.../theme-switcher/theme-switcher.component.ts | 0
.../theme-switcher-list.component.scss | 0
.../themes-switcher-list.component.ts | 0
.../app/@theme/layouts/default/default.layout.scss | 0
.../app/@theme/layouts/default/default.layout.ts | 0
.../saga-frontend/src/app/@theme/layouts/index.ts | 0
.../layouts/one-column/one-column.layout.scss | 0
.../@theme/layouts/one-column/one-column.layout.ts | 0
.../src/app/@theme/pipes/capitalize.pipe.ts | 0
.../saga-frontend/src/app/@theme/pipes/index.ts | 0
.../src/app/@theme/pipes/no-sanitize.pipe.ts | 0
.../app/@theme/pipes/number-with-commas.pipe.ts | 0
.../src/app/@theme/pipes/plural.pipe.ts | 0
.../src/app/@theme/pipes/round.pipe.ts | 0
.../src/app/@theme/pipes/timing.pipe.ts | 0
.../src/app/@theme/styles/bootstrap-rtl.scss | 0
.../src/app/@theme/styles/font-size.scss | 0
.../src/app/@theme/styles/pace.theme.scss | 0
.../src/app/@theme/styles/styles.scss | 0
.../src/app/@theme/styles/theme.corporate.ts | 0
.../src/app/@theme/styles/theme.cosmic.ts | 0
.../src/app/@theme/styles/theme.default.ts | 0
.../src/app/@theme/styles/themes.scss | 0
.../saga-frontend/src/app/@theme/theme.module.ts | 0
.../saga-frontend/src/app/app-routing.module.ts | 0
.../saga-frontend/src/app/app.component.ts | 0
.../resources/saga-frontend/src/app/app.module.ts | 0
.../count-cards/count-cards.component.html | 0
.../count-cards/count-cards.component.scss | 0
.../dashboard/count-cards/count-cards.component.ts | 0
.../app/pages/dashboard/dashboard.component.html | 0
.../app/pages/dashboard/dashboard.component.scss | 0
.../src/app/pages/dashboard/dashboard.component.ts | 0
.../src/app/pages/dashboard/dashboard.module.ts | 0
.../recent-table/recent-table.component.html | 0
.../recent-table/recent-table.component.scss | 0
.../recent-table/recent-table.component.ts | 0
.../miscellaneous/miscellaneous-routing.module.ts | 0
.../pages/miscellaneous/miscellaneous.component.ts | 0
.../pages/miscellaneous/miscellaneous.module.ts | 0
.../not-found/not-found.component.html | 0
.../not-found/not-found.component.scss | 0
.../miscellaneous/not-found/not-found.component.ts | 0
.../saga-frontend/src/app/pages/pages-menu.ts | 0
.../src/app/pages/pages-routing.module.ts | 0
.../saga-frontend/src/app/pages/pages.component.ts | 0
.../saga-frontend/src/app/pages/pages.module.ts | 0
.../pages/transactions/customRender.component.ts | 0
.../transactions/findTransaction.component.html | 0
.../transactions/findTransaction.component.ts | 0
.../pages/transactions/transactions.component.html | 0
.../pages/transactions/transactions.component.ts | 0
.../app/pages/transactions/transactions.module.ts | 0
.../transactions/transactionsTable.component.html | 0
.../transactions/transactionsTable.component.scss | 0
.../transactions/transactionsTable.component.ts | 0
.../src/assets/images/square_pattern.svg | 0
.../src/assets/images/square_pattern_cosmic.svg | 0
.../src/environments/environment.prod.ts | 0
.../saga-frontend/src/environments/environment.ts | 0
.../main/resources/saga-frontend/src/favicon.ico | Bin
.../main/resources/saga-frontend/src/favicon.png | Bin
.../main/resources/saga-frontend/src/index.html | 0
.../src/main/resources/saga-frontend/src/main.ts | 0
.../main/resources/saga-frontend/src/polyfills.ts | 0
.../resources/saga-frontend/src/tsconfig.app.json | 0
.../main/resources/saga-frontend/src/typings.d.ts | 0
.../src/main/resources/saga-frontend/tsconfig.json | 0
.../src/main/resources/static/css/request.css | 0
.../src/main/resources/static/css/style.css | 0
.../src/main/resources/static/detail.html | 0
.../src/main/resources/static/index.html | 0
.../src/main/resources/static/js/date.js | 0
.../src/main/resources/static/js/request.js | 0
.../src/main/resources/static/js/table.js | 0
.../src/main/resources/static/request.html | 0
.../src/main/resources/static/result.html | 0
1095 files changed, 25088 insertions(+), 44303 deletions(-)
create mode 100644 acceptance-tests/acceptance-pack-dubbo-demo/src/test/java/org/apache/servicecomb/pack/acceptance/dubbodemo/DubboDemoStepdefs.java
create mode 100644 acceptance-tests/acceptance-pack-dubbo-demo/src/test/java/org/apache/servicecomb/pack/acceptance/dubbodemo/RunCucumberIT.java
delete mode 100644 acceptance-tests/acceptance-pack-dubbo-demo/src/test/java/org/apache/servicecomb/saga/acceptance/dubbodemo/DubboDemoStepdefs.java
delete mode 100644 acceptance-tests/acceptance-pack-dubbo-demo/src/test/java/org/apache/servicecomb/saga/acceptance/dubbodemo/RunCucumberIT.java
create mode 100644 acceptance-tests/acceptance-pack-spring-demo/src/test/java/org/apache/servicecomb/pack/PackStepdefs.java
create mode 100644 acceptance-tests/acceptance-pack-spring-demo/src/test/java/org/apache/servicecomb/pack/RunCucumberIT.java
delete mode 100644 acceptance-tests/acceptance-pack-spring-demo/src/test/java/org/apache/servicecomb/saga/PackStepdefs.java
delete mode 100644 acceptance-tests/acceptance-pack-spring-demo/src/test/java/org/apache/servicecomb/saga/RunCucumberIT.java
create mode 100644 acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/java/org/apache/servicecomb/pack/PackStepdefs.java
create mode 100644 acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/java/org/apache/servicecomb/pack/RunCucumberIT.java
delete mode 100644 acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/java/org/apache/servicecomb/saga/PackStepdefs.java
delete mode 100644 acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/java/org/apache/servicecomb/saga/RunCucumberIT.java
create mode 100644 alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/AlphaException.java
create mode 100644 alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/Command.java
create mode 100644 alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/CommandRepository.java
create mode 100644 alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/CompositeOmegaCallback.java
create mode 100644 alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/EventScanner.java
create mode 100644 alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/OmegaCallback.java
create mode 100644 alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/PendingTaskRunner.java
create mode 100644 alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/PushBackOmegaCallback.java
create mode 100644 alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/TaskStatus.java
create mode 100644 alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/TxConsistentService.java
create mode 100644 alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/TxEvent.java
create mode 100644 alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/TxEventRepository.java
create mode 100644 alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/TxTimeout.java
create mode 100644 alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/TxTimeoutRepository.java
delete mode 100644 alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/AlphaException.java
delete mode 100644 alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/Command.java
delete mode 100644 alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/CommandRepository.java
delete mode 100644 alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/CompositeOmegaCallback.java
delete mode 100644 alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/EventScanner.java
delete mode 100644 alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/OmegaCallback.java
delete mode 100644 alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/PendingTaskRunner.java
delete mode 100644 alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/PushBackOmegaCallback.java
delete mode 100644 alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TaskStatus.java
delete mode 100644 alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxConsistentService.java
delete mode 100644 alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxEvent.java
delete mode 100644 alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxEventRepository.java
delete mode 100644 alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxTimeout.java
delete mode 100644 alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxTimeoutRepository.java
create mode 100644 alpha/alpha-core/src/test/java/org/apache/servicecomb/pack/alpha/core/CompositeOmegaCallbackTest.java
create mode 100644 alpha/alpha-core/src/test/java/org/apache/servicecomb/pack/alpha/core/PendingTaskRunnerTest.java
create mode 100644 alpha/alpha-core/src/test/java/org/apache/servicecomb/pack/alpha/core/PushBackOmegaCallbackTest.java
create mode 100644 alpha/alpha-core/src/test/java/org/apache/servicecomb/pack/alpha/core/TxConsistentServiceTest.java
create mode 100644 alpha/alpha-core/src/test/java/org/apache/servicecomb/pack/alpha/core/TxEventMaker.java
delete mode 100644 alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/CompositeOmegaCallbackTest.java
delete mode 100644 alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/PendingTaskRunnerTest.java
delete mode 100644 alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/PushBackOmegaCallbackTest.java
delete mode 100644 alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/TxConsistentServiceTest.java
delete mode 100644 alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/TxEventMaker.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/AlphaApplication.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/AlphaConfig.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/AlphaEventController.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/CommandEntityRepository.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/GrpcOmegaCallback.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/GrpcServerConfig.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/GrpcStartable.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/GrpcTxEventEndpointImpl.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/ServerStartable.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/SpringCommandRepository.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/SpringTxEventRepository.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/SpringTxTimeoutRepository.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/TxEventEnvelopeRepository.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/TxTimeoutEntityRepository.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/console/saga/SagaTransactionsController.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/console/saga/model/Stats.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/AlphaTccEventController.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/GrpcTccEventService.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/callback/CallbackEngine.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/callback/GrpcOmegaTccCallback.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/callback/OmegaCallback.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/callback/OmegaCallbackWrapper.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/callback/OmegaCallbacksRegistry.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/callback/TccCallbackEngine.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/callback/TccPendingTaskRunner.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/EventConverter.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/GlobalTxEvent.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/GlobalTxEventRepository.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/ParticipatedEvent.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/ParticipatedEventRepository.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/TccTxEvent.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/TccTxEventDBRepository.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/TccTxType.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/service/MemoryTxEventRepository.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/service/RDBTxEventRepository.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/service/TccEventScanner.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/service/TccTxEventRepository.java
create mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/service/TccTxEventService.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaApplication.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaConfig.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaEventController.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/CommandEntityRepository.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcOmegaCallback.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcServerConfig.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcStartable.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcTxEventEndpointImpl.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/ServerStartable.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/SpringCommandRepository.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/SpringTxEventRepository.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/SpringTxTimeoutRepository.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/TxEventEnvelopeRepository.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/TxTimeoutEntityRepository.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/console/saga/SagaTransactionsController.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/console/saga/model/Stats.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/AlphaTccEventController.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/GrpcTccEventService.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/CallbackEngine.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/GrpcOmegaTccCallback.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/OmegaCallback.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/OmegaCallbackWrapper.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/OmegaCallbacksRegistry.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/TccCallbackEngine.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/TccPendingTaskRunner.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/EventConverter.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/GlobalTxEvent.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/GlobalTxEventRepository.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/ParticipatedEvent.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/ParticipatedEventRepository.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/TccTxEvent.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/TccTxEventDBRepository.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/TccTxType.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/service/MemoryTxEventRepository.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/service/RDBTxEventRepository.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccEventScanner.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventRepository.java
delete mode 100644 alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventService.java
create mode 100644 alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/AlphaEventControllerTest.java
create mode 100644 alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/AlphaIntegrationTest.java
create mode 100644 alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/AlphaIntegrationWithSSLTest.java
create mode 100644 alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/console/saga/SagaTransactionsControllerTest.java
create mode 100644 alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/AlphaTccEventControllerTest.java
create mode 100644 alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/AlphaTccServerTestBase.java
create mode 100644 alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/MemoryAlphaTccServerTest.java
create mode 100644 alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/RdbAlphaTccServerTest.java
create mode 100644 alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/TccApplication.java
create mode 100644 alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/TccCallbackEngineTest.java
create mode 100644 alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/TccConfiguration.java
create mode 100644 alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/TccCoordinateCommandStreamObserver.java
create mode 100644 alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/EventConverterTest.java
create mode 100644 alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/service/MemoryEventRegistryTest.java
create mode 100644 alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/service/TccTxEventServiceTest.java
create mode 100644 alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/service/TccTxEventServiceTransactionTest.java
delete mode 100644 alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/AlphaEventControllerTest.java
delete mode 100644 alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/AlphaIntegrationTest.java
delete mode 100644 alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/AlphaIntegrationWithSSLTest.java
delete mode 100644 alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/console/saga/SagaTransactionsControllerTest.java
delete mode 100644 alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/AlphaTccEventControllerTest.java
delete mode 100644 alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/AlphaTccServerTestBase.java
delete mode 100644 alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/MemoryAlphaTccServerTest.java
delete mode 100644 alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/RdbAlphaTccServerTest.java
delete mode 100644 alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccApplication.java
delete mode 100644 alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccCallbackEngineTest.java
delete mode 100644 alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccConfiguration.java
delete mode 100644 alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccCoordinateCommandStreamObserver.java
delete mode 100644 alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/EventConverterTest.java
delete mode 100644 alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/MemoryEventRegistryTest.java
delete mode 100644 alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventServiceTest.java
delete mode 100644 alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventServiceTransactionTest.java
create mode 100644 demo/pom.xml
rename {saga-demo => demo}/saga-dubbo-demo/README.md (100%)
rename {saga-demo/tcc-spring-demo => demo/saga-dubbo-demo}/docker-compose-alpha.yaml (100%)
rename {saga-demo => demo}/saga-dubbo-demo/docker-compose-demo.yaml (100%)
rename {saga-demo => demo}/saga-dubbo-demo/docker-compose.mysql.yaml (100%)
rename {saga-demo => demo}/saga-dubbo-demo/docker-compose.yaml (100%)
create mode 100644 demo/saga-dubbo-demo/pom.xml
rename {saga-demo => demo}/saga-dubbo-demo/saga-dubbo-demo.sh (100%)
create mode 100644 demo/saga-dubbo-demo/service-api/pom.xml
create mode 100644 demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/pack/demo/dubbo/api/IService.java
create mode 100644 demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/pack/demo/dubbo/api/IServiceA.java
create mode 100644 demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/pack/demo/dubbo/api/IServiceB.java
create mode 100644 demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/pack/demo/dubbo/api/IServiceC.java
rename {saga-demo => demo}/saga-dubbo-demo/service-api/src/main/resources/dubbo.properties (100%)
create mode 100644 demo/saga-dubbo-demo/service-pub/pom.xml
create mode 100644 demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/pack/demo/dubbo/pub/AbsService.java
create mode 100644 demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/pack/demo/dubbo/pub/IInvokeCode.java
create mode 100644 demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/pack/demo/dubbo/pub/InvokeContext.java
create mode 100644 demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/pack/demo/dubbo/pub/ServiceVO.java
create mode 100644 demo/saga-dubbo-demo/servicea/pom.xml
create mode 100644 demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/pack/demo/dubbo/servicea/ApplicationA.java
create mode 100644 demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/pack/demo/dubbo/servicea/ServiceA.java
create mode 100644 demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/pack/demo/dubbo/servicea/web/DubboDemoController.java
create mode 100644 demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/pack/demo/dubbo/servicea/web/MvcConfigurer.java
rename {saga-demo => demo}/saga-dubbo-demo/servicea/src/main/resources/application.yaml (100%)
create mode 100644 demo/saga-dubbo-demo/servicea/src/main/resources/dubbo-context.xml
rename {saga-demo/saga-dubbo-demo/servicec => demo/saga-dubbo-demo/servicea}/src/main/resources/jdbc.xml (100%)
rename {saga-spring => demo/saga-dubbo-demo/servicea}/src/main/resources/log4j2.xml (100%)
rename {saga-demo => demo}/saga-dubbo-demo/servicea/src/main/resources/schema-mysql.sql (100%)
rename {saga-demo => demo}/saga-dubbo-demo/servicea/src/main/resources/schema-postgresql.sql (100%)
rename {saga-demo => demo}/saga-dubbo-demo/servicea/src/main/resources/static/index.html (100%)
create mode 100644 demo/saga-dubbo-demo/serviceb/pom.xml
create mode 100644 demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/pack/demo/dubbo/serviceb/ApplicationB.java
create mode 100644 demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/pack/demo/dubbo/serviceb/ServiceB.java
rename {saga-demo => demo}/saga-dubbo-demo/serviceb/src/main/resources/application.yaml (100%)
create mode 100644 demo/saga-dubbo-demo/serviceb/src/main/resources/dubbo-context.xml
rename {saga-demo => demo}/saga-dubbo-demo/serviceb/src/main/resources/jdbc.xml (100%)
rename {saga-demo/tcc-spring-demo/payment => demo/saga-dubbo-demo/serviceb}/src/main/resources/log4j2.xml (100%)
rename {saga-demo => demo}/saga-dubbo-demo/serviceb/src/main/resources/schema-mysql.sql (100%)
rename {saga-demo => demo}/saga-dubbo-demo/serviceb/src/main/resources/schema-postgresql.sql (100%)
create mode 100644 demo/saga-dubbo-demo/servicec/pom.xml
create mode 100644 demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/pack/demo/dubbo/servicec/ApplicationC.java
create mode 100644 demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/pack/demo/dubbo/servicec/ServiceC.java
rename {saga-demo => demo}/saga-dubbo-demo/servicec/src/main/resources/application.yaml (100%)
create mode 100644 demo/saga-dubbo-demo/servicec/src/main/resources/dubbo-context.xml
rename {saga-demo/saga-dubbo-demo/servicea => demo/saga-dubbo-demo/servicec}/src/main/resources/jdbc.xml (100%)
rename {saga-demo/tcc-spring-demo/ordering => demo/saga-dubbo-demo/servicec}/src/main/resources/log4j2.xml (100%)
rename {saga-demo => demo}/saga-dubbo-demo/servicec/src/main/resources/schema-mysql.sql (100%)
rename {saga-demo => demo}/saga-dubbo-demo/servicec/src/main/resources/schema-postgresql.sql (100%)
rename {saga-demo => demo}/saga-dubbo-demo/sql/schema-mysql.sql (100%)
rename {saga-demo => demo}/saga-k8s-resources/README.md (100%)
rename {saga-demo => demo}/saga-k8s-resources/base/alpha.yaml (100%)
rename {saga-demo => demo}/saga-k8s-resources/base/jmeter-collector.yaml (100%)
rename {saga-demo => demo}/saga-k8s-resources/base/postgresql.yaml (100%)
rename {saga-demo => demo}/saga-k8s-resources/spring-demo/booking.yaml (100%)
rename {saga-demo => demo}/saga-k8s-resources/spring-demo/car.yaml (100%)
rename {saga-demo => demo}/saga-k8s-resources/spring-demo/hotel.yaml (100%)
rename {saga-demo => demo}/saga-k8s-resources/spring-demo/test/jmeter.configmap.yaml (100%)
rename {saga-demo => demo}/saga-k8s-resources/spring-demo/test/jmeter.yaml (100%)
rename {saga-demo => demo}/saga-servicecomb-demo/README.md (100%)
rename {saga-demo => demo}/saga-servicecomb-demo/docker-compose.yaml (100%)
create mode 100644 demo/saga-servicecomb-demo/pom.xml
rename {saga-demo => demo}/saga-servicecomb-demo/saga-servicecomb-demo.sh (100%)
create mode 100644 demo/saga-servicecomb-demo/scb-booking/pom.xml
create mode 100644 demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/pack/demo/scb/booking/BookingApplication.java
create mode 100644 demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/pack/demo/scb/booking/BookingController.java
rename {saga-demo/saga-spring-demo/booking => demo/saga-servicecomb-demo/scb-booking}/src/main/resources/application.yaml (100%)
rename {saga-demo/tcc-spring-demo/inventory => demo/saga-servicecomb-demo/scb-booking}/src/main/resources/log4j2.xml (100%)
rename {saga-demo => demo}/saga-servicecomb-demo/scb-booking/src/main/resources/microservice.yaml (100%)
create mode 100644 demo/saga-servicecomb-demo/scb-car/pom.xml
create mode 100644 demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/pack/demo/scb/car/CarApplication.java
create mode 100644 demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/pack/demo/scb/car/CarBooking.java
create mode 100644 demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/pack/demo/scb/car/CarBookingController.java
create mode 100644 demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/pack/demo/scb/car/CarBookingService.java
rename {saga-demo/saga-spring-demo/car => demo/saga-servicecomb-demo/scb-car}/src/main/resources/application.yaml (100%)
rename {saga-demo/saga-spring-demo/hotel => demo/saga-servicecomb-demo/scb-car}/src/main/resources/log4j2.xml (100%)
rename {saga-demo => demo}/saga-servicecomb-demo/scb-car/src/main/resources/microservice.yaml (100%)
create mode 100644 demo/saga-servicecomb-demo/scb-hotel/pom.xml
create mode 100644 demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/pack/demo/scb/hotel/HotelApplication.java
create mode 100644 demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/pack/demo/scb/hotel/HotelBooking.java
create mode 100644 demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/pack/demo/scb/hotel/HotelBookingController.java
create mode 100644 demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/pack/demo/scb/hotel/HotelBookingService.java
rename {saga-demo/saga-spring-demo/hotel => demo/saga-servicecomb-demo/scb-hotel}/src/main/resources/application.yaml (100%)
rename {saga-demo/saga-spring-demo/car => demo/saga-servicecomb-demo/scb-hotel}/src/main/resources/log4j2.xml (100%)
rename {saga-demo => demo}/saga-servicecomb-demo/scb-hotel/src/main/resources/microservice.yaml (100%)
rename {saga-demo => demo}/saga-spring-demo/README.md (100%)
create mode 100644 demo/saga-spring-demo/booking/pom.xml
create mode 100644 demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/pack/demo/booking/Application.java
create mode 100644 demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/pack/demo/booking/BookingController.java
create mode 100644 demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/pack/demo/booking/MyConfiguration.java
rename {saga-demo/saga-servicecomb-demo/scb-booking => demo/saga-spring-demo/booking}/src/main/resources/application.yaml (100%)
rename {saga-demo => demo}/saga-spring-demo/booking/src/main/resources/log4j2.xml (100%)
rename {saga-demo => demo}/saga-spring-demo/booking/src/main/resources/static/index.html (100%)
create mode 100644 demo/saga-spring-demo/car/pom.xml
create mode 100644 demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/pack/demo/car/Application.java
create mode 100644 demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/pack/demo/car/CarBooking.java
create mode 100644 demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/pack/demo/car/CarBookingController.java
create mode 100644 demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/pack/demo/car/CarBookingService.java
rename {saga-demo/saga-servicecomb-demo/scb-car => demo/saga-spring-demo/car}/src/main/resources/application.yaml (100%)
rename {saga-demo/saga-servicecomb-demo/scb-hotel => demo/saga-spring-demo/car}/src/main/resources/log4j2.xml (100%)
rename {saga-demo => demo}/saga-spring-demo/docker-compose-alpha-perf.yaml (100%)
rename {saga-demo => demo}/saga-spring-demo/docker-compose-alpha.yaml (100%)
rename {saga-demo => demo}/saga-spring-demo/docker-compose-demo.yaml (100%)
rename {saga-demo/tcc-spring-demo => demo/saga-spring-demo}/docker-compose.mysql.yaml (100%)
rename {saga-demo => demo}/saga-spring-demo/docker-compose.yaml (100%)
create mode 100644 demo/saga-spring-demo/hotel/pom.xml
create mode 100644 demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/pack/demo/hotel/Application.java
create mode 100644 demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/pack/demo/hotel/HotelBooking.java
create mode 100644 demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/pack/demo/hotel/HotelBookingController.java
create mode 100644 demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/pack/demo/hotel/HotelBookingService.java
rename {saga-demo/saga-servicecomb-demo/scb-hotel => demo/saga-spring-demo/hotel}/src/main/resources/application.yaml (100%)
rename {saga-demo/saga-servicecomb-demo/scb-car => demo/saga-spring-demo/hotel}/src/main/resources/log4j2.xml (100%)
create mode 100644 demo/saga-spring-demo/pom.xml
rename {saga-demo => demo}/saga-spring-demo/saga-demo.sh (100%)
rename {saga-demo => demo}/tcc-spring-demo/README.md (100%)
rename {saga-demo/saga-dubbo-demo => demo/tcc-spring-demo}/docker-compose-alpha.yaml (100%)
rename {saga-demo => demo}/tcc-spring-demo/docker-compose-demo.yaml (100%)
rename {saga-demo/saga-spring-demo => demo/tcc-spring-demo}/docker-compose.mysql.yaml (100%)
rename {saga-demo => demo}/tcc-spring-demo/docker-compose.yaml (100%)
create mode 100644 demo/tcc-spring-demo/inventory/pom.xml
create mode 100644 demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/pack/demo/inventory/InventoryService.java
create mode 100644 demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/pack/demo/inventory/Product.java
create mode 100644 demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/pack/demo/inventory/ProductController.java
create mode 100644 demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/pack/demo/inventory/ProductDao.java
create mode 100644 demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/pack/demo/inventory/ProductOrder.java
create mode 100644 demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/pack/demo/inventory/TccInventoryApplication.java
rename {saga-demo => demo}/tcc-spring-demo/inventory/src/main/resources/application.yaml (100%)
rename {saga-demo/saga-servicecomb-demo/scb-booking => demo/tcc-spring-demo/inventory}/src/main/resources/log4j2.xml (100%)
create mode 100644 demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/pack/demo/inventory/InventoryServiceTest.java
create mode 100644 demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/pack/demo/inventory/ProductControllerTest.java
create mode 100644 demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/pack/demo/inventory/TestApplication.java
create mode 100644 demo/tcc-spring-demo/ordering/pom.xml
create mode 100644 demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/pack/demo/ordering/OrderingController.java
create mode 100644 demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/pack/demo/ordering/TccOrderingApplication.java
rename {saga-demo => demo}/tcc-spring-demo/ordering/src/main/resources/application.yaml (100%)
rename {saga-demo/saga-dubbo-demo/servicec => demo/tcc-spring-demo/ordering}/src/main/resources/log4j2.xml (100%)
create mode 100644 demo/tcc-spring-demo/payment/pom.xml
create mode 100644 demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/pack/demo/payment/Account.java
create mode 100644 demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/pack/demo/payment/AccountDao.java
create mode 100644 demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/pack/demo/payment/Payment.java
create mode 100644 demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/pack/demo/payment/PaymentController.java
create mode 100644 demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/pack/demo/payment/PaymentService.java
create mode 100644 demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/pack/demo/payment/TccPaymentApplication.java
rename {saga-demo => demo}/tcc-spring-demo/payment/src/main/resources/application.yaml (100%)
rename {saga-demo/saga-dubbo-demo/serviceb => demo/tcc-spring-demo/payment}/src/main/resources/log4j2.xml (100%)
create mode 100644 demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/pack/demo/payment/PaymentControllerTest.java
create mode 100644 demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/pack/demo/payment/PaymentServiceTest.java
create mode 100644 demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/pack/demo/payment/TestApplication.java
create mode 100644 demo/tcc-spring-demo/pom.xml
rename {saga-demo => demo}/tcc-spring-demo/saga-demo.sh (100%)
create mode 100644 distribution/pom.xml
rename {saga-distribution => distribution}/src/assembly/bin.xml (100%)
rename {saga-distribution => distribution}/src/assembly/src.xml (100%)
rename {saga-distribution => distribution}/src/release/LICENSE (100%)
rename {saga-distribution => distribution}/src/release/NOTICE (100%)
rename {saga-distribution => distribution}/src/release/licenses/LICENSE-asm (100%)
rename {saga-distribution => distribution}/src/release/licenses/LICENSE-boringssl (100%)
rename {saga-distribution => distribution}/src/release/licenses/LICENSE-epl-v10 (100%)
rename {saga-distribution => distribution}/src/release/licenses/LICENSE-esotericsoftware (100%)
rename {saga-distribution => distribution}/src/release/licenses/LICENSE-javax (100%)
rename {saga-distribution => distribution}/src/release/licenses/LICENSE-logback (100%)
rename {saga-distribution => distribution}/src/release/licenses/LICENSE-ngxadmin (100%)
rename {saga-distribution => distribution}/src/release/licenses/LICENSE-openfeign (100%)
rename {saga-distribution => distribution}/src/release/licenses/LICENSE-postgresql (100%)
rename {saga-distribution => distribution}/src/release/licenses/LICENSE-protobuf (100%)
rename {saga-distribution => distribution}/src/release/licenses/LICENSE-slf4j (100%)
rename {saga-distribution => distribution}/src/release/licenses/NOTICE-grpc (100%)
rename {saga-distribution => distribution}/src/release/licenses/NOTICE-netty (100%)
rename {saga-distribution => distribution}/src/release/licenses/NOTICE-netty-tcnative (100%)
rename {saga-distribution => distribution}/src/release/licenses/NOTICE-tomcat (100%)
delete mode 100755 docs/api/api.md
delete mode 100755 docs/old_saga.md
create mode 100644 integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/CommandEnvelopeRepository.java
create mode 100644 integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/GreetingApplication.java
create mode 100644 integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/GreetingController.java
create mode 100644 integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/GreetingService.java
create mode 100644 integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/PackIT.java
create mode 100644 integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/TxEventEnvelopeRepository.java
delete mode 100644 integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/CommandEnvelopeRepository.java
delete mode 100644 integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/GreetingApplication.java
delete mode 100644 integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/GreetingController.java
delete mode 100644 integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/GreetingService.java
delete mode 100644 integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/PackIT.java
delete mode 100644 integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/TxEventEnvelopeRepository.java
create mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/AlphaClusterConfig.java
create mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/FastestSender.java
create mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/GrpcOnErrorHandler.java
create mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/LoadBalanceContext.java
create mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/LoadBalanceContextBuilder.java
create mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/LoadBalanceSenderAdapter.java
create mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/MessageSenderPicker.java
create mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/PendingTaskRunner.java
create mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/PushBackReconnectRunnable.java
create mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/ReconnectStreamObserver.java
create mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/SenderExecutor.java
create mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/TransactionType.java
create mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/GrpcCompensateStreamObserver.java
create mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/GrpcSagaClientMessageSender.java
create mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/RetryableMessageSender.java
create mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/SagaLoadBalanceSender.java
create mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/tcc/GrpcCoordinateStreamObserver.java
create mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/tcc/GrpcTccClientMessageSender.java
create mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/tcc/TccLoadBalanceSender.java
delete mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/AlphaClusterConfig.java
delete mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/FastestSender.java
delete mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/GrpcOnErrorHandler.java
delete mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/LoadBalanceContext.java
delete mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/LoadBalanceContextBuilder.java
delete mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/LoadBalanceSenderAdapter.java
delete mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/MessageSenderPicker.java
delete mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/PendingTaskRunner.java
delete mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/PushBackReconnectRunnable.java
delete mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/ReconnectStreamObserver.java
delete mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/SenderExecutor.java
delete mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/TransactionType.java
delete mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/GrpcCompensateStreamObserver.java
delete mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/GrpcSagaClientMessageSender.java
delete mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/RetryableMessageSender.java
delete mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalanceSender.java
delete mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/GrpcCoordinateStreamObserver.java
delete mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/GrpcTccClientMessageSender.java
delete mode 100644 omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/TccLoadBalanceSender.java
create mode 100644 omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/LoadBalanceContextBuilderTest.java
create mode 100644 omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/LoadBalanceSenderTestBase.java
create mode 100644 omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/PushBackReconnectRunnableTest.java
create mode 100644 omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/RetryableMessageSenderTest.java
create mode 100644 omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/SagaLoadBalanceSenderWithTLSTest.java
create mode 100644 omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/SagaLoadBalancedSenderTest.java
create mode 100644 omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/SagaLoadBalancedSenderTestBase.java
create mode 100644 omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/tcc/GrpcTccClientMessageSenderTest.java
create mode 100644 omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/tcc/MyTccEventServiceImpl.java
create mode 100644 omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java
delete mode 100644 omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalanceContextBuilderTest.java
delete mode 100644 omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalanceSenderTestBase.java
delete mode 100644 omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/PushBackReconnectRunnableTest.java
delete mode 100644 omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/RetryableMessageSenderTest.java
delete mode 100644 omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalanceSenderWithTLSTest.java
delete mode 100644 omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalancedSenderTest.java
delete mode 100644 omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalancedSenderTestBase.java
delete mode 100644 omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/GrpcTccClientMessageSenderTest.java
delete mode 100644 omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/MyTccEventServiceImpl.java
delete mode 100644 omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java
create mode 100644 omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/CallbackContext.java
create mode 100644 omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/IdGenerator.java
create mode 100644 omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/OmegaContext.java
create mode 100644 omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/ServiceConfig.java
create mode 100644 omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/UniqueIdGenerator.java
create mode 100644 omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/annotations/SagaStart.java
create mode 100644 omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/annotations/TccStart.java
delete mode 100644 omega/omega-context/src/main/java/org/apache/servicecomb/saga/omega/context/CallbackContext.java
delete mode 100644 omega/omega-context/src/main/java/org/apache/servicecomb/saga/omega/context/IdGenerator.java
delete mode 100644 omega/omega-context/src/main/java/org/apache/servicecomb/saga/omega/context/OmegaContext.java
delete mode 100644 omega/omega-context/src/main/java/org/apache/servicecomb/saga/omega/context/ServiceConfig.java
delete mode 100644 omega/omega-context/src/main/java/org/apache/servicecomb/saga/omega/context/UniqueIdGenerator.java
delete mode 100644 omega/omega-context/src/main/java/org/apache/servicecomb/saga/omega/context/annotations/SagaStart.java
delete mode 100644 omega/omega-context/src/main/java/org/apache/servicecomb/saga/omega/context/annotations/TccStart.java
create mode 100644 omega/omega-context/src/test/java/org/apache/servicecomb/pack/omega/context/OmegaContextTest.java
create mode 100644 omega/omega-context/src/test/java/org/apache/servicecomb/pack/omega/context/UniqueIdGeneratorTest.java
delete mode 100644 omega/omega-context/src/test/java/org/apache/servicecomb/saga/omega/context/OmegaContextTest.java
delete mode 100644 omega/omega-context/src/test/java/org/apache/servicecomb/saga/omega/context/UniqueIdGeneratorTest.java
create mode 100644 omega/omega-format/src/main/java/org/apache/servicecomb/pack/omega/format/KryoMessageFormat.java
create mode 100644 omega/omega-format/src/main/java/org/apache/servicecomb/pack/omega/format/MessageFormat.java
delete mode 100644 omega/omega-format/src/main/java/org/apache/servicecomb/saga/omega/format/KryoMessageFormat.java
delete mode 100644 omega/omega-format/src/main/java/org/apache/servicecomb/saga/omega/format/MessageFormat.java
create mode 100644 omega/omega-format/src/test/java/org/apache/servicecomb/pack/omega/format/KryoMessageFormatTest.java
create mode 100644 omega/omega-format/src/test/java/org/apache/servicecomb/pack/omega/format/MessageFormatTestBase.java
delete mode 100644 omega/omega-format/src/test/java/org/apache/servicecomb/saga/omega/format/KryoMessageFormatTest.java
delete mode 100644 omega/omega-format/src/test/java/org/apache/servicecomb/saga/omega/format/MessageFormatTestBase.java
create mode 100644 omega/omega-spring-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/EnableOmega.java
create mode 100644 omega/omega-spring-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/OmegaSpringConfig.java
delete mode 100644 omega/omega-spring-starter/src/main/java/org/apache/servicecomb/saga/omega/spring/EnableOmega.java
delete mode 100644 omega/omega-spring-starter/src/main/java/org/apache/servicecomb/saga/omega/spring/OmegaSpringConfig.java
create mode 100644 omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/CallbackType.java
create mode 100644 omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/CompensableAnnotationProcessor.java
create mode 100644 omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/CompensableMethodCheckingCallback.java
create mode 100644 omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/ExecutorFieldCallback.java
create mode 100644 omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/MethodCheckingCallback.java
create mode 100644 omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/ParticipateAnnotationProcessor.java
create mode 100644 omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/ParticipateMethodCheckingCallback.java
create mode 100644 omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/TransactionAspectConfig.java
create mode 100644 omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/annotations/OmegaContextAware.java
delete mode 100644 omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/CallbackType.java
delete mode 100644 omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/CompensableAnnotationProcessor.java
delete mode 100644 omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/CompensableMethodCheckingCallback.java
delete mode 100644 omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/ExecutorFieldCallback.java
delete mode 100644 omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/MethodCheckingCallback.java
delete mode 100644 omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/ParticipateAnnotationProcessor.java
delete mode 100644 omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/ParticipateMethodCheckingCallback.java
delete mode 100644 omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/TransactionAspectConfig.java
delete mode 100644 omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/annotations/OmegaContextAware.java
create mode 100644 omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/CompensableAnnotationCheckingTest.java
create mode 100644 omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/MessageConfig.java
create mode 100644 omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/MisconfiguredAnnotation.java
create mode 100644 omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/MisconfiguredRetriesService.java
create mode 100644 omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/MisconfiguredService.java
create mode 100644 omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/TccInterceptorTest.java
create mode 100644 omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/TccUserService.java
create mode 100644 omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/TccUserServiceMain.java
create mode 100644 omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/TransactionInterceptionTest.java
create mode 100644 omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/TransactionTestMain.java
create mode 100644 omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/TransactionalUserService.java
create mode 100644 omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/User.java
create mode 100644 omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/UserRepository.java
delete mode 100644 omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/CompensableAnnotationCheckingTest.java
delete mode 100644 omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/MessageConfig.java
delete mode 100644 omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/MisconfiguredAnnotation.java
delete mode 100644 omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/MisconfiguredRetriesService.java
delete mode 100644 omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/MisconfiguredService.java
delete mode 100644 omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TccInterceptorTest.java
delete mode 100644 omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TccUserService.java
delete mode 100644 omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TccUserServiceMain.java
delete mode 100644 omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TransactionInterceptionTest.java
delete mode 100644 omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TransactionTestMain.java
delete mode 100644 omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TransactionalUserService.java
delete mode 100644 omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/User.java
delete mode 100644 omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/UserRepository.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/AlphaResponse.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/CompensableInterceptor.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/CompensationMessageHandler.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/DefaultRecovery.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/EventAwareInterceptor.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/ForwardRecovery.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/MessageDeserializer.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/MessageHandler.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/MessageSender.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/MessageSerializer.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/NoOpEventAwareInterceptor.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/OmegaException.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/RecoveryPolicy.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/RecoveryPolicyFactory.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/SagaEndedEvent.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/SagaMessageSender.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/SagaStartAnnotationProcessor.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/SagaStartAspect.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/SagaStartedEvent.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/TransactionAspect.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/TxAbortedEvent.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/TxCompensatedEvent.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/TxEndedEvent.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/TxEvent.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/TxStartedEvent.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/annotations/Compensable.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/annotations/Participate.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/CoordinateMessageHandler.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/DefaultParametersContext.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/ParametersContext.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccEventService.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccMessageHandler.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccMessageSender.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccParticipatorAspect.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccStartAnnotationProcessor.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccStartAspect.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/events/CoordinatedEvent.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/events/ParticipatedEvent.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/events/TccEndedEvent.java
create mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/events/TccStartedEvent.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/AlphaResponse.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/CompensableInterceptor.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/CompensationMessageHandler.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/DefaultRecovery.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/EventAwareInterceptor.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/ForwardRecovery.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/MessageDeserializer.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/MessageHandler.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/MessageSender.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/MessageSerializer.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/NoOpEventAwareInterceptor.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/OmegaException.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/RecoveryPolicy.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/RecoveryPolicyFactory.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/SagaEndedEvent.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/SagaMessageSender.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAnnotationProcessor.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAspect.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/SagaStartedEvent.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TransactionAspect.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxAbortedEvent.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxCompensatedEvent.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxEndedEvent.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxEvent.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxStartedEvent.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/annotations/Compensable.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/annotations/Participate.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/CoordinateMessageHandler.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/DefaultParametersContext.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/ParametersContext.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccEventService.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccMessageHandler.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccMessageSender.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccParticipatorAspect.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAnnotationProcessor.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAspect.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/CoordinatedEvent.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/ParticipatedEvent.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/TccEndedEvent.java
delete mode 100644 omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/TccStartedEvent.java
create mode 100644 omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/CompensableInterceptorTest.java
create mode 100644 omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/CompensationMessageHandlerTest.java
create mode 100644 omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/DefaultRecoveryTest.java
create mode 100644 omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/ForwardRecoveryTest.java
create mode 100644 omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/SagaStartAnnotationProcessorTest.java
create mode 100644 omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/SagaStartAspectTest.java
create mode 100644 omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/TransactionAspectTest.java
create mode 100644 omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/tcc/CoordinateMessageHandlerTest.java
create mode 100644 omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccParticipatorAspectTest.java
create mode 100644 omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccStartAnnotationProcessorTest.java
create mode 100644 omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccStartAspectTest.java
delete mode 100644 omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/CompensableInterceptorTest.java
delete mode 100644 omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/CompensationMessageHandlerTest.java
delete mode 100644 omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/DefaultRecoveryTest.java
delete mode 100644 omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/ForwardRecoveryTest.java
delete mode 100644 omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAnnotationProcessorTest.java
delete mode 100644 omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAspectTest.java
delete mode 100644 omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/TransactionAspectTest.java
delete mode 100644 omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/tcc/CoordinateMessageHandlerTest.java
delete mode 100644 omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccParticipatorAspectTest.java
delete mode 100644 omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAnnotationProcessorTest.java
delete mode 100644 omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAspectTest.java
create mode 100644 omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboConsumerFilter.java
create mode 100644 omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboProviderFilter.java
delete mode 100644 omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/saga/omega/transport/dubbo/SagaDubboConsumerFilter.java
delete mode 100644 omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/saga/omega/transport/dubbo/SagaDubboProviderFilter.java
delete mode 100644 omega/omega-transport/omega-transport-dubbo/src/test/java/SagaDubboConsumerFilterTest.java
delete mode 100644 omega/omega-transport/omega-transport-dubbo/src/test/java/SagaDubboProviderFilterTest.java
create mode 100644 omega/omega-transport/omega-transport-dubbo/src/test/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboConsumerFilterTest.java
create mode 100644 omega/omega-transport/omega-transport-dubbo/src/test/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboProviderFilterTest.java
create mode 100644 omega/omega-transport/omega-transport-feign/src/main/java/org/apache/servicecomb/pack/omega/transport/feign/FeignAutoConfiguration.java
create mode 100644 omega/omega-transport/omega-transport-feign/src/main/java/org/apache/servicecomb/pack/omega/transport/feign/FeignClientRequestInterceptor.java
delete mode 100644 omega/omega-transport/omega-transport-feign/src/main/java/org/apache/servicecomb/saga/omega/transport/feign/FeignAutoConfiguration.java
delete mode 100644 omega/omega-transport/omega-transport-feign/src/main/java/org/apache/servicecomb/saga/omega/transport/feign/FeignClientRequestInterceptor.java
create mode 100644 omega/omega-transport/omega-transport-feign/src/test/java/org/apache/servicecomb/pack/omega/transport/feign/FeignAutoConfigurationTest.java
delete mode 100644 omega/omega-transport/omega-transport-feign/src/test/java/org/apache/servicecomb/saga/omega/transport/feign/FeignAutoConfigurationTest.java
create mode 100644 omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/RestTemplateConfig.java
create mode 100644 omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/TransactionClientHttpRequestInterceptor.java
create mode 100644 omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/TransactionHandlerInterceptor.java
create mode 100644 omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/WebConfig.java
delete mode 100644 omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/saga/omega/transport/resttemplate/RestTemplateConfig.java
delete mode 100644 omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/saga/omega/transport/resttemplate/TransactionClientHttpRequestInterceptor.java
delete mode 100644 omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/saga/omega/transport/resttemplate/TransactionHandlerInterceptor.java
delete mode 100644 omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/saga/omega/transport/resttemplate/WebConfig.java
create mode 100644 omega/omega-transport/omega-transport-resttemplate/src/test/java/org/apache/servicecomb/pack/omega/transport/resttemplate/TransactionClientHttpRequestInterceptorTest.java
create mode 100644 omega/omega-transport/omega-transport-resttemplate/src/test/java/org/apache/servicecomb/pack/omega/transport/resttemplate/TransactionHandlerInterceptorTest.java
delete mode 100644 omega/omega-transport/omega-transport-resttemplate/src/test/java/org/apache/servicecomb/saga/omega/transport/resttemplate/TransactionClientHttpRequestInterceptorTest.java
delete mode 100644 omega/omega-transport/omega-transport-resttemplate/src/test/java/org/apache/servicecomb/saga/omega/transport/resttemplate/TransactionHandlerInterceptorTest.java
create mode 100644 omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/pack/omega/transport/servicecomb/SagaConsumerHandler.java
create mode 100644 omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/pack/omega/transport/servicecomb/SagaProviderHandler.java
delete mode 100644 omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/saga/omega/transport/servicecomb/SagaConsumerHandler.java
delete mode 100644 omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/saga/omega/transport/servicecomb/SagaProviderHandler.java
create mode 100644 omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/pack/omega/transport/servicecomb/SagaConsumerHandlerTest.java
create mode 100644 omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/pack/omega/transport/servicecomb/SagaProviderHandlerTest.java
delete mode 100644 omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/saga/omega/transport/servicecomb/SagaConsumerHandlerTest.java
delete mode 100644 omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/saga/omega/transport/servicecomb/SagaProviderHandlerTest.java
create mode 100644 pack-common/src/main/java/org/apache/servicecomb/pack/common/EventType.java
create mode 100644 pack-common/src/main/java/org/apache/servicecomb/pack/common/TransactionStatus.java
delete mode 100644 pack-common/src/main/java/org/apache/servicecomb/saga/common/EventType.java
delete mode 100644 pack-common/src/main/java/org/apache/servicecomb/saga/common/TransactionStatus.java
create mode 100644 persistence/persistence-jpa/pom.xml
create mode 100644 persistence/persistence-jpa/src/main/java/org/apache/servicecomb/pack/persistence/jpa/EclipseLinkJpaConfiguration.java
create mode 100644 persistence/persistence-jpa/src/main/resources/META-INF/spring.factories
create mode 100644 persistence/pom.xml
delete mode 100644 saga-core-akka/pom.xml
delete mode 100644 saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/ActorBasedSaga.java
delete mode 100644 saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/ActorBasedSagaFactory.java
delete mode 100644 saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/CompletionCallbackActor.java
delete mode 100644 saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/EventContextImpl.java
delete mode 100644 saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/RequestActor.java
delete mode 100644 saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/RequestActorBuilder.java
delete mode 100644 saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/RequestActorContext.java
delete mode 100644 saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/messages/AbortMessage.java
delete mode 100644 saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/messages/AbortRecoveryMessage.java
delete mode 100644 saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/messages/CompensateMessage.java
delete mode 100644 saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/messages/CompensationRecoveryMessage.java
delete mode 100644 saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/messages/FailMessage.java
delete mode 100644 saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/messages/Message.java
delete mode 100644 saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/messages/TransactMessage.java
delete mode 100644 saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/messages/TransactionRecoveryMessage.java
delete mode 100644 saga-core-akka/src/test/java/org/apache/servicecomb/saga/core/actors/ActorBasedSagaExecutionComponentTest.java
delete mode 100644 saga-core-akka/src/test/java/org/apache/servicecomb/saga/core/actors/ActorBasedSagaIntegrationTest.java
delete mode 100644 saga-core-akka/src/test/java/org/apache/servicecomb/saga/core/actors/CompletionCallbackActorTest.java
delete mode 100644 saga-core-akka/src/test/java/org/apache/servicecomb/saga/core/actors/EventContextImplTest.java
delete mode 100644 saga-core-akka/src/test/java/org/apache/servicecomb/saga/core/actors/RequestActorBuilderTest.java
delete mode 100644 saga-core-akka/src/test/java/org/apache/servicecomb/saga/core/actors/RequestActorTest.java
delete mode 100644 saga-core-akka/src/test/resources/application.conf
delete mode 100644 saga-core-akka/src/test/resources/log4j2.xml
delete mode 100644 saga-core/pom.xml
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/BackwardRecovery.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/Compensation.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/CompensationTaskConsumer.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/CompositeSagaLog.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/CompositeSagaResponse.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/Descriptive.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/EventContext.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/EventEnvelope.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/EventStore.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/FailedSagaResponse.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/Fallback.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/FallbackPolicy.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/ForwardRecovery.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/GraphBasedSaga.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/IdGenerator.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/LoggingRecoveryPolicy.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/LongIdGenerator.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/NoOpSagaRequest.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/Operation.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/PersistentLog.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/PersistentStore.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/RecoveryPolicy.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/RequestProcessTask.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/RestOperation.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/SQLOperation.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/Saga.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaContext.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaContextImpl.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaDefinition.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaEndTask.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaEndedEvent.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaEvent.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaException.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaLog.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaRequest.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaRequestImpl.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaResponse.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaStartFailedException.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaStartTask.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaStartedEvent.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaState.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaTask.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaTaskFactory.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/SuccessfulSagaResponse.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/TaskConsumer.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/TaskRunner.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/ToJsonFormat.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/Transaction.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/TransactionAbortedEvent.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/TransactionAbortedException.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/TransactionCompensatedEvent.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/TransactionConsumer.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/TransactionEndedEvent.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/TransactionFailedException.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/TransactionStartedEvent.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/TransactionTaskConsumer.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/Transport.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/TransportFailedException.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/application/SagaExecutionComponent.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/application/SagaFactory.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/application/interpreter/FromJsonFormat.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/application/interpreter/RestRequestChecker.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/ByLevelTraveller.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/FromLeafTraversalDirection.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/FromRootTraversalDirection.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/GraphBasedSagaFactory.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/GraphBuilder.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/GraphCycleDetector.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/GraphCycleDetectorImpl.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/Node.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/SingleLeafDirectedAcyclicGraph.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/Traveller.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/TraversalDirection.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/infrastructure/ContextAwareEventStore.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/infrastructure/EmbeddedEventStore.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/transports/RestTransport.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/transports/SQLTransport.java
delete mode 100644 saga-core/src/main/java/org/apache/servicecomb/saga/transports/TransportFactory.java
delete mode 100644 saga-core/src/test/java/org/apache/servicecomb/saga/core/BackwardRecoveryTest.java
delete mode 100644 saga-core/src/test/java/org/apache/servicecomb/saga/core/CompensationImpl.java
delete mode 100644 saga-core/src/test/java/org/apache/servicecomb/saga/core/CompositeSagaLogTest.java
delete mode 100644 saga-core/src/test/java/org/apache/servicecomb/saga/core/CompositeSagaResponseTest.java
delete mode 100644 saga-core/src/test/java/org/apache/servicecomb/saga/core/DummyEvent.java
delete mode 100644 saga-core/src/test/java/org/apache/servicecomb/saga/core/FallbackPolicyTest.java
delete mode 100644 saga-core/src/test/java/org/apache/servicecomb/saga/core/ForwardRecoveryTest.java
delete mode 100644 saga-core/src/test/java/org/apache/servicecomb/saga/core/LongIdGeneratorTest.java
delete mode 100644 saga-core/src/test/java/org/apache/servicecomb/saga/core/RestOperationTest.java
delete mode 100644 saga-core/src/test/java/org/apache/servicecomb/saga/core/RetrySagaLogTest.java
delete mode 100644 saga-core/src/test/java/org/apache/servicecomb/saga/core/SagaEndTaskTest.java
delete mode 100644 saga-core/src/test/java/org/apache/servicecomb/saga/core/SagaEventMatcher.java
delete mode 100644 saga-core/src/test/java/org/apache/servicecomb/saga/core/SagaExecutionComponentTestBase.java
delete mode 100644 saga-core/src/test/java/org/apache/servicecomb/saga/core/SagaIntegrationTest.java
delete mode 100644 saga-core/src/test/java/org/apache/servicecomb/saga/core/SagaStartTaskTest.java
delete mode 100644 saga-core/src/test/java/org/apache/servicecomb/saga/core/TransactionImpl.java
delete mode 100644 saga-core/src/test/java/org/apache/servicecomb/saga/core/dag/DirectedAcyclicGraphTraversalTest.java
delete mode 100644 saga-core/src/test/java/org/apache/servicecomb/saga/core/dag/GraphBasedSagaExecutionComponentTest.java
delete mode 100644 saga-core/src/test/java/org/apache/servicecomb/saga/core/dag/GraphBuilderTest.java
delete mode 100644 saga-core/src/test/java/org/apache/servicecomb/saga/core/dag/GraphCycleDetectorTest.java
delete mode 100644 saga-core/src/test/java/org/apache/servicecomb/saga/core/dag/NodeTest.java
delete mode 100644 saga-core/src/test/java/org/apache/servicecomb/saga/infrastructure/ContextAwareEventStoreTest.java
delete mode 100644 saga-core/src/test/resources/application.conf
delete mode 100644 saga-core/src/test/resources/log4j2.xml
delete mode 100755 saga-demo/conditional-transaction-demo/README.md
delete mode 100644 saga-demo/conditional-transaction-demo/conditional-transaction-demo-tests/pom.xml
delete mode 100644 saga-demo/conditional-transaction-demo/conditional-transaction-demo-tests/src/test/java/org/apache/servicecomb/saga/demo/tests/ConditionalTransactionIT.java
delete mode 100755 saga-demo/conditional-transaction-demo/conditional-transaction-demo.sh
delete mode 100755 saga-demo/conditional-transaction-demo/docker-compose.yaml
delete mode 100644 saga-demo/conditional-transaction-demo/inventory/pom.xml
delete mode 100644 saga-demo/conditional-transaction-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/conditional/transaction/inventory/InventoryApplication.java
delete mode 100644 saga-demo/conditional-transaction-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/conditional/transaction/inventory/InventoryController.java
delete mode 100644 saga-demo/conditional-transaction-demo/inventory/src/test/java/org/apache/servicecomb/saga/demo/conditional/transaction/inventory/InventoryControllerTest.java
delete mode 100644 saga-demo/conditional-transaction-demo/membership/pom.xml
delete mode 100644 saga-demo/conditional-transaction-demo/membership/src/main/java/org/apache/servicecomb/saga/demo/conditional/transaction/membership/MembershipApplication.java
delete mode 100644 saga-demo/conditional-transaction-demo/membership/src/main/java/org/apache/servicecomb/saga/demo/conditional/transaction/membership/MembershipController.java
delete mode 100644 saga-demo/conditional-transaction-demo/payment/pom.xml
delete mode 100644 saga-demo/conditional-transaction-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/conditional/transaction/payment/PaymentApplication.java
delete mode 100644 saga-demo/conditional-transaction-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/conditional/transaction/payment/PaymentController.java
delete mode 100644 saga-demo/conditional-transaction-demo/payment/src/test/java/org/apache/servicecomb/saga/demo/conditional/transaction/payment/PaymentControllerTest.java
delete mode 100644 saga-demo/conditional-transaction-demo/pom.xml
delete mode 100644 saga-demo/conditional-transaction-demo/supplier/pom.xml
delete mode 100644 saga-demo/conditional-transaction-demo/supplier/src/main/java/org/apache/servicecomb/saga/demo/conditional/transaction/supplier/SupplierApplication.java
delete mode 100644 saga-demo/conditional-transaction-demo/supplier/src/main/java/org/apache/servicecomb/saga/demo/conditional/transaction/supplier/SupplierController.java
delete mode 100644 saga-demo/conditional-transaction-demo/supplier/src/main/resources/META-INF/LICENSE.txt
delete mode 100644 saga-demo/conditional-transaction-demo/supplier/src/main/resources/META-INF/NOTICE.txt
delete mode 100755 saga-demo/dependency-free-transaction-demo/README.md
delete mode 100644 saga-demo/dependency-free-transaction-demo/car-rental-service/pom.xml
delete mode 100644 saga-demo/dependency-free-transaction-demo/car-rental-service/src/main/java/org/apache/servicecomb/saga/demo/car/rental/CarRentalApplication.java
delete mode 100644 saga-demo/dependency-free-transaction-demo/car-rental-service/src/main/java/org/apache/servicecomb/saga/demo/car/rental/CarRentalController.java
delete mode 100644 saga-demo/dependency-free-transaction-demo/car-rental-service/src/main/resources/microservice.yaml
delete mode 100644 saga-demo/dependency-free-transaction-demo/demo-tests/pom.xml
delete mode 100644 saga-demo/dependency-free-transaction-demo/demo-tests/src/test/java/org/apache/servicecomb/saga/demo/tests/DemoIT.java
delete mode 100755 saga-demo/dependency-free-transaction-demo/dependency-free-transaction-demo.sh
delete mode 100755 saga-demo/dependency-free-transaction-demo/docker-compose.yaml
delete mode 100644 saga-demo/dependency-free-transaction-demo/flight-booking-service/pom.xml
delete mode 100644 saga-demo/dependency-free-transaction-demo/flight-booking-service/src/main/java/org/apache/servicecomb/saga/demo/flight/booking/FlightBookingApplication.java
delete mode 100644 saga-demo/dependency-free-transaction-demo/flight-booking-service/src/main/java/org/apache/servicecomb/saga/demo/flight/booking/FlightBookingController.java
delete mode 100644 saga-demo/dependency-free-transaction-demo/flight-booking-service/src/main/resources/microservice.yaml
delete mode 100644 saga-demo/dependency-free-transaction-demo/hotel-reservation-service/pom.xml
delete mode 100644 saga-demo/dependency-free-transaction-demo/hotel-reservation-service/src/main/java/org/apache/servicecomb/saga/demo/hotel/reservation/HotelReservationApplication.java
delete mode 100644 saga-demo/dependency-free-transaction-demo/hotel-reservation-service/src/main/java/org/apache/servicecomb/saga/demo/hotel/reservation/HotelReservationController.java
delete mode 100644 saga-demo/dependency-free-transaction-demo/hotel-reservation-service/src/main/resources/microservice.yaml
delete mode 100644 saga-demo/dependency-free-transaction-demo/payment-service/pom.xml
delete mode 100644 saga-demo/dependency-free-transaction-demo/payment-service/src/main/java/org/apache/servicecomb/saga/demo/payment/PaymentApplication.java
delete mode 100644 saga-demo/dependency-free-transaction-demo/payment-service/src/main/java/org/apache/servicecomb/saga/demo/payment/PaymentController.java
delete mode 100644 saga-demo/dependency-free-transaction-demo/payment-service/src/main/resources/microservice.yaml
delete mode 100644 saga-demo/dependency-free-transaction-demo/pom.xml
delete mode 100644 saga-demo/pom.xml
delete mode 100644 saga-demo/saga-dubbo-demo/pom.xml
delete mode 100644 saga-demo/saga-dubbo-demo/service-api/pom.xml
delete mode 100644 saga-demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/saga/demo/dubbo/api/IService.java
delete mode 100644 saga-demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/saga/demo/dubbo/api/IServiceA.java
delete mode 100644 saga-demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/saga/demo/dubbo/api/IServiceB.java
delete mode 100644 saga-demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/saga/demo/dubbo/api/IServiceC.java
delete mode 100644 saga-demo/saga-dubbo-demo/service-pub/pom.xml
delete mode 100644 saga-demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/saga/demo/dubbo/pub/AbsService.java
delete mode 100644 saga-demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/saga/demo/dubbo/pub/IInvokeCode.java
delete mode 100644 saga-demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/saga/demo/dubbo/pub/InvokeContext.java
delete mode 100644 saga-demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/saga/demo/dubbo/pub/ServiceVO.java
delete mode 100644 saga-demo/saga-dubbo-demo/servicea/pom.xml
delete mode 100644 saga-demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/ApplicationA.java
delete mode 100644 saga-demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/ServiceA.java
delete mode 100644 saga-demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/web/DubboDemoController.java
delete mode 100644 saga-demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/web/MvcConfigurer.java
delete mode 100644 saga-demo/saga-dubbo-demo/servicea/src/main/resources/dubbo-context.xml
delete mode 100644 saga-demo/saga-dubbo-demo/servicea/src/main/resources/log4j2.xml
delete mode 100644 saga-demo/saga-dubbo-demo/serviceb/pom.xml
delete mode 100644 saga-demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/saga/demo/dubbo/serviceb/ApplicationB.java
delete mode 100644 saga-demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/saga/demo/dubbo/serviceb/ServiceB.java
delete mode 100644 saga-demo/saga-dubbo-demo/serviceb/src/main/resources/dubbo-context.xml
delete mode 100644 saga-demo/saga-dubbo-demo/servicec/pom.xml
delete mode 100644 saga-demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicec/ApplicationC.java
delete mode 100644 saga-demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicec/ServiceC.java
delete mode 100644 saga-demo/saga-dubbo-demo/servicec/src/main/resources/dubbo-context.xml
delete mode 100644 saga-demo/saga-servicecomb-demo/pom.xml
delete mode 100644 saga-demo/saga-servicecomb-demo/scb-booking/pom.xml
delete mode 100644 saga-demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/saga/demo/scb/booking/BookingApplication.java
delete mode 100644 saga-demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/saga/demo/scb/booking/BookingController.java
delete mode 100644 saga-demo/saga-servicecomb-demo/scb-car/pom.xml
delete mode 100644 saga-demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarApplication.java
delete mode 100644 saga-demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarBooking.java
delete mode 100644 saga-demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarBookingController.java
delete mode 100644 saga-demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarBookingService.java
delete mode 100644 saga-demo/saga-servicecomb-demo/scb-hotel/pom.xml
delete mode 100644 saga-demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelApplication.java
delete mode 100644 saga-demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelBooking.java
delete mode 100644 saga-demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelBookingController.java
delete mode 100644 saga-demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelBookingService.java
delete mode 100644 saga-demo/saga-spring-demo/booking/pom.xml
delete mode 100644 saga-demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/Application.java
delete mode 100644 saga-demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/BookingController.java
delete mode 100644 saga-demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/MyConfiguration.java
delete mode 100644 saga-demo/saga-spring-demo/car/pom.xml
delete mode 100644 saga-demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/Application.java
delete mode 100644 saga-demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBooking.java
delete mode 100644 saga-demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingController.java
delete mode 100644 saga-demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingService.java
delete mode 100644 saga-demo/saga-spring-demo/hotel/pom.xml
delete mode 100644 saga-demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/Application.java
delete mode 100644 saga-demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBooking.java
delete mode 100644 saga-demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingController.java
delete mode 100644 saga-demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingService.java
delete mode 100644 saga-demo/saga-spring-demo/pom.xml
delete mode 100644 saga-demo/tcc-spring-demo/inventory/pom.xml
delete mode 100644 saga-demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/InventoryService.java
delete mode 100644 saga-demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/Product.java
delete mode 100644 saga-demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/ProductController.java
delete mode 100644 saga-demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/ProductDao.java
delete mode 100644 saga-demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/ProductOrder.java
delete mode 100644 saga-demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/TccInventoryApplication.java
delete mode 100644 saga-demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/saga/demo/pack/inventory/InventoryServiceTest.java
delete mode 100644 saga-demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/saga/demo/pack/inventory/ProductControllerTest.java
delete mode 100644 saga-demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/saga/demo/pack/inventory/TestApplication.java
delete mode 100644 saga-demo/tcc-spring-demo/ordering/pom.xml
delete mode 100644 saga-demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/saga/demo/pack/ordering/OrderingController.java
delete mode 100644 saga-demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/saga/demo/pack/ordering/TccOrderingApplication.java
delete mode 100644 saga-demo/tcc-spring-demo/payment/pom.xml
delete mode 100644 saga-demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/Account.java
delete mode 100644 saga-demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/AccountDao.java
delete mode 100644 saga-demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/Payment.java
delete mode 100644 saga-demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentController.java
delete mode 100644 saga-demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentService.java
delete mode 100644 saga-demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/TccPaymentApplication.java
delete mode 100644 saga-demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentControllerTest.java
delete mode 100644 saga-demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentServiceTest.java
delete mode 100644 saga-demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/saga/demo/pack/payment/TestApplication.java
delete mode 100644 saga-demo/tcc-spring-demo/pom.xml
delete mode 100644 saga-discovery/pom.xml
delete mode 100644 saga-discovery/saga-discovery-servicecenter/pom.xml
delete mode 100644 saga-discovery/saga-discovery-servicecenter/src/main/java/org/apache/servicecomb/saga/discovery/service/center/ServiceCenterDiscoveryConfig.java
delete mode 100644 saga-discovery/saga-discovery-servicecenter/src/main/resources/META-INF/spring.factories
delete mode 100644 saga-discovery/saga-discovery-servicecenter/src/main/resources/microservice.yaml
delete mode 100644 saga-discovery/saga-discovery-servicecenter/src/test/java/org/apache/servicecomb/saga/discovery/service/center/DummyController.java
delete mode 100644 saga-discovery/saga-discovery-servicecenter/src/test/java/org/apache/servicecomb/saga/discovery/service/center/ServiceCenterDiscoveryApplication.java
delete mode 100644 saga-discovery/saga-discovery-servicecenter/src/test/java/org/apache/servicecomb/saga/discovery/service/center/ServiceCenterDiscoveryRestTransportTest.java
delete mode 100644 saga-discovery/saga-discovery-servicecenter/src/test/resources/log4j2-test.xml
delete mode 100644 saga-discovery/saga-discovery-servicecenter/src/test/resources/registry.yaml
delete mode 100644 saga-distribution/pom.xml
delete mode 100644 saga-format/pom.xml
delete mode 100644 saga-format/src/main/java/org/apache/servicecomb/saga/core/FailedSagaRequestContext.java
delete mode 100644 saga-format/src/main/java/org/apache/servicecomb/saga/core/JacksonToJsonFormat.java
delete mode 100644 saga-format/src/main/java/org/apache/servicecomb/saga/core/SagaRequestContext.java
delete mode 100644 saga-format/src/main/java/org/apache/servicecomb/saga/core/SuccessfulSagaRequestContext.java
delete mode 100644 saga-format/src/main/java/org/apache/servicecomb/saga/format/ChildrenExtractor.java
delete mode 100644 saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonFallback.java
delete mode 100644 saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonFromJsonFormat.java
delete mode 100644 saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonRestCompensation.java
delete mode 100644 saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonRestFallback.java
delete mode 100644 saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonRestOperation.java
delete mode 100644 saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonRestTransaction.java
delete mode 100644 saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonSQLCompensation.java
delete mode 100644 saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonSQLOperation.java
delete mode 100644 saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonSQLTransaction.java
delete mode 100644 saga-format/src/main/java/org/apache/servicecomb/saga/format/JacksonSagaEventFormat.java
delete mode 100644 saga-format/src/main/java/org/apache/servicecomb/saga/format/JsonFailedSagaResponse.java
delete mode 100644 saga-format/src/main/java/org/apache/servicecomb/saga/format/JsonRestSagaRequest.java
delete mode 100644 saga-format/src/main/java/org/apache/servicecomb/saga/format/JsonSQLSagaRequest.java
delete mode 100644 saga-format/src/main/java/org/apache/servicecomb/saga/format/JsonSagaDefinition.java
delete mode 100644 saga-format/src/main/java/org/apache/servicecomb/saga/format/JsonSagaRequest.java
delete mode 100644 saga-format/src/main/java/org/apache/servicecomb/saga/format/JsonSuccessfulSagaResponse.java
delete mode 100644 saga-format/src/main/java/org/apache/servicecomb/saga/format/SagaEventFormat.java
delete mode 100644 saga-format/src/main/java/org/apache/servicecomb/saga/format/TransportAware.java
delete mode 100644 saga-format/src/test/java/org/apache/servicecomb/saga/format/ChildrenExtractorTest.java
delete mode 100644 saga-format/src/test/java/org/apache/servicecomb/saga/format/JacksonFromJsonFormatForSQLTest.java
delete mode 100644 saga-format/src/test/java/org/apache/servicecomb/saga/format/JacksonFromJsonFormatTest.java
delete mode 100644 saga-format/src/test/java/org/apache/servicecomb/saga/format/JacksonRestOperationTest.java
delete mode 100644 saga-format/src/test/java/org/apache/servicecomb/saga/format/JsonRestSagaRequestTest.java
delete mode 100644 saga-format/src/test/java/org/apache/servicecomb/saga/format/JsonSQLSagaRequestTest.java
delete mode 100644 saga-format/src/test/java/org/apache/servicecomb/saga/format/JsonSagaDefinitionTest.java
delete mode 100644 saga-format/src/test/java/org/apache/servicecomb/saga/format/SagaEventFormatTest.java
delete mode 100644 saga-persistence/pom.xml
delete mode 100644 saga-persistence/saga-persistence-jpa/pom.xml
delete mode 100644 saga-persistence/saga-persistence-jpa/src/main/java/org/apache/servicecomb/saga/persistence/jpa/EclipseLinkJpaConfiguration.java
delete mode 100644 saga-persistence/saga-persistence-jpa/src/main/resources/META-INF/spring.factories
delete mode 100755 saga-spring/pom.xml
delete mode 100644 saga-spring/src/main/java/org/apache/servicecomb/saga/spring/JpaPersistentStore.java
delete mode 100644 saga-spring/src/main/java/org/apache/servicecomb/saga/spring/SagaController.java
delete mode 100644 saga-spring/src/main/java/org/apache/servicecomb/saga/spring/SagaEventEntity.java
delete mode 100644 saga-spring/src/main/java/org/apache/servicecomb/saga/spring/SagaEventRepo.java
delete mode 100644 saga-spring/src/main/java/org/apache/servicecomb/saga/spring/SagaExecutionQueryService.java
delete mode 100644 saga-spring/src/main/java/org/apache/servicecomb/saga/spring/SagaRecoveryListener.java
delete mode 100644 saga-spring/src/main/java/org/apache/servicecomb/saga/spring/SagaShutdownListener.java
delete mode 100644 saga-spring/src/main/java/org/apache/servicecomb/saga/spring/SagaSpringApplication.java
delete mode 100644 saga-spring/src/main/java/org/apache/servicecomb/saga/spring/SagaSpringConfig.java
delete mode 100644 saga-spring/src/main/resources/META-INF/aop.xml
delete mode 100644 saga-spring/src/main/resources/META-INF/spring.factories
delete mode 100644 saga-spring/src/main/resources/application.conf
delete mode 100644 saga-spring/src/main/resources/application.yaml
delete mode 100644 saga-spring/src/main/resources/schema-postgresql.sql
delete mode 100644 saga-spring/src/test/java/org/apache/servicecomb/saga/spring/ActorBasedSagaSpringApplicationTest.java
delete mode 100644 saga-spring/src/test/java/org/apache/servicecomb/saga/spring/GraphBasedSagaSpringApplicationTest.java
delete mode 100644 saga-spring/src/test/java/org/apache/servicecomb/saga/spring/GreetingController.java
delete mode 100644 saga-spring/src/test/java/org/apache/servicecomb/saga/spring/SagaRecoveryTest.java
delete mode 100644 saga-spring/src/test/java/org/apache/servicecomb/saga/spring/SagaServiceDiscoveryTest.java
delete mode 100644 saga-spring/src/test/java/org/apache/servicecomb/saga/spring/SagaSpringApplicationTestBase.java
delete mode 100644 saga-spring/src/test/resources/data.sql
delete mode 100644 saga-spring/src/test/resources/log4j2-test.xml
delete mode 100644 saga-spring/src/test/resources/registry.yaml
delete mode 100644 saga-web/pom.xml
delete mode 100644 transports/pom.xml
delete mode 100644 transports/transport-httpclient-spring/pom.xml
delete mode 100644 transports/transport-httpclient-spring/src/main/java/org/apache/servicecomb/saga/transports/HttpClientTransportConfig.java
delete mode 100644 transports/transport-httpclient-spring/src/main/resources/META-INF/spring.factories
delete mode 100644 transports/transport-httpclient-spring/src/test/java/org/apache/servicecomb/saga/transports/RestTransportTest.java
delete mode 100644 transports/transport-httpclient-spring/src/test/resources/log4j2.xml
delete mode 100644 transports/transport-httpclient/pom.xml
delete mode 100644 transports/transport-httpclient/src/main/java/org/apache/servicecomb/saga/transports/httpclient/HttpClientTransport.java
delete mode 100644 transports/transport-httpclient/src/test/java/org/apache/servicecomb/saga/transports/httpclient/HttpClientTransportTest.java
delete mode 100644 transports/transport-httpclient/src/test/resources/log4j2.xml
delete mode 100644 transports/transport-resttemplate/pom.xml
delete mode 100644 transports/transport-resttemplate/src/main/java/org/apache/servicecomb/saga/transports/resttemplate/RestTemplateTransport.java
create mode 100644 web/pom.xml
rename {saga-web => web}/src/main/java/org/apache/servicecomb/saga/web/SagaWebApplication.java (100%)
rename {saga-web => web}/src/main/resources/application.yaml (100%)
rename {saga-web => web}/src/main/resources/microservice.yaml (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/README.md (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/angular.json (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/package.json (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@core/core.module.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@core/data/data.module.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@core/data/saga-events.service.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@core/data/state.service.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@core/module-import-guard.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@core/utils/analytics.service.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@core/utils/util.service.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/components/footer/footer.component.scss (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/components/footer/footer.component.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/components/header/header.component.html (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/components/header/header.component.scss (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/components/header/header.component.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/components/index.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/components/switcher/switcher.component.scss (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/components/switcher/switcher.component.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/components/theme-settings/theme-settings.component.scss (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/components/theme-settings/theme-settings.component.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/components/theme-switcher/theme-switcher.component.html (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/components/theme-switcher/theme-switcher.component.scss (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/components/theme-switcher/theme-switcher.component.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/components/theme-switcher/themes-switcher-list/theme-switcher-list.component.scss (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/components/theme-switcher/themes-switcher-list/themes-switcher-list.component.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/layouts/default/default.layout.scss (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/layouts/default/default.layout.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/layouts/index.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/layouts/one-column/one-column.layout.scss (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/layouts/one-column/one-column.layout.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/pipes/capitalize.pipe.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/pipes/index.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/pipes/no-sanitize.pipe.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/pipes/number-with-commas.pipe.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/pipes/plural.pipe.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/pipes/round.pipe.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/pipes/timing.pipe.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/styles/bootstrap-rtl.scss (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/styles/font-size.scss (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/styles/pace.theme.scss (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/styles/styles.scss (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/styles/theme.corporate.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/styles/theme.cosmic.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/styles/theme.default.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/styles/themes.scss (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/@theme/theme.module.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/app-routing.module.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/app.component.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/app.module.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/pages/dashboard/count-cards/count-cards.component.html (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/pages/dashboard/count-cards/count-cards.component.scss (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/pages/dashboard/count-cards/count-cards.component.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/pages/dashboard/dashboard.component.html (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/pages/dashboard/dashboard.component.scss (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/pages/dashboard/dashboard.component.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/pages/dashboard/dashboard.module.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/pages/dashboard/recent-table/recent-table.component.html (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/pages/dashboard/recent-table/recent-table.component.scss (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/pages/dashboard/recent-table/recent-table.component.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/pages/miscellaneous/miscellaneous-routing.module.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/pages/miscellaneous/miscellaneous.component.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/pages/miscellaneous/miscellaneous.module.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/pages/miscellaneous/not-found/not-found.component.html (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/pages/miscellaneous/not-found/not-found.component.scss (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/pages/miscellaneous/not-found/not-found.component.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/pages/pages-menu.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/pages/pages-routing.module.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/pages/pages.component.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/pages/pages.module.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/pages/transactions/customRender.component.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/pages/transactions/findTransaction.component.html (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/pages/transactions/findTransaction.component.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/pages/transactions/transactions.component.html (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/pages/transactions/transactions.component.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/pages/transactions/transactions.module.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/pages/transactions/transactionsTable.component.html (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/pages/transactions/transactionsTable.component.scss (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/app/pages/transactions/transactionsTable.component.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/assets/images/square_pattern.svg (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/assets/images/square_pattern_cosmic.svg (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/environments/environment.prod.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/environments/environment.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/favicon.ico (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/favicon.png (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/index.html (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/main.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/polyfills.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/tsconfig.app.json (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/src/typings.d.ts (100%)
rename {saga-web => web}/src/main/resources/saga-frontend/tsconfig.json (100%)
rename {saga-web => web}/src/main/resources/static/css/request.css (100%)
rename {saga-web => web}/src/main/resources/static/css/style.css (100%)
rename {saga-web => web}/src/main/resources/static/detail.html (100%)
rename {saga-web => web}/src/main/resources/static/index.html (100%)
rename {saga-web => web}/src/main/resources/static/js/date.js (100%)
rename {saga-web => web}/src/main/resources/static/js/request.js (100%)
rename {saga-web => web}/src/main/resources/static/js/table.js (100%)
rename {saga-web => web}/src/main/resources/static/request.html (100%)
rename {saga-web => web}/src/main/resources/static/result.html (100%)
[servicecomb-pack] 09/13: SCB-976 Updated the package name in alpha
server
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/servicecomb-pack.git
commit a54af97a65c52800b6ae684aac29b65eea600209
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Fri Dec 14 14:56:21 2018 +0800
SCB-976 Updated the package name in alpha server
---
alpha/README.md | 2 +-
.../{saga => pack}/alpha/core/AlphaException.java | 2 +-
.../{saga => pack}/alpha/core/Command.java | 6 ++---
.../alpha/core/CommandRepository.java | 2 +-
.../alpha/core/CompositeOmegaCallback.java | 2 +-
.../{saga => pack}/alpha/core/EventScanner.java | 5 ++--
.../{saga => pack}/alpha/core/OmegaCallback.java | 2 +-
.../alpha/core/PendingTaskRunner.java | 2 +-
.../alpha/core/PushBackOmegaCallback.java | 2 +-
.../{saga => pack}/alpha/core/TaskStatus.java | 2 +-
.../alpha/core/TxConsistentService.java | 2 +-
.../{saga => pack}/alpha/core/TxEvent.java | 2 +-
.../alpha/core/TxEventRepository.java | 2 +-
.../{saga => pack}/alpha/core/TxTimeout.java | 2 +-
.../alpha/core/TxTimeoutRepository.java | 2 +-
.../alpha/core/CompositeOmegaCallbackTest.java | 15 ++++++-----
.../alpha/core/PendingTaskRunnerTest.java | 2 +-
.../alpha/core/PushBackOmegaCallbackTest.java | 4 +--
.../alpha/core/TxConsistentServiceTest.java | 2 +-
.../{saga => pack}/alpha/core/TxEventMaker.java | 2 +-
.../alpha/server/AlphaApplication.java | 2 +-
.../{saga => pack}/alpha/server/AlphaConfig.java | 30 +++++++++++-----------
.../alpha/server/AlphaEventController.java | 4 +--
.../alpha/server/CommandEntityRepository.java | 8 +++---
.../alpha/server/GrpcOmegaCallback.java | 6 ++---
.../alpha/server/GrpcServerConfig.java | 2 +-
.../{saga => pack}/alpha/server/GrpcStartable.java | 2 +-
.../alpha/server/GrpcTxEventEndpointImpl.java | 8 +++---
.../alpha/server/ServerStartable.java | 2 +-
.../alpha/server/SpringCommandRepository.java | 14 +++++-----
.../alpha/server/SpringTxEventRepository.java | 6 ++---
.../alpha/server/SpringTxTimeoutRepository.java | 8 +++---
.../alpha/server/TxEventEnvelopeRepository.java | 6 ++---
.../alpha/server/TxTimeoutEntityRepository.java | 6 ++---
.../console/saga/SagaTransactionsController.java | 8 +++---
.../alpha/server/console/saga/model/Stats.java | 2 +-
.../alpha/server/tcc/AlphaTccEventController.java | 7 +++--
.../alpha/server/tcc/GrpcTccEventService.java | 10 ++++----
.../alpha/server/tcc/callback/CallbackEngine.java | 4 +--
.../server/tcc/callback/GrpcOmegaTccCallback.java | 5 ++--
.../alpha/server/tcc/callback/OmegaCallback.java | 4 +--
.../server/tcc/callback/OmegaCallbackWrapper.java | 5 ++--
.../tcc/callback/OmegaCallbacksRegistry.java | 6 ++---
.../server/tcc/callback/TccCallbackEngine.java | 9 ++++---
.../server/tcc/callback/TccPendingTaskRunner.java | 2 +-
.../alpha/server/tcc/jpa/EventConverter.java | 2 +-
.../alpha/server/tcc/jpa/GlobalTxEvent.java | 2 +-
.../server/tcc/jpa/GlobalTxEventRepository.java | 2 +-
.../alpha/server/tcc/jpa/ParticipatedEvent.java | 2 +-
.../tcc/jpa/ParticipatedEventRepository.java | 2 +-
.../alpha/server/tcc/jpa/TccTxEvent.java | 2 +-
.../server/tcc/jpa/TccTxEventDBRepository.java | 3 +--
.../alpha/server/tcc/jpa/TccTxType.java | 2 +-
.../tcc/service/MemoryTxEventRepository.java | 13 +++++-----
.../server/tcc/service/RDBTxEventRepository.java | 19 +++++++-------
.../alpha/server/tcc/service/TccEventScanner.java | 2 +-
.../server/tcc/service/TccTxEventRepository.java | 11 ++++----
.../server/tcc/service/TccTxEventService.java | 13 +++++-----
.../src/main/resources/META-INF/aop.xml | 2 +-
.../alpha/server/AlphaEventControllerTest.java | 4 +--
.../alpha/server/AlphaIntegrationTest.java | 20 +++++++--------
.../alpha/server/AlphaIntegrationWithSSLTest.java | 2 +-
.../saga/SagaTransactionsControllerTest.java | 6 ++---
.../server/tcc/AlphaTccEventControllerTest.java | 8 +++---
.../alpha/server/tcc/AlphaTccServerTestBase.java | 17 ++++++------
.../alpha/server/tcc/MemoryAlphaTccServerTest.java | 2 +-
.../alpha/server/tcc/RdbAlphaTccServerTest.java | 2 +-
.../alpha/server/tcc/TccApplication.java | 4 +--
.../alpha/server/tcc/TccCallbackEngineTest.java | 15 ++++++-----
.../alpha/server/tcc/TccConfiguration.java | 14 +++++-----
.../tcc/TccCoordinateCommandStreamObserver.java | 2 +-
.../alpha/server/tcc/jpa/EventConverterTest.java | 2 +-
.../tcc/service/MemoryEventRegistryTest.java | 6 ++---
.../server/tcc/service/TccTxEventServiceTest.java | 21 +++++++--------
.../service/TccTxEventServiceTransactionTest.java | 21 +++++++--------
.../pack/tests/CommandEnvelopeRepository.java | 2 +-
.../saga/integration/pack/tests/PackIT.java | 2 +-
.../pack/tests/TxEventEnvelopeRepository.java | 2 +-
persistence/persistence-jpa/pom.xml | 2 +-
79 files changed, 232 insertions(+), 227 deletions(-)
diff --git a/alpha/README.md b/alpha/README.md
index 6c63cb2..613aed9 100644
--- 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/src/main/java/org/apache/servicecomb/saga/alpha/core/AlphaException.java b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/AlphaException.java
similarity index 95%
rename from alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/AlphaException.java
rename to alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/AlphaException.java
index a7bb756..df91911 100644
--- a/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/AlphaException.java
+++ b/alpha/alpha-core/src/main/java/org/apache/servicecomb/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/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/Command.java b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/Command.java
similarity index 95%
rename from alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/Command.java
rename to alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/Command.java
index 6c8f370..c2890fb 100644
--- a/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/Command.java
+++ b/alpha/alpha-core/src/main/java/org/apache/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 class Command {
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/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/CommandRepository.java b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/CommandRepository.java
similarity index 95%
rename from alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/CommandRepository.java
rename to alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/CommandRepository.java
index 2bbea77..f369320 100644
--- a/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/CommandRepository.java
+++ b/alpha/alpha-core/src/main/java/org/apache/servicecomb/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/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/CompositeOmegaCallback.java b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/CompositeOmegaCallback.java
similarity index 97%
rename from alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/CompositeOmegaCallback.java
rename to alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/CompositeOmegaCallback.java
index 0da3fd4..283744c 100644
--- a/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/CompositeOmegaCallback.java
+++ b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/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/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/EventScanner.java b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/EventScanner.java
similarity index 98%
rename from alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/EventScanner.java
rename to alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/EventScanner.java
index bd4c9d0..06e7aa2 100644
--- a/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/EventScanner.java
+++ b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/EventScanner.java
@@ -15,10 +15,9 @@
* 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.pack.common.EventType.SagaEndedEvent;
import static org.apache.servicecomb.pack.common.EventType.TxAbortedEvent;
import static org.apache.servicecomb.pack.common.EventType.TxEndedEvent;
@@ -235,6 +234,6 @@ public class EventScanner implements Runnable {
event.parentTxId(),
event.type(),
event.expiryTime(),
- NEW.name());
+ TaskStatus.NEW.name());
}
}
diff --git a/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/OmegaCallback.java b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/OmegaCallback.java
similarity index 94%
rename from alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/OmegaCallback.java
rename to alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/OmegaCallback.java
index f60a44d..aab7faa 100644
--- a/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/OmegaCallback.java
+++ b/alpha/alpha-core/src/main/java/org/apache/servicecomb/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/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/PendingTaskRunner.java b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/PendingTaskRunner.java
similarity index 97%
rename from alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/PendingTaskRunner.java
rename to alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/PendingTaskRunner.java
index aafa42f..04d0260 100644
--- a/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/PendingTaskRunner.java
+++ b/alpha/alpha-core/src/main/java/org/apache/servicecomb/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/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/PushBackOmegaCallback.java b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/PushBackOmegaCallback.java
similarity index 97%
rename from alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/PushBackOmegaCallback.java
rename to alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/PushBackOmegaCallback.java
index 9556d7c..0940855 100644
--- a/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/PushBackOmegaCallback.java
+++ b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/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/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TaskStatus.java b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/TaskStatus.java
similarity index 94%
rename from alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TaskStatus.java
rename to alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/TaskStatus.java
index 442213b..c6617f2 100644
--- a/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TaskStatus.java
+++ b/alpha/alpha-core/src/main/java/org/apache/servicecomb/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/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxConsistentService.java b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/TxConsistentService.java
similarity index 97%
rename from alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxConsistentService.java
rename to alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/TxConsistentService.java
index b110501..52357ec 100644
--- a/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxConsistentService.java
+++ b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/TxConsistentService.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 org.apache.servicecomb.pack.common.EventType.SagaEndedEvent;
import static org.apache.servicecomb.pack.common.EventType.TxAbortedEvent;
diff --git a/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxEvent.java b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/TxEvent.java
similarity index 99%
rename from alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxEvent.java
rename to alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/TxEvent.java
index 17b059c..9d67259 100644
--- a/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxEvent.java
+++ b/alpha/alpha-core/src/main/java/org/apache/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/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxEventRepository.java b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/TxEventRepository.java
similarity index 98%
rename from alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxEventRepository.java
rename to alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/TxEventRepository.java
index 50c24d5..a6e3b9b 100644
--- a/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxEventRepository.java
+++ b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/TxEventRepository.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;
import java.util.Optional;
diff --git a/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxTimeout.java b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/TxTimeout.java
similarity index 98%
rename from alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxTimeout.java
rename to alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/TxTimeout.java
index 342321f..62b0f48 100644
--- a/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxTimeout.java
+++ b/alpha/alpha-core/src/main/java/org/apache/servicecomb/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/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxTimeoutRepository.java b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/TxTimeoutRepository.java
similarity index 95%
rename from alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxTimeoutRepository.java
rename to alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/TxTimeoutRepository.java
index 97387a3..a7fc88d 100644
--- a/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxTimeoutRepository.java
+++ b/alpha/alpha-core/src/main/java/org/apache/servicecomb/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;
diff --git a/alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/CompositeOmegaCallbackTest.java b/alpha/alpha-core/src/test/java/org/apache/servicecomb/pack/alpha/core/CompositeOmegaCallbackTest.java
similarity index 89%
rename from alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/CompositeOmegaCallbackTest.java
rename to alpha/alpha-core/src/test/java/org/apache/servicecomb/pack/alpha/core/CompositeOmegaCallbackTest.java
index 51d3085..c183dde 100644
--- a/alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/CompositeOmegaCallbackTest.java
+++ b/alpha/alpha-core/src/test/java/org/apache/servicecomb/pack/alpha/core/CompositeOmegaCallbackTest.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 com.seanyinx.github.unit.scaffolding.AssertUtils.expectFailing;
import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
@@ -33,6 +33,7 @@ import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.servicecomb.pack.common.EventType;
+import org.hamcrest.Matchers;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
@@ -78,8 +79,8 @@ public class CompositeOmegaCallbackTest {
verify(callback2One).compensate(event);
verify(callback2Two, never()).compensate(event);
- assertThat(callbacks.get(serviceName1).values(), containsInAnyOrder(callback1One, callback1Two));
- assertThat(callbacks.get(serviceName2).values(), containsInAnyOrder(callback2One, callback2Two));
+ assertThat(callbacks.get(serviceName1).values(), Matchers.containsInAnyOrder(callback1One, callback1Two));
+ assertThat(callbacks.get(serviceName2).values(), Matchers.containsInAnyOrder(callback2One, callback2Two));
}
@Test
@@ -94,7 +95,7 @@ public class CompositeOmegaCallbackTest {
verify(callback2One, never()).compensate(event);
verify(callback2Two).compensate(event);
- assertThat(callbacks.get(serviceName1).values(), containsInAnyOrder(callback1One, callback1Two));
+ assertThat(callbacks.get(serviceName1).values(), Matchers.containsInAnyOrder(callback1One, callback1Two));
assertThat(callbacks.get(serviceName2).values(), containsInAnyOrder(callback2Two));
}
@@ -115,7 +116,7 @@ public class CompositeOmegaCallbackTest {
verify(callback2One, never()).compensate(event);
verify(callback2Two, never()).compensate(event);
- assertThat(callbacks.get(serviceName1).values(), containsInAnyOrder(callback1One, callback1Two));
+ assertThat(callbacks.get(serviceName1).values(), Matchers.containsInAnyOrder(callback1One, callback1Two));
assertThat(callbacks.get(serviceName2).isEmpty(), is(true));
}
@@ -136,7 +137,7 @@ public class CompositeOmegaCallbackTest {
verify(callback2One, never()).compensate(event);
verify(callback2Two, never()).compensate(event);
- assertThat(callbacks.get(serviceName1).values(), containsInAnyOrder(callback1One, callback1Two));
+ assertThat(callbacks.get(serviceName1).values(), Matchers.containsInAnyOrder(callback1One, callback1Two));
assertThat(callbacks.containsKey(serviceName2), is(false));
}
@@ -152,7 +153,7 @@ public class CompositeOmegaCallbackTest {
}
assertThat(callbacks.get(serviceName1).values(), containsInAnyOrder(callback1One));
- assertThat(callbacks.get(serviceName2).values(), containsInAnyOrder(callback2One, callback2Two));
+ assertThat(callbacks.get(serviceName2).values(), Matchers.containsInAnyOrder(callback2One, callback2Two));
}
private TxEvent eventOf(String serviceName, String instanceId, EventType eventType) {
diff --git a/alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/PendingTaskRunnerTest.java b/alpha/alpha-core/src/test/java/org/apache/servicecomb/pack/alpha/core/PendingTaskRunnerTest.java
similarity index 97%
rename from alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/PendingTaskRunnerTest.java
rename to alpha/alpha-core/src/test/java/org/apache/servicecomb/pack/alpha/core/PendingTaskRunnerTest.java
index 7c3e7ba..05e0e0b 100644
--- a/alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/PendingTaskRunnerTest.java
+++ b/alpha/alpha-core/src/test/java/org/apache/servicecomb/pack/alpha/core/PendingTaskRunnerTest.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;
import static org.awaitility.Awaitility.await;
diff --git a/alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/PushBackOmegaCallbackTest.java b/alpha/alpha-core/src/test/java/org/apache/servicecomb/pack/alpha/core/PushBackOmegaCallbackTest.java
similarity index 95%
rename from alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/PushBackOmegaCallbackTest.java
rename to alpha/alpha-core/src/test/java/org/apache/servicecomb/pack/alpha/core/PushBackOmegaCallbackTest.java
index 521232c..4d0676c 100644
--- a/alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/PushBackOmegaCallbackTest.java
+++ b/alpha/alpha-core/src/test/java/org/apache/servicecomb/pack/alpha/core/PushBackOmegaCallbackTest.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.core;
+package org.apache.servicecomb.pack.alpha.core;
-import static org.apache.servicecomb.saga.alpha.core.TxEventMaker.someEvent;
+import static org.apache.servicecomb.pack.alpha.core.TxEventMaker.someEvent;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.doThrow;
diff --git a/alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/TxConsistentServiceTest.java b/alpha/alpha-core/src/test/java/org/apache/servicecomb/pack/alpha/core/TxConsistentServiceTest.java
similarity index 99%
rename from alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/TxConsistentServiceTest.java
rename to alpha/alpha-core/src/test/java/org/apache/servicecomb/pack/alpha/core/TxConsistentServiceTest.java
index 03fd43d..2c9a3b5 100644
--- a/alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/TxConsistentServiceTest.java
+++ b/alpha/alpha-core/src/test/java/org/apache/servicecomb/pack/alpha/core/TxConsistentServiceTest.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 com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
import static java.util.Collections.emptyList;
diff --git a/alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/TxEventMaker.java b/alpha/alpha-core/src/test/java/org/apache/servicecomb/pack/alpha/core/TxEventMaker.java
similarity index 96%
rename from alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/TxEventMaker.java
rename to alpha/alpha-core/src/test/java/org/apache/servicecomb/pack/alpha/core/TxEventMaker.java
index 1c00e3e..3a1734a 100644
--- a/alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/TxEventMaker.java
+++ b/alpha/alpha-core/src/test/java/org/apache/servicecomb/pack/alpha/core/TxEventMaker.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 com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
import static org.apache.servicecomb.pack.common.EventType.TxStartedEvent;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaApplication.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/AlphaApplication.java
similarity index 96%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaApplication.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/AlphaApplication.java
index 72bf5fb..ba8d1fc 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaApplication.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/AlphaApplication.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server;
+package org.apache.servicecomb.pack.alpha.server;
import javax.annotation.PreDestroy;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaConfig.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/AlphaConfig.java
similarity index 84%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaConfig.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/AlphaConfig.java
index 47feb1f..7ba3343 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaConfig.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/AlphaConfig.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server;
+package org.apache.servicecomb.pack.alpha.server;
import java.util.Map;
import java.util.concurrent.BlockingQueue;
@@ -25,19 +25,19 @@ import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ScheduledExecutorService;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
-import org.apache.servicecomb.saga.alpha.core.CommandRepository;
-import org.apache.servicecomb.saga.alpha.core.CompositeOmegaCallback;
-import org.apache.servicecomb.saga.alpha.core.EventScanner;
-import org.apache.servicecomb.saga.alpha.core.OmegaCallback;
-import org.apache.servicecomb.saga.alpha.core.PendingTaskRunner;
-import org.apache.servicecomb.saga.alpha.core.PushBackOmegaCallback;
-import org.apache.servicecomb.saga.alpha.core.TxConsistentService;
-import org.apache.servicecomb.saga.alpha.core.TxEventRepository;
-import org.apache.servicecomb.saga.alpha.core.TxTimeoutRepository;
-import org.apache.servicecomb.saga.alpha.server.tcc.GrpcTccEventService;
-import org.apache.servicecomb.saga.alpha.server.tcc.callback.TccPendingTaskRunner;
-import org.apache.servicecomb.saga.alpha.server.tcc.service.TccEventScanner;
-import org.apache.servicecomb.saga.alpha.server.tcc.service.TccTxEventService;
+import org.apache.servicecomb.pack.alpha.core.CommandRepository;
+import org.apache.servicecomb.pack.alpha.core.CompositeOmegaCallback;
+import org.apache.servicecomb.pack.alpha.core.EventScanner;
+import org.apache.servicecomb.pack.alpha.core.OmegaCallback;
+import org.apache.servicecomb.pack.alpha.core.PendingTaskRunner;
+import org.apache.servicecomb.pack.alpha.core.PushBackOmegaCallback;
+import org.apache.servicecomb.pack.alpha.core.TxConsistentService;
+import org.apache.servicecomb.pack.alpha.core.TxEventRepository;
+import org.apache.servicecomb.pack.alpha.core.TxTimeoutRepository;
+import org.apache.servicecomb.pack.alpha.server.tcc.GrpcTccEventService;
+import org.apache.servicecomb.pack.alpha.server.tcc.callback.TccPendingTaskRunner;
+import org.apache.servicecomb.pack.alpha.server.tcc.service.TccEventScanner;
+import org.apache.servicecomb.pack.alpha.server.tcc.service.TccTxEventService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
@@ -45,7 +45,7 @@ import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-@EntityScan(basePackages = "org.apache.servicecomb.saga.alpha")
+@EntityScan(basePackages = "org.apache.servicecomb.pack.alpha")
@Configuration
class AlphaConfig {
private static final Logger LOG = LoggerFactory.getLogger(AlphaConfig.class);
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaEventController.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/AlphaEventController.java
similarity index 96%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaEventController.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/AlphaEventController.java
index 8c73a57..0303ead 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaEventController.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/AlphaEventController.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server;
+package org.apache.servicecomb.pack.alpha.server;
import java.lang.invoke.MethodHandles;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
-import org.apache.servicecomb.saga.alpha.core.TxEvent;
+import org.apache.servicecomb.pack.alpha.core.TxEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Profile;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/CommandEntityRepository.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/CommandEntityRepository.java
similarity index 92%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/CommandEntityRepository.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/CommandEntityRepository.java
index 53110bf..60fd28b 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/CommandEntityRepository.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/CommandEntityRepository.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server;
+package org.apache.servicecomb.pack.alpha.server;
import java.util.List;
import javax.persistence.LockModeType;
import javax.transaction.Transactional;
-import org.apache.servicecomb.saga.alpha.core.Command;
+import org.apache.servicecomb.pack.alpha.core.Command;
import org.springframework.data.jpa.repository.Lock;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
@@ -33,7 +33,7 @@ public interface CommandEntityRepository extends CrudRepository<Command, Long> {
@Transactional
@Modifying(clearAutomatically = true)
- @Query("UPDATE org.apache.servicecomb.saga.alpha.core.Command c "
+ @Query("UPDATE org.apache.servicecomb.pack.alpha.core.Command c "
+ "SET c.status = :toStatus "
+ "WHERE c.globalTxId = :globalTxId "
+ " AND c.localTxId = :localTxId "
@@ -46,7 +46,7 @@ public interface CommandEntityRepository extends CrudRepository<Command, Long> {
@Transactional
@Modifying(clearAutomatically = true)
- @Query("UPDATE org.apache.servicecomb.saga.alpha.core.Command c "
+ @Query("UPDATE org.apache.servicecomb.pack.alpha.core.Command c "
+ "SET c.status = :status "
+ "WHERE c.globalTxId = :globalTxId "
+ " AND c.localTxId = :localTxId")
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcOmegaCallback.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/GrpcOmegaCallback.java
similarity index 91%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcOmegaCallback.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/GrpcOmegaCallback.java
index c477e41..97b7b61 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcOmegaCallback.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/GrpcOmegaCallback.java
@@ -18,10 +18,10 @@
*
*/
-package org.apache.servicecomb.saga.alpha.server;
+package org.apache.servicecomb.pack.alpha.server;
-import org.apache.servicecomb.saga.alpha.core.OmegaCallback;
-import org.apache.servicecomb.saga.alpha.core.TxEvent;
+import org.apache.servicecomb.pack.alpha.core.OmegaCallback;
+import org.apache.servicecomb.pack.alpha.core.TxEvent;
import org.apache.servicecomb.pack.contract.grpc.GrpcCompensateCommand;
import com.google.protobuf.ByteString;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcServerConfig.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/GrpcServerConfig.java
similarity index 97%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcServerConfig.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/GrpcServerConfig.java
index e1368c4..4e96783 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcServerConfig.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/GrpcServerConfig.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server;
+package org.apache.servicecomb.pack.alpha.server;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcStartable.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/GrpcStartable.java
similarity index 98%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcStartable.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/GrpcStartable.java
index a599967..5941ae3 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcStartable.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/GrpcStartable.java
@@ -18,7 +18,7 @@
*
*/
-package org.apache.servicecomb.saga.alpha.server;
+package org.apache.servicecomb.pack.alpha.server;
import java.io.IOException;
import java.io.InputStream;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcTxEventEndpointImpl.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/GrpcTxEventEndpointImpl.java
similarity index 94%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcTxEventEndpointImpl.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/GrpcTxEventEndpointImpl.java
index 72a72f1..a229892 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcTxEventEndpointImpl.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/GrpcTxEventEndpointImpl.java
@@ -18,7 +18,7 @@
*
*/
-package org.apache.servicecomb.saga.alpha.server;
+package org.apache.servicecomb.pack.alpha.server;
import static java.util.Collections.emptyMap;
@@ -28,9 +28,9 @@ import java.util.concurrent.ConcurrentHashMap;
import kamon.annotation.EnableKamon;
import kamon.annotation.Trace;
-import org.apache.servicecomb.saga.alpha.core.OmegaCallback;
-import org.apache.servicecomb.saga.alpha.core.TxConsistentService;
-import org.apache.servicecomb.saga.alpha.core.TxEvent;
+import org.apache.servicecomb.pack.alpha.core.OmegaCallback;
+import org.apache.servicecomb.pack.alpha.core.TxConsistentService;
+import org.apache.servicecomb.pack.alpha.core.TxEvent;
import org.apache.servicecomb.pack.contract.grpc.GrpcAck;
import org.apache.servicecomb.pack.contract.grpc.GrpcCompensateCommand;
import org.apache.servicecomb.pack.contract.grpc.GrpcServiceConfig;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/ServerStartable.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/ServerStartable.java
similarity index 94%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/ServerStartable.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/ServerStartable.java
index 41dfdbd..9024bf4 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/ServerStartable.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/ServerStartable.java
@@ -18,7 +18,7 @@
*
*/
-package org.apache.servicecomb.saga.alpha.server;
+package org.apache.servicecomb.pack.alpha.server;
public interface ServerStartable {
void start();
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/SpringCommandRepository.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/SpringCommandRepository.java
similarity index 89%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/SpringCommandRepository.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/SpringCommandRepository.java
index f7078c2..e9755b3 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/SpringCommandRepository.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/SpringCommandRepository.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server;
+package org.apache.servicecomb.pack.alpha.server;
-import static org.apache.servicecomb.saga.alpha.core.TaskStatus.DONE;
-import static org.apache.servicecomb.saga.alpha.core.TaskStatus.NEW;
-import static org.apache.servicecomb.saga.alpha.core.TaskStatus.PENDING;
+import static org.apache.servicecomb.pack.alpha.core.TaskStatus.DONE;
+import static org.apache.servicecomb.pack.alpha.core.TaskStatus.NEW;
+import static org.apache.servicecomb.pack.alpha.core.TaskStatus.PENDING;
import java.lang.invoke.MethodHandles;
import java.util.LinkedHashMap;
@@ -28,9 +28,9 @@ import java.util.Map;
import javax.transaction.Transactional;
-import org.apache.servicecomb.saga.alpha.core.Command;
-import org.apache.servicecomb.saga.alpha.core.CommandRepository;
-import org.apache.servicecomb.saga.alpha.core.TxEvent;
+import org.apache.servicecomb.pack.alpha.core.Command;
+import org.apache.servicecomb.pack.alpha.core.CommandRepository;
+import org.apache.servicecomb.pack.alpha.core.TxEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/SpringTxEventRepository.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/SpringTxEventRepository.java
similarity index 95%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/SpringTxEventRepository.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/SpringTxEventRepository.java
index 7ddc923..173125d 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/SpringTxEventRepository.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/SpringTxEventRepository.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server;
+package org.apache.servicecomb.pack.alpha.server;
import static org.apache.servicecomb.pack.common.EventType.TxCompensatedEvent;
import java.util.List;
import java.util.Optional;
-import org.apache.servicecomb.saga.alpha.core.TxEvent;
-import org.apache.servicecomb.saga.alpha.core.TxEventRepository;
+import org.apache.servicecomb.pack.alpha.core.TxEvent;
+import org.apache.servicecomb.pack.alpha.core.TxEventRepository;
import org.springframework.data.domain.PageRequest;
import kamon.annotation.EnableKamon;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/SpringTxTimeoutRepository.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/SpringTxTimeoutRepository.java
similarity index 90%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/SpringTxTimeoutRepository.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/SpringTxTimeoutRepository.java
index 6b756b5..8966616 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/SpringTxTimeoutRepository.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/SpringTxTimeoutRepository.java
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server;
+package org.apache.servicecomb.pack.alpha.server;
-import static org.apache.servicecomb.saga.alpha.core.TaskStatus.PENDING;
+import static org.apache.servicecomb.pack.alpha.core.TaskStatus.PENDING;
import java.lang.invoke.MethodHandles;
import java.util.List;
import javax.transaction.Transactional;
-import org.apache.servicecomb.saga.alpha.core.TxTimeout;
-import org.apache.servicecomb.saga.alpha.core.TxTimeoutRepository;
+import org.apache.servicecomb.pack.alpha.core.TxTimeout;
+import org.apache.servicecomb.pack.alpha.core.TxTimeoutRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.data.domain.PageRequest;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/TxEventEnvelopeRepository.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/TxEventEnvelopeRepository.java
similarity index 98%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/TxEventEnvelopeRepository.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/TxEventEnvelopeRepository.java
index ebb7610..6e84383 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/TxEventEnvelopeRepository.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/TxEventEnvelopeRepository.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server;
+package org.apache.servicecomb.pack.alpha.server;
import java.util.List;
import java.util.Optional;
import javax.transaction.Transactional;
-import org.apache.servicecomb.saga.alpha.core.TxEvent;
+import org.apache.servicecomb.pack.alpha.core.TxEvent;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
@@ -64,7 +64,7 @@ public interface TxEventEnvelopeRepository extends CrudRepository<TxEvent, Long>
+ " AND t.type = 'TxStartedEvent'")
Optional<TxEvent> findFirstStartedEventByGlobalTxIdAndLocalTxId(String globalTxId, String localTxId);
- @Query("SELECT DISTINCT new org.apache.servicecomb.saga.alpha.core.TxEvent("
+ @Query("SELECT DISTINCT new org.apache.servicecomb.pack.alpha.core.TxEvent("
+ "t.serviceName, t.instanceId, t.globalTxId, t.localTxId, t.parentTxId, "
+ "t.type, t.compensationMethod, t.payloads "
+ ") FROM TxEvent t "
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/TxTimeoutEntityRepository.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/TxTimeoutEntityRepository.java
similarity index 93%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/TxTimeoutEntityRepository.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/TxTimeoutEntityRepository.java
index f0e264a..1584952 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/TxTimeoutEntityRepository.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/TxTimeoutEntityRepository.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server;
+package org.apache.servicecomb.pack.alpha.server;
import java.util.List;
import javax.persistence.LockModeType;
import javax.transaction.Transactional;
-import org.apache.servicecomb.saga.alpha.core.TxTimeout;
+import org.apache.servicecomb.pack.alpha.core.TxTimeout;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.Lock;
import org.springframework.data.jpa.repository.Modifying;
@@ -34,7 +34,7 @@ interface TxTimeoutEntityRepository extends CrudRepository<TxTimeout, Long> {
@Transactional
@Modifying(clearAutomatically = true)
- @Query("UPDATE org.apache.servicecomb.saga.alpha.core.TxTimeout t "
+ @Query("UPDATE org.apache.servicecomb.pack.alpha.core.TxTimeout t "
+ "SET t.status = :status "
+ "WHERE t.globalTxId = :globalTxId "
+ " AND t.localTxId = :localTxId")
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/console/saga/SagaTransactionsController.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/console/saga/SagaTransactionsController.java
similarity index 97%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/console/saga/SagaTransactionsController.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/console/saga/SagaTransactionsController.java
index bafb25d..b4675d2 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/console/saga/SagaTransactionsController.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/console/saga/SagaTransactionsController.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.console.saga;
+package org.apache.servicecomb.pack.alpha.server.console.saga;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import kamon.annotation.EnableKamon;
import kamon.annotation.Trace;
-import org.apache.servicecomb.saga.alpha.core.TxEvent;
-import org.apache.servicecomb.saga.alpha.server.TxEventEnvelopeRepository;
-import org.apache.servicecomb.saga.alpha.server.console.saga.model.Stats;
+import org.apache.servicecomb.pack.alpha.core.TxEvent;
+import org.apache.servicecomb.pack.alpha.server.TxEventEnvelopeRepository;
+import org.apache.servicecomb.pack.alpha.server.console.saga.model.Stats;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.data.domain.PageRequest;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/console/saga/model/Stats.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/console/saga/model/Stats.java
similarity index 97%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/console/saga/model/Stats.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/console/saga/model/Stats.java
index d2ed520..a4a0a6a 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/console/saga/model/Stats.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/console/saga/model/Stats.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.console.saga.model;
+package org.apache.servicecomb.pack.alpha.server.console.saga.model;
import java.util.Date;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/AlphaTccEventController.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/AlphaTccEventController.java
similarity index 91%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/AlphaTccEventController.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/AlphaTccEventController.java
index 8c62f45..0b0d5f9 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/AlphaTccEventController.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/AlphaTccEventController.java
@@ -15,16 +15,15 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.tcc;
+package org.apache.servicecomb.pack.alpha.server.tcc;
import java.lang.invoke.MethodHandles;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxEvent;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxEventDBRepository;
-import org.apache.servicecomb.saga.alpha.server.tcc.service.TccTxEventRepository;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.TccTxEvent;
+import org.apache.servicecomb.pack.alpha.server.tcc.service.TccTxEventRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Profile;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/GrpcTccEventService.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/GrpcTccEventService.java
similarity index 94%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/GrpcTccEventService.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/GrpcTccEventService.java
index d2e555e..d92c55a 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/GrpcTccEventService.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/GrpcTccEventService.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.tcc;
+package org.apache.servicecomb.pack.alpha.server.tcc;
import io.grpc.stub.StreamObserver;
import java.lang.invoke.MethodHandles;
-import org.apache.servicecomb.saga.alpha.server.tcc.callback.OmegaCallback;
-import org.apache.servicecomb.saga.alpha.server.tcc.callback.OmegaCallbacksRegistry;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.EventConverter;
-import org.apache.servicecomb.saga.alpha.server.tcc.service.TccTxEventService;
+import org.apache.servicecomb.pack.alpha.server.tcc.callback.OmegaCallback;
+import org.apache.servicecomb.pack.alpha.server.tcc.callback.OmegaCallbacksRegistry;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.EventConverter;
+import org.apache.servicecomb.pack.alpha.server.tcc.service.TccTxEventService;
import org.apache.servicecomb.pack.contract.grpc.GrpcAck;
import org.apache.servicecomb.pack.contract.grpc.GrpcServiceConfig;
import org.apache.servicecomb.pack.contract.grpc.GrpcTccCoordinateCommand;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/CallbackEngine.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/callback/CallbackEngine.java
similarity index 87%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/CallbackEngine.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/callback/CallbackEngine.java
index f262f52..5aaa4f0 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/CallbackEngine.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/callback/CallbackEngine.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.tcc.callback;
+package org.apache.servicecomb.pack.alpha.server.tcc.callback;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.GlobalTxEvent;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.GlobalTxEvent;
public interface CallbackEngine {
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/GrpcOmegaTccCallback.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/callback/GrpcOmegaTccCallback.java
similarity index 93%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/GrpcOmegaTccCallback.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/callback/GrpcOmegaTccCallback.java
index e155c71..3de4966 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/GrpcOmegaTccCallback.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/callback/GrpcOmegaTccCallback.java
@@ -15,10 +15,11 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.tcc.callback;
+package org.apache.servicecomb.pack.alpha.server.tcc.callback;
import io.grpc.stub.StreamObserver;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.ParticipatedEvent;
+
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.ParticipatedEvent;
import org.apache.servicecomb.pack.common.TransactionStatus;
import org.apache.servicecomb.pack.contract.grpc.GrpcTccCoordinateCommand;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/OmegaCallback.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/callback/OmegaCallback.java
similarity index 88%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/OmegaCallback.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/callback/OmegaCallback.java
index c9f7cb5..7d57d8e 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/OmegaCallback.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/callback/OmegaCallback.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.tcc.callback;
+package org.apache.servicecomb.pack.alpha.server.tcc.callback;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.ParticipatedEvent;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.ParticipatedEvent;
import org.apache.servicecomb.pack.common.TransactionStatus;
public interface OmegaCallback {
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/OmegaCallbackWrapper.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/callback/OmegaCallbackWrapper.java
similarity index 93%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/OmegaCallbackWrapper.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/callback/OmegaCallbackWrapper.java
index 071151c..fb5d37f 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/OmegaCallbackWrapper.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/callback/OmegaCallbackWrapper.java
@@ -15,10 +15,11 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.tcc.callback;
+package org.apache.servicecomb.pack.alpha.server.tcc.callback;
import java.util.concurrent.BlockingQueue;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.ParticipatedEvent;
+
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.ParticipatedEvent;
import org.apache.servicecomb.pack.common.TransactionStatus;
import org.springframework.stereotype.Component;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/OmegaCallbacksRegistry.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/callback/OmegaCallbacksRegistry.java
similarity index 92%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/OmegaCallbacksRegistry.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/callback/OmegaCallbacksRegistry.java
index bf8bc21..61a509c 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/OmegaCallbacksRegistry.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/callback/OmegaCallbacksRegistry.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.tcc.callback;
+package org.apache.servicecomb.pack.alpha.server.tcc.callback;
import static java.util.Collections.emptyMap;
@@ -23,9 +23,7 @@ import io.grpc.stub.StreamObserver;
import java.lang.invoke.MethodHandles;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.servicecomb.saga.alpha.core.AlphaException;
-import org.apache.servicecomb.saga.alpha.server.tcc.callback.GrpcOmegaTccCallback;
-import org.apache.servicecomb.saga.alpha.server.tcc.callback.OmegaCallback;
+import org.apache.servicecomb.pack.alpha.core.AlphaException;
import org.apache.servicecomb.pack.contract.grpc.GrpcServiceConfig;
import org.apache.servicecomb.pack.contract.grpc.GrpcTccCoordinateCommand;
import org.slf4j.Logger;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/TccCallbackEngine.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/callback/TccCallbackEngine.java
similarity index 90%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/TccCallbackEngine.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/callback/TccCallbackEngine.java
index 55eccca..8c65f40 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/TccCallbackEngine.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/callback/TccCallbackEngine.java
@@ -15,13 +15,14 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.tcc.callback;
+package org.apache.servicecomb.pack.alpha.server.tcc.callback;
import java.lang.invoke.MethodHandles;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.GlobalTxEvent;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.ParticipatedEvent;
-import org.apache.servicecomb.saga.alpha.server.tcc.service.TccTxEventRepository;
+
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.ParticipatedEvent;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.GlobalTxEvent;
+import org.apache.servicecomb.pack.alpha.server.tcc.service.TccTxEventRepository;
import org.apache.servicecomb.pack.common.TransactionStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/TccPendingTaskRunner.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/callback/TccPendingTaskRunner.java
similarity index 96%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/TccPendingTaskRunner.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/callback/TccPendingTaskRunner.java
index b847f65..a248e04 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/TccPendingTaskRunner.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/callback/TccPendingTaskRunner.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.tcc.callback;
+package org.apache.servicecomb.pack.alpha.server.tcc.callback;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/EventConverter.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/EventConverter.java
similarity index 98%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/EventConverter.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/EventConverter.java
index d8cd0d4..179e70a 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/EventConverter.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/EventConverter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.tcc.jpa;
+package org.apache.servicecomb.pack.alpha.server.tcc.jpa;
import org.apache.servicecomb.pack.common.TransactionStatus;
import org.apache.servicecomb.pack.contract.grpc.GrpcTccCoordinatedEvent;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/GlobalTxEvent.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/GlobalTxEvent.java
similarity index 98%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/GlobalTxEvent.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/GlobalTxEvent.java
index 451e88e..96c8055 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/GlobalTxEvent.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/GlobalTxEvent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.tcc.jpa;
+package org.apache.servicecomb.pack.alpha.server.tcc.jpa;
import java.util.Date;
import java.util.Objects;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/GlobalTxEventRepository.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/GlobalTxEventRepository.java
similarity index 97%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/GlobalTxEventRepository.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/GlobalTxEventRepository.java
index 8c3023b..3dc172d 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/GlobalTxEventRepository.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/GlobalTxEventRepository.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.tcc.jpa;
+package org.apache.servicecomb.pack.alpha.server.tcc.jpa;
import java.util.Date;
import java.util.List;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/ParticipatedEvent.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/ParticipatedEvent.java
similarity index 98%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/ParticipatedEvent.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/ParticipatedEvent.java
index b0868c5..e669c4e 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/ParticipatedEvent.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/ParticipatedEvent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.tcc.jpa;
+package org.apache.servicecomb.pack.alpha.server.tcc.jpa;
import java.util.Date;
import java.util.Objects;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/ParticipatedEventRepository.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/ParticipatedEventRepository.java
similarity index 96%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/ParticipatedEventRepository.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/ParticipatedEventRepository.java
index b43aaa6..c9f1106 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/ParticipatedEventRepository.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/ParticipatedEventRepository.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.tcc.jpa;
+package org.apache.servicecomb.pack.alpha.server.tcc.jpa;
import java.util.List;
import java.util.Optional;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/TccTxEvent.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/TccTxEvent.java
similarity index 98%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/TccTxEvent.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/TccTxEvent.java
index e1d9654..af06a0e 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/TccTxEvent.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/TccTxEvent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.tcc.jpa;
+package org.apache.servicecomb.pack.alpha.server.tcc.jpa;
import java.util.Date;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/TccTxEventDBRepository.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/TccTxEventDBRepository.java
similarity index 91%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/TccTxEventDBRepository.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/TccTxEventDBRepository.java
index 172a554..4b865dc 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/TccTxEventDBRepository.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/TccTxEventDBRepository.java
@@ -15,12 +15,11 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.tcc.jpa;
+package org.apache.servicecomb.pack.alpha.server.tcc.jpa;
import java.util.List;
import java.util.Optional;
-import org.apache.servicecomb.saga.alpha.server.tcc.service.TccTxEventRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.CrudRepository;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/TccTxType.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/TccTxType.java
similarity index 93%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/TccTxType.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/TccTxType.java
index b1527d3..c8007ec 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/TccTxType.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/TccTxType.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.tcc.jpa;
+package org.apache.servicecomb.pack.alpha.server.tcc.jpa;
public enum TccTxType {
STARTED,
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/service/MemoryTxEventRepository.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/service/MemoryTxEventRepository.java
similarity index 91%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/service/MemoryTxEventRepository.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/service/MemoryTxEventRepository.java
index 3bdd873..9130911 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/service/MemoryTxEventRepository.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/service/MemoryTxEventRepository.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.tcc.service;
+package org.apache.servicecomb.pack.alpha.server.tcc.service;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
@@ -27,11 +27,12 @@ import java.util.Optional;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.EventConverter;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.GlobalTxEvent;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.ParticipatedEvent;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxEvent;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxType;
+
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.EventConverter;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.GlobalTxEvent;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.ParticipatedEvent;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.TccTxEvent;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.TccTxType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Profile;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/service/RDBTxEventRepository.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/service/RDBTxEventRepository.java
similarity index 87%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/service/RDBTxEventRepository.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/service/RDBTxEventRepository.java
index 9e24a36..b48e984 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/service/RDBTxEventRepository.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/service/RDBTxEventRepository.java
@@ -15,19 +15,20 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.tcc.service;
+package org.apache.servicecomb.pack.alpha.server.tcc.service;
import java.util.Date;
import java.util.List;
import java.util.Optional;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.EventConverter;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.GlobalTxEvent;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.GlobalTxEventRepository;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.ParticipatedEvent;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.ParticipatedEventRepository;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxEvent;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxEventDBRepository;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxType;
+
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.EventConverter;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.GlobalTxEvent;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.GlobalTxEventRepository;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.ParticipatedEvent;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.ParticipatedEventRepository;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.TccTxEvent;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.TccTxEventDBRepository;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.TccTxType;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Profile;
import org.springframework.data.domain.Pageable;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccEventScanner.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/service/TccEventScanner.java
similarity index 97%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccEventScanner.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/service/TccEventScanner.java
index f5c930f..5812414 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccEventScanner.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/service/TccEventScanner.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.tcc.service;
+package org.apache.servicecomb.pack.alpha.server.tcc.service;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.SECONDS;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventRepository.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/service/TccTxEventRepository.java
similarity index 84%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventRepository.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/service/TccTxEventRepository.java
index ebc19ce..f7afccc 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventRepository.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/service/TccTxEventRepository.java
@@ -15,15 +15,16 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.tcc.service;
+package org.apache.servicecomb.pack.alpha.server.tcc.service;
import java.util.Date;
import java.util.List;
import java.util.Optional;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.GlobalTxEvent;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.ParticipatedEvent;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxEvent;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxType;
+
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.GlobalTxEvent;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.ParticipatedEvent;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.TccTxEvent;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.TccTxType;
import org.springframework.data.domain.Pageable;
public interface TccTxEventRepository {
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventService.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/service/TccTxEventService.java
similarity index 93%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventService.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/service/TccTxEventService.java
index f4c02bf..99a6083 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventService.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/service/TccTxEventService.java
@@ -15,15 +15,16 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.tcc.service;
+package org.apache.servicecomb.pack.alpha.server.tcc.service;
import java.lang.invoke.MethodHandles;
import java.util.Date;
-import org.apache.servicecomb.saga.alpha.server.tcc.callback.TccCallbackEngine;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.GlobalTxEvent;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.ParticipatedEvent;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxEvent;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxType;
+
+import org.apache.servicecomb.pack.alpha.server.tcc.callback.TccCallbackEngine;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.GlobalTxEvent;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.ParticipatedEvent;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.TccTxEvent;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.TccTxType;
import org.apache.servicecomb.pack.common.TransactionStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/alpha/alpha-server/src/main/resources/META-INF/aop.xml b/alpha/alpha-server/src/main/resources/META-INF/aop.xml
index c481036..ff93fd9 100644
--- a/alpha/alpha-server/src/main/resources/META-INF/aop.xml
+++ b/alpha/alpha-server/src/main/resources/META-INF/aop.xml
@@ -19,7 +19,7 @@
<aspectj>
<weaver options="-Xlint:ignore">
- <include within="org.apache.servicecomb.saga..*"/>
+ <include within="org.apache.servicecomb.pack..*"/>
<exclude within="org.aspectj.*"/>
</weaver>
</aspectj>
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/AlphaEventControllerTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/AlphaEventControllerTest.java
similarity index 96%
rename from alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/AlphaEventControllerTest.java
rename to alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/AlphaEventControllerTest.java
index 8128eb8..d600563 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/AlphaEventControllerTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/AlphaEventControllerTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server;
+package org.apache.servicecomb.pack.alpha.server;
import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
import static java.util.Collections.singletonList;
@@ -29,7 +29,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
import java.util.UUID;
-import org.apache.servicecomb.saga.alpha.core.TxEvent;
+import org.apache.servicecomb.pack.alpha.core.TxEvent;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/AlphaIntegrationTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/AlphaIntegrationTest.java
similarity index 97%
rename from alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/AlphaIntegrationTest.java
rename to alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/AlphaIntegrationTest.java
index 04c51df..51c9ce7 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/AlphaIntegrationTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/AlphaIntegrationTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server;
+package org.apache.servicecomb.pack.alpha.server;
import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.apache.servicecomb.saga.alpha.core.TaskStatus.DONE;
+import static org.apache.servicecomb.pack.alpha.core.TaskStatus.DONE;
import static org.apache.servicecomb.pack.common.EventType.SagaEndedEvent;
import static org.apache.servicecomb.pack.common.EventType.SagaStartedEvent;
import static org.apache.servicecomb.pack.common.EventType.TxAbortedEvent;
@@ -44,14 +44,14 @@ import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Executors;
import java.util.function.Consumer;
import javax.annotation.PostConstruct;
-import org.apache.servicecomb.saga.alpha.core.CommandRepository;
-import org.apache.servicecomb.saga.alpha.core.EventScanner;
-import org.apache.servicecomb.saga.alpha.core.OmegaCallback;
-import org.apache.servicecomb.saga.alpha.core.TxConsistentService;
-import org.apache.servicecomb.saga.alpha.core.TxEvent;
-import org.apache.servicecomb.saga.alpha.core.TxEventRepository;
-import org.apache.servicecomb.saga.alpha.core.TxTimeout;
-import org.apache.servicecomb.saga.alpha.core.TxTimeoutRepository;
+import org.apache.servicecomb.pack.alpha.core.CommandRepository;
+import org.apache.servicecomb.pack.alpha.core.EventScanner;
+import org.apache.servicecomb.pack.alpha.core.OmegaCallback;
+import org.apache.servicecomb.pack.alpha.core.TxConsistentService;
+import org.apache.servicecomb.pack.alpha.core.TxEvent;
+import org.apache.servicecomb.pack.alpha.core.TxEventRepository;
+import org.apache.servicecomb.pack.alpha.core.TxTimeout;
+import org.apache.servicecomb.pack.alpha.core.TxTimeoutRepository;
import org.apache.servicecomb.pack.common.EventType;
import org.apache.servicecomb.pack.contract.grpc.GrpcAck;
import org.apache.servicecomb.pack.contract.grpc.GrpcCompensateCommand;
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/AlphaIntegrationWithSSLTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/AlphaIntegrationWithSSLTest.java
similarity index 98%
rename from alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/AlphaIntegrationWithSSLTest.java
rename to alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/AlphaIntegrationWithSSLTest.java
index 8a2df82..02f37df 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/AlphaIntegrationWithSSLTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/AlphaIntegrationWithSSLTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server;
+package org.apache.servicecomb.pack.alpha.server;
import java.io.File;
import java.util.Arrays;
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/console/saga/SagaTransactionsControllerTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/console/saga/SagaTransactionsControllerTest.java
similarity index 98%
rename from alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/console/saga/SagaTransactionsControllerTest.java
rename to alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/console/saga/SagaTransactionsControllerTest.java
index 37381bd..b07fc6d 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/console/saga/SagaTransactionsControllerTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/console/saga/SagaTransactionsControllerTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.console.saga;
+package org.apache.servicecomb.pack.alpha.server.console.saga;
import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
import static java.util.Collections.singletonList;
@@ -36,8 +36,8 @@ import java.util.LinkedList;
import java.util.List;
import java.util.UUID;
-import org.apache.servicecomb.saga.alpha.core.TxEvent;
-import org.apache.servicecomb.saga.alpha.server.TxEventEnvelopeRepository;
+import org.apache.servicecomb.pack.alpha.core.TxEvent;
+import org.apache.servicecomb.pack.alpha.server.TxEventEnvelopeRepository;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/AlphaTccEventControllerTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/AlphaTccEventControllerTest.java
similarity index 92%
rename from alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/AlphaTccEventControllerTest.java
rename to alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/AlphaTccEventControllerTest.java
index 3b0ffcc..94627df 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/AlphaTccEventControllerTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/AlphaTccEventControllerTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.tcc;
+package org.apache.servicecomb.pack.alpha.server.tcc;
import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
import static java.util.Collections.singletonList;
@@ -26,9 +26,9 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxEvent;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxType;
-import org.apache.servicecomb.saga.alpha.server.tcc.service.TccTxEventRepository;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.TccTxType;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.TccTxEvent;
+import org.apache.servicecomb.pack.alpha.server.tcc.service.TccTxEventRepository;
import org.apache.servicecomb.pack.common.TransactionStatus;
import org.junit.Before;
import org.junit.Test;
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/AlphaTccServerTestBase.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/AlphaTccServerTestBase.java
similarity index 95%
rename from alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/AlphaTccServerTestBase.java
rename to alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/AlphaTccServerTestBase.java
index dc41182..e26b787 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/AlphaTccServerTestBase.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/AlphaTccServerTestBase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.tcc;
+package org.apache.servicecomb.pack.alpha.server.tcc;
import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
import static java.util.concurrent.TimeUnit.SECONDS;
@@ -32,12 +32,12 @@ import java.util.Queue;
import java.util.UUID;
import java.util.concurrent.ConcurrentLinkedQueue;
-import org.apache.servicecomb.saga.alpha.server.tcc.callback.GrpcOmegaTccCallback;
-import org.apache.servicecomb.saga.alpha.server.tcc.callback.OmegaCallbacksRegistry;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxEvent;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxType;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.EventConverter;
-import org.apache.servicecomb.saga.alpha.server.tcc.service.TccTxEventRepository;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.TccTxType;
+import org.apache.servicecomb.pack.alpha.server.tcc.callback.GrpcOmegaTccCallback;
+import org.apache.servicecomb.pack.alpha.server.tcc.callback.OmegaCallbacksRegistry;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.TccTxEvent;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.EventConverter;
+import org.apache.servicecomb.pack.alpha.server.tcc.service.TccTxEventRepository;
import org.apache.servicecomb.pack.common.TransactionStatus;
import org.apache.servicecomb.pack.contract.grpc.GrpcAck;
import org.apache.servicecomb.pack.contract.grpc.GrpcServiceConfig;
@@ -49,6 +49,7 @@ import org.apache.servicecomb.pack.contract.grpc.GrpcTccTransactionStartedEvent;
import org.apache.servicecomb.pack.contract.grpc.TccEventServiceGrpc;
import org.apache.servicecomb.pack.contract.grpc.TccEventServiceGrpc.TccEventServiceBlockingStub;
import org.apache.servicecomb.pack.contract.grpc.TccEventServiceGrpc.TccEventServiceStub;
+import org.hamcrest.core.Is;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Test;
@@ -137,7 +138,7 @@ public abstract class AlphaTccServerTestBase {
assertThat(event.getLocalTxId(), is(localTxId));
assertThat(event.getInstanceId(), is(instanceId));
assertThat(event.getServiceName(), is(serviceName));
- assertThat(event.getTxType(), is(TccTxType.STARTED.name()));
+ assertThat(event.getTxType(), Is.is(TccTxType.STARTED.name()));
assertThat(event.getStatus(), is(TransactionStatus.Succeed.name()));
event = iterator.next();
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/MemoryAlphaTccServerTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/MemoryAlphaTccServerTest.java
similarity index 96%
rename from alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/MemoryAlphaTccServerTest.java
rename to alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/MemoryAlphaTccServerTest.java
index c7da54d..e42af58 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/MemoryAlphaTccServerTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/MemoryAlphaTccServerTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.tcc;
+package org.apache.servicecomb.pack.alpha.server.tcc;
import io.grpc.netty.NettyChannelBuilder;
import org.junit.BeforeClass;
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/RdbAlphaTccServerTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/RdbAlphaTccServerTest.java
similarity index 96%
rename from alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/RdbAlphaTccServerTest.java
rename to alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/RdbAlphaTccServerTest.java
index f4cd431..3e7e258 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/RdbAlphaTccServerTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/RdbAlphaTccServerTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.tcc;
+package org.apache.servicecomb.pack.alpha.server.tcc;
import io.grpc.netty.NettyChannelBuilder;
import org.junit.BeforeClass;
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccApplication.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/TccApplication.java
similarity index 91%
rename from alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccApplication.java
rename to alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/TccApplication.java
index d24425c..5bf5afa 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccApplication.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/TccApplication.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.tcc;
+package org.apache.servicecomb.pack.alpha.server.tcc;
-import org.apache.servicecomb.saga.alpha.server.GrpcServerConfig;
+import org.apache.servicecomb.pack.alpha.server.GrpcServerConfig;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Import;
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccCallbackEngineTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/TccCallbackEngineTest.java
similarity index 92%
rename from alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccCallbackEngineTest.java
rename to alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/TccCallbackEngineTest.java
index c4f51b0..d8f2bda 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccCallbackEngineTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/TccCallbackEngineTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.tcc;
+package org.apache.servicecomb.pack.alpha.server.tcc;
import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
import static org.hamcrest.Matchers.is;
@@ -27,12 +27,13 @@ import static org.mockito.Mockito.verify;
import io.grpc.stub.StreamObserver;
import java.util.UUID;
-import org.apache.servicecomb.saga.alpha.server.tcc.callback.OmegaCallbacksRegistry;
-import org.apache.servicecomb.saga.alpha.server.tcc.callback.TccCallbackEngine;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.GlobalTxEvent;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.ParticipatedEvent;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxType;
-import org.apache.servicecomb.saga.alpha.server.tcc.service.TccTxEventService;
+
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.ParticipatedEvent;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.TccTxType;
+import org.apache.servicecomb.pack.alpha.server.tcc.callback.OmegaCallbacksRegistry;
+import org.apache.servicecomb.pack.alpha.server.tcc.callback.TccCallbackEngine;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.GlobalTxEvent;
+import org.apache.servicecomb.pack.alpha.server.tcc.service.TccTxEventService;
import org.apache.servicecomb.pack.common.TransactionStatus;
import org.apache.servicecomb.pack.contract.grpc.GrpcServiceConfig;
import org.junit.After;
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccConfiguration.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/TccConfiguration.java
similarity index 83%
rename from alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccConfiguration.java
rename to alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/TccConfiguration.java
index fd93419..a83cb27 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccConfiguration.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/TccConfiguration.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.tcc;
+package org.apache.servicecomb.pack.alpha.server.tcc;
-import org.apache.servicecomb.saga.alpha.server.GrpcServerConfig;
-import org.apache.servicecomb.saga.alpha.server.GrpcStartable;
-import org.apache.servicecomb.saga.alpha.server.ServerStartable;
-import org.apache.servicecomb.saga.alpha.server.tcc.callback.TccPendingTaskRunner;
-import org.apache.servicecomb.saga.alpha.server.tcc.service.TccEventScanner;
-import org.apache.servicecomb.saga.alpha.server.tcc.service.TccTxEventService;
+import org.apache.servicecomb.pack.alpha.server.GrpcServerConfig;
+import org.apache.servicecomb.pack.alpha.server.GrpcStartable;
+import org.apache.servicecomb.pack.alpha.server.ServerStartable;
+import org.apache.servicecomb.pack.alpha.server.tcc.callback.TccPendingTaskRunner;
+import org.apache.servicecomb.pack.alpha.server.tcc.service.TccEventScanner;
+import org.apache.servicecomb.pack.alpha.server.tcc.service.TccTxEventService;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccCoordinateCommandStreamObserver.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/TccCoordinateCommandStreamObserver.java
similarity index 97%
rename from alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccCoordinateCommandStreamObserver.java
rename to alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/TccCoordinateCommandStreamObserver.java
index 22e687e..b768de2 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccCoordinateCommandStreamObserver.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/TccCoordinateCommandStreamObserver.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.tcc;
+package org.apache.servicecomb.pack.alpha.server.tcc;
import io.grpc.stub.StreamObserver;
import java.util.Queue;
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/EventConverterTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/EventConverterTest.java
similarity index 95%
rename from alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/EventConverterTest.java
rename to alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/EventConverterTest.java
index 4d84770..a9f2e98 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/EventConverterTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/jpa/EventConverterTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.tcc.jpa;
+package org.apache.servicecomb.pack.alpha.server.tcc.jpa;
import org.junit.Test;
import static org.hamcrest.core.Is.is;
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/MemoryEventRegistryTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/service/MemoryEventRegistryTest.java
similarity index 95%
rename from alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/MemoryEventRegistryTest.java
rename to alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/service/MemoryEventRegistryTest.java
index fb426a4..156e8e6 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/MemoryEventRegistryTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/service/MemoryEventRegistryTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.tcc.service;
+package org.apache.servicecomb.pack.alpha.server.tcc.service;
import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
import static org.hamcrest.core.Is.is;
@@ -26,8 +26,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxEvent;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxType;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.TccTxType;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.TccTxEvent;
import org.apache.servicecomb.pack.common.TransactionStatus;
import org.junit.Before;
import org.junit.Test;
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventServiceTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/service/TccTxEventServiceTest.java
similarity index 93%
rename from alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventServiceTest.java
rename to alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/service/TccTxEventServiceTest.java
index 5ece6e4..c424ca7 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventServiceTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/service/TccTxEventServiceTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.tcc.service;
+package org.apache.servicecomb.pack.alpha.server.tcc.service;
import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
import static java.util.concurrent.TimeUnit.SECONDS;
@@ -29,15 +29,16 @@ import io.grpc.stub.StreamObserver;
import java.util.Date;
import java.util.List;
import java.util.Optional;
-import org.apache.servicecomb.saga.alpha.server.tcc.TccApplication;
-import org.apache.servicecomb.saga.alpha.server.tcc.TccConfiguration;
-import org.apache.servicecomb.saga.alpha.server.tcc.callback.OmegaCallbacksRegistry;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.GlobalTxEvent;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.GlobalTxEventRepository;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.ParticipatedEvent;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.ParticipatedEventRepository;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxEvent;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxType;
+
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.GlobalTxEventRepository;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.ParticipatedEvent;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.ParticipatedEventRepository;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.TccTxType;
+import org.apache.servicecomb.pack.alpha.server.tcc.TccApplication;
+import org.apache.servicecomb.pack.alpha.server.tcc.TccConfiguration;
+import org.apache.servicecomb.pack.alpha.server.tcc.callback.OmegaCallbacksRegistry;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.GlobalTxEvent;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.TccTxEvent;
import org.apache.servicecomb.pack.common.TransactionStatus;
import org.apache.servicecomb.pack.contract.grpc.GrpcServiceConfig;
import org.apache.servicecomb.pack.contract.grpc.GrpcTccCoordinateCommand;
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventServiceTransactionTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/service/TccTxEventServiceTransactionTest.java
similarity index 87%
rename from alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventServiceTransactionTest.java
rename to alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/service/TccTxEventServiceTransactionTest.java
index acbcbcf..9788681 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventServiceTransactionTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/tcc/service/TccTxEventServiceTransactionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.alpha.server.tcc.service;
+package org.apache.servicecomb.pack.alpha.server.tcc.service;
import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
import static org.hamcrest.Matchers.is;
@@ -25,15 +25,16 @@ import static org.mockito.Mockito.doThrow;
import java.util.List;
import java.util.Optional;
-import org.apache.servicecomb.saga.alpha.server.tcc.TccApplication;
-import org.apache.servicecomb.saga.alpha.server.tcc.TccConfiguration;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.GlobalTxEvent;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.GlobalTxEventRepository;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.ParticipatedEvent;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.ParticipatedEventRepository;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxEvent;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxEventDBRepository;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxType;
+
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.GlobalTxEventRepository;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.ParticipatedEvent;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.ParticipatedEventRepository;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.TccTxEventDBRepository;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.TccTxType;
+import org.apache.servicecomb.pack.alpha.server.tcc.TccApplication;
+import org.apache.servicecomb.pack.alpha.server.tcc.TccConfiguration;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.GlobalTxEvent;
+import org.apache.servicecomb.pack.alpha.server.tcc.jpa.TccTxEvent;
import org.apache.servicecomb.pack.common.TransactionStatus;
import org.junit.After;
import org.junit.Before;
diff --git a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/CommandEnvelopeRepository.java b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/CommandEnvelopeRepository.java
index ad8ae3a..778665f 100644
--- a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/CommandEnvelopeRepository.java
+++ b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/CommandEnvelopeRepository.java
@@ -17,7 +17,7 @@
package org.apache.servicecomb.saga.integration.pack.tests;
-import org.apache.servicecomb.saga.alpha.core.Command;
+import org.apache.servicecomb.pack.alpha.core.Command;
import org.springframework.data.repository.CrudRepository;
interface CommandEnvelopeRepository extends CrudRepository<Command, Long> {
diff --git a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/PackIT.java b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/PackIT.java
index a7a5bc8..84eedf9 100644
--- a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/PackIT.java
+++ b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/PackIT.java
@@ -31,7 +31,7 @@ import static org.springframework.http.HttpStatus.OK;
import java.util.List;
import java.util.Queue;
-import org.apache.servicecomb.saga.alpha.core.TxEvent;
+import org.apache.servicecomb.pack.alpha.core.TxEvent;
import org.apache.servicecomb.pack.omega.context.OmegaContext;
import org.junit.After;
import org.junit.Test;
diff --git a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/TxEventEnvelopeRepository.java b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/TxEventEnvelopeRepository.java
index 77bcb8f..432fc63 100644
--- a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/TxEventEnvelopeRepository.java
+++ b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/TxEventEnvelopeRepository.java
@@ -19,7 +19,7 @@ package org.apache.servicecomb.saga.integration.pack.tests;
import java.util.List;
-import org.apache.servicecomb.saga.alpha.core.TxEvent;
+import org.apache.servicecomb.pack.alpha.core.TxEvent;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.CrudRepository;
diff --git a/persistence/persistence-jpa/pom.xml b/persistence/persistence-jpa/pom.xml
index cdc35f3..c68e377 100644
--- a/persistence/persistence-jpa/pom.xml
+++ b/persistence/persistence-jpa/pom.xml
@@ -20,7 +20,7 @@
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-persistence</artifactId>
+ <artifactId>persistence</artifactId>
<groupId>org.apache.servicecomb.pack</groupId>
<version>0.3.0-SNAPSHOT</version>
</parent>
[servicecomb-pack] 06/13: SCB-976 Renamed the package name in the
pack-common
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/servicecomb-pack.git
commit 0a0c782c084c9e5aac4fd1f66477788ddeb554a2
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Fri Dec 14 14:08:01 2018 +0800
SCB-976 Renamed the package name in the pack-common
---
.../apache/servicecomb/saga/alpha/core/EventScanner.java | 8 ++++----
.../servicecomb/saga/alpha/core/TxConsistentService.java | 6 +++---
.../servicecomb/saga/alpha/core/TxEventRepository.java | 2 +-
.../saga/alpha/core/CompositeOmegaCallbackTest.java | 4 ++--
.../saga/alpha/core/TxConsistentServiceTest.java | 14 +++++++-------
.../apache/servicecomb/saga/alpha/core/TxEventMaker.java | 2 +-
.../saga/alpha/server/SpringTxEventRepository.java | 2 +-
.../alpha/server/tcc/callback/GrpcOmegaTccCallback.java | 2 +-
.../saga/alpha/server/tcc/callback/OmegaCallback.java | 2 +-
.../alpha/server/tcc/callback/OmegaCallbackWrapper.java | 2 +-
.../saga/alpha/server/tcc/callback/TccCallbackEngine.java | 2 +-
.../saga/alpha/server/tcc/jpa/EventConverter.java | 2 +-
.../saga/alpha/server/tcc/service/TccTxEventService.java | 4 ++--
.../saga/alpha/server/AlphaEventControllerTest.java | 2 +-
.../saga/alpha/server/AlphaIntegrationTest.java | 14 +++++++-------
.../console/saga/SagaTransactionsControllerTest.java | 14 +++++++-------
.../saga/alpha/server/tcc/AlphaTccEventControllerTest.java | 3 +--
.../saga/alpha/server/tcc/AlphaTccServerTestBase.java | 2 +-
.../saga/alpha/server/tcc/TccCallbackEngineTest.java | 2 +-
.../alpha/server/tcc/service/MemoryEventRegistryTest.java | 2 +-
.../alpha/server/tcc/service/TccTxEventServiceTest.java | 2 +-
.../tcc/service/TccTxEventServiceTransactionTest.java | 2 +-
.../omega/connector/grpc/saga/RetryableMessageSender.java | 2 +-
.../grpc/saga/SagaLoadBalancedSenderTestBase.java | 5 +----
.../connector/grpc/tcc/GrpcTccClientMessageSenderTest.java | 3 +--
.../omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java | 2 +-
.../saga/omega/transaction/spring/TccInterceptorTest.java | 3 +--
.../servicecomb/saga/omega/transaction/SagaEndedEvent.java | 2 +-
.../saga/omega/transaction/SagaStartedEvent.java | 2 +-
.../servicecomb/saga/omega/transaction/TxAbortedEvent.java | 2 +-
.../saga/omega/transaction/TxCompensatedEvent.java | 2 +-
.../servicecomb/saga/omega/transaction/TxEndedEvent.java | 2 +-
.../apache/servicecomb/saga/omega/transaction/TxEvent.java | 2 +-
.../servicecomb/saga/omega/transaction/TxStartedEvent.java | 2 +-
.../omega/transaction/tcc/CoordinateMessageHandler.java | 2 +-
.../saga/omega/transaction/tcc/TccParticipatorAspect.java | 2 +-
.../omega/transaction/tcc/TccStartAnnotationProcessor.java | 2 +-
.../omega/transaction/tcc/events/CoordinatedEvent.java | 2 +-
.../omega/transaction/tcc/events/ParticipatedEvent.java | 2 +-
.../saga/omega/transaction/tcc/events/TccEndedEvent.java | 2 +-
.../saga/omega/transaction/CompensableInterceptorTest.java | 2 +-
.../omega/transaction/CompensationMessageHandlerTest.java | 2 +-
.../saga/omega/transaction/DefaultRecoveryTest.java | 2 +-
.../saga/omega/transaction/ForwardRecoveryTest.java | 2 +-
.../transaction/SagaStartAnnotationProcessorTest.java | 2 +-
.../saga/omega/transaction/SagaStartAspectTest.java | 2 +-
.../saga/omega/transaction/TransactionAspectTest.java | 2 +-
.../transaction/tcc/CoordinateMessageHandlerTest.java | 2 +-
.../omega/transaction/tcc/TccParticipatorAspectTest.java | 2 +-
.../transaction/tcc/TccStartAnnotationProcessorTest.java | 2 +-
.../saga/omega/transaction/tcc/TccStartAspectTest.java | 2 +-
.../servicecomb/{saga => pack}/common/EventType.java | 2 +-
.../{saga => pack}/common/TransactionStatus.java | 2 +-
53 files changed, 78 insertions(+), 84 deletions(-)
diff --git a/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/EventScanner.java b/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/EventScanner.java
index 0a15ad0..bd4c9d0 100644
--- a/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/EventScanner.java
+++ b/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/EventScanner.java
@@ -19,10 +19,10 @@ package org.apache.servicecomb.saga.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;
diff --git a/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxConsistentService.java b/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxConsistentService.java
index ad08440..b110501 100644
--- a/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxConsistentService.java
+++ b/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxConsistentService.java
@@ -17,9 +17,9 @@
package org.apache.servicecomb.saga.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/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxEventRepository.java b/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxEventRepository.java
index f2cccca..50c24d5 100644
--- a/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxEventRepository.java
+++ b/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxEventRepository.java
@@ -19,7 +19,7 @@ package org.apache.servicecomb.saga.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/alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/CompositeOmegaCallbackTest.java b/alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/CompositeOmegaCallbackTest.java
index 4ded48a..51d3085 100644
--- a/alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/CompositeOmegaCallbackTest.java
+++ b/alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/CompositeOmegaCallbackTest.java
@@ -19,7 +19,7 @@ package org.apache.servicecomb.saga.alpha.core;
import static com.seanyinx.github.unit.scaffolding.AssertUtils.expectFailing;
import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
-import static org.apache.servicecomb.saga.common.EventType.TxStartedEvent;
+import static org.apache.servicecomb.pack.common.EventType.TxStartedEvent;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertThat;
@@ -32,7 +32,7 @@ import java.util.Map;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.servicecomb.saga.common.EventType;
+import org.apache.servicecomb.pack.common.EventType;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
diff --git a/alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/TxConsistentServiceTest.java b/alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/TxConsistentServiceTest.java
index b0c19c8..03fd43d 100644
--- a/alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/TxConsistentServiceTest.java
+++ b/alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/TxConsistentServiceTest.java
@@ -19,12 +19,12 @@ package org.apache.servicecomb.saga.alpha.core;
import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
import static java.util.Collections.emptyList;
-import static org.apache.servicecomb.saga.common.EventType.SagaEndedEvent;
-import static org.apache.servicecomb.saga.common.EventType.SagaStartedEvent;
-import static org.apache.servicecomb.saga.common.EventType.TxAbortedEvent;
-import static org.apache.servicecomb.saga.common.EventType.TxCompensatedEvent;
-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.SagaStartedEvent;
+import static org.apache.servicecomb.pack.common.EventType.TxAbortedEvent;
+import static org.apache.servicecomb.pack.common.EventType.TxCompensatedEvent;
+import static org.apache.servicecomb.pack.common.EventType.TxEndedEvent;
+import static org.apache.servicecomb.pack.common.EventType.TxStartedEvent;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertThat;
@@ -36,7 +36,7 @@ import java.util.UUID;
import java.util.concurrent.ConcurrentLinkedDeque;
import java.util.stream.Collectors;
-import org.apache.servicecomb.saga.common.EventType;
+import org.apache.servicecomb.pack.common.EventType;
import org.junit.Before;
import org.junit.Test;
diff --git a/alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/TxEventMaker.java b/alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/TxEventMaker.java
index c14ffd9..1c00e3e 100644
--- a/alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/TxEventMaker.java
+++ b/alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/TxEventMaker.java
@@ -18,7 +18,7 @@
package org.apache.servicecomb.saga.alpha.core;
import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
-import static org.apache.servicecomb.saga.common.EventType.TxStartedEvent;
+import static org.apache.servicecomb.pack.common.EventType.TxStartedEvent;
import java.util.UUID;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/SpringTxEventRepository.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/SpringTxEventRepository.java
index 0394f82..7ddc923 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/SpringTxEventRepository.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/SpringTxEventRepository.java
@@ -17,7 +17,7 @@
package org.apache.servicecomb.saga.alpha.server;
-import static org.apache.servicecomb.saga.common.EventType.TxCompensatedEvent;
+import static org.apache.servicecomb.pack.common.EventType.TxCompensatedEvent;
import java.util.List;
import java.util.Optional;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/GrpcOmegaTccCallback.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/GrpcOmegaTccCallback.java
index a2cf135..7113136 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/GrpcOmegaTccCallback.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/GrpcOmegaTccCallback.java
@@ -19,7 +19,7 @@ package org.apache.servicecomb.saga.alpha.server.tcc.callback;
import io.grpc.stub.StreamObserver;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.ParticipatedEvent;
-import org.apache.servicecomb.saga.common.TransactionStatus;
+import org.apache.servicecomb.pack.common.TransactionStatus;
import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccCoordinateCommand;
/**
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/OmegaCallback.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/OmegaCallback.java
index 982bb92..c9f7cb5 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/OmegaCallback.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/OmegaCallback.java
@@ -18,7 +18,7 @@
package org.apache.servicecomb.saga.alpha.server.tcc.callback;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.ParticipatedEvent;
-import org.apache.servicecomb.saga.common.TransactionStatus;
+import org.apache.servicecomb.pack.common.TransactionStatus;
public interface OmegaCallback {
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/OmegaCallbackWrapper.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/OmegaCallbackWrapper.java
index 475489d..071151c 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/OmegaCallbackWrapper.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/OmegaCallbackWrapper.java
@@ -19,7 +19,7 @@ package org.apache.servicecomb.saga.alpha.server.tcc.callback;
import java.util.concurrent.BlockingQueue;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.ParticipatedEvent;
-import org.apache.servicecomb.saga.common.TransactionStatus;
+import org.apache.servicecomb.pack.common.TransactionStatus;
import org.springframework.stereotype.Component;
@Component
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/TccCallbackEngine.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/TccCallbackEngine.java
index dfd1e36..55eccca 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/TccCallbackEngine.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/TccCallbackEngine.java
@@ -22,7 +22,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.GlobalTxEvent;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.ParticipatedEvent;
import org.apache.servicecomb.saga.alpha.server.tcc.service.TccTxEventRepository;
-import org.apache.servicecomb.saga.common.TransactionStatus;
+import org.apache.servicecomb.pack.common.TransactionStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/EventConverter.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/EventConverter.java
index df8b6a0..ac54baa 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/EventConverter.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/EventConverter.java
@@ -17,7 +17,7 @@
package org.apache.servicecomb.saga.alpha.server.tcc.jpa;
-import org.apache.servicecomb.saga.common.TransactionStatus;
+import org.apache.servicecomb.pack.common.TransactionStatus;
import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccCoordinatedEvent;
import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccParticipatedEvent;
import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccTransactionEndedEvent;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventService.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventService.java
index a109a82..f4c02bf 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventService.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventService.java
@@ -24,7 +24,7 @@ import org.apache.servicecomb.saga.alpha.server.tcc.jpa.GlobalTxEvent;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.ParticipatedEvent;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxEvent;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxType;
-import org.apache.servicecomb.saga.common.TransactionStatus;
+import org.apache.servicecomb.pack.common.TransactionStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.data.domain.PageRequest;
@@ -129,4 +129,4 @@ public class TccTxEventService {
public void clearCompletedGlobalTx(int size) {
tccTxEventRepository.clearCompletedGlobalTx(new PageRequest(0, size));
}
-}
\ No newline at end of file
+}
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/AlphaEventControllerTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/AlphaEventControllerTest.java
index ee2c444..8128eb8 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/AlphaEventControllerTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/AlphaEventControllerTest.java
@@ -19,7 +19,7 @@ package org.apache.servicecomb.saga.alpha.server;
import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
import static java.util.Collections.singletonList;
-import static org.apache.servicecomb.saga.common.EventType.TxStartedEvent;
+import static org.apache.servicecomb.pack.common.EventType.TxStartedEvent;
import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
import static org.hamcrest.core.Is.is;
import static org.mockito.Mockito.when;
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/AlphaIntegrationTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/AlphaIntegrationTest.java
index 8f5122b..001c423 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/AlphaIntegrationTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/AlphaIntegrationTest.java
@@ -20,12 +20,12 @@ package org.apache.servicecomb.saga.alpha.server;
import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.apache.servicecomb.saga.alpha.core.TaskStatus.DONE;
-import static org.apache.servicecomb.saga.common.EventType.SagaEndedEvent;
-import static org.apache.servicecomb.saga.common.EventType.SagaStartedEvent;
-import static org.apache.servicecomb.saga.common.EventType.TxAbortedEvent;
-import static org.apache.servicecomb.saga.common.EventType.TxCompensatedEvent;
-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.SagaStartedEvent;
+import static org.apache.servicecomb.pack.common.EventType.TxAbortedEvent;
+import static org.apache.servicecomb.pack.common.EventType.TxCompensatedEvent;
+import static org.apache.servicecomb.pack.common.EventType.TxEndedEvent;
+import static org.apache.servicecomb.pack.common.EventType.TxStartedEvent;
import static org.awaitility.Awaitility.await;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.notNullValue;
@@ -52,7 +52,7 @@ import org.apache.servicecomb.saga.alpha.core.TxEvent;
import org.apache.servicecomb.saga.alpha.core.TxEventRepository;
import org.apache.servicecomb.saga.alpha.core.TxTimeout;
import org.apache.servicecomb.saga.alpha.core.TxTimeoutRepository;
-import org.apache.servicecomb.saga.common.EventType;
+import org.apache.servicecomb.pack.common.EventType;
import org.apache.servicecomb.saga.pack.contract.grpc.GrpcAck;
import org.apache.servicecomb.saga.pack.contract.grpc.GrpcCompensateCommand;
import org.apache.servicecomb.saga.pack.contract.grpc.GrpcServiceConfig;
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/console/saga/SagaTransactionsControllerTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/console/saga/SagaTransactionsControllerTest.java
index a4ce983..37381bd 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/console/saga/SagaTransactionsControllerTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/console/saga/SagaTransactionsControllerTest.java
@@ -19,12 +19,12 @@ package org.apache.servicecomb.saga.alpha.server.console.saga;
import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
import static java.util.Collections.singletonList;
-import static org.apache.servicecomb.saga.common.EventType.SagaEndedEvent;
-import static org.apache.servicecomb.saga.common.EventType.SagaStartedEvent;
-import static org.apache.servicecomb.saga.common.EventType.TxAbortedEvent;
-import static org.apache.servicecomb.saga.common.EventType.TxCompensatedEvent;
-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.SagaStartedEvent;
+import static org.apache.servicecomb.pack.common.EventType.TxAbortedEvent;
+import static org.apache.servicecomb.pack.common.EventType.TxCompensatedEvent;
+import static org.apache.servicecomb.pack.common.EventType.TxEndedEvent;
+import static org.apache.servicecomb.pack.common.EventType.TxStartedEvent;
import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
import static org.hamcrest.core.Is.is;
import static org.mockito.Mockito.when;
@@ -195,4 +195,4 @@ public class SagaTransactionsControllerTest {
this.getClass().getCanonicalName(),
uniquify("blah").getBytes());
}
-}
\ No newline at end of file
+}
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/AlphaTccEventControllerTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/AlphaTccEventControllerTest.java
index 21d75d5..3b0ffcc 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/AlphaTccEventControllerTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/AlphaTccEventControllerTest.java
@@ -27,10 +27,9 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxEvent;
-import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxEventDBRepository;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxType;
import org.apache.servicecomb.saga.alpha.server.tcc.service.TccTxEventRepository;
-import org.apache.servicecomb.saga.common.TransactionStatus;
+import org.apache.servicecomb.pack.common.TransactionStatus;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/AlphaTccServerTestBase.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/AlphaTccServerTestBase.java
index 8fe9958..c41dec1 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/AlphaTccServerTestBase.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/AlphaTccServerTestBase.java
@@ -38,7 +38,7 @@ import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxEvent;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxType;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.EventConverter;
import org.apache.servicecomb.saga.alpha.server.tcc.service.TccTxEventRepository;
-import org.apache.servicecomb.saga.common.TransactionStatus;
+import org.apache.servicecomb.pack.common.TransactionStatus;
import org.apache.servicecomb.saga.pack.contract.grpc.GrpcAck;
import org.apache.servicecomb.saga.pack.contract.grpc.GrpcServiceConfig;
import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccCoordinateCommand;
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccCallbackEngineTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccCallbackEngineTest.java
index 1d08597..0ba428b 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccCallbackEngineTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccCallbackEngineTest.java
@@ -33,7 +33,7 @@ import org.apache.servicecomb.saga.alpha.server.tcc.jpa.GlobalTxEvent;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.ParticipatedEvent;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxType;
import org.apache.servicecomb.saga.alpha.server.tcc.service.TccTxEventService;
-import org.apache.servicecomb.saga.common.TransactionStatus;
+import org.apache.servicecomb.pack.common.TransactionStatus;
import org.apache.servicecomb.saga.pack.contract.grpc.GrpcServiceConfig;
import org.junit.After;
import org.junit.Before;
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/MemoryEventRegistryTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/MemoryEventRegistryTest.java
index c1d929f..fb426a4 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/MemoryEventRegistryTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/MemoryEventRegistryTest.java
@@ -28,7 +28,7 @@ import java.util.Optional;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxEvent;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxType;
-import org.apache.servicecomb.saga.common.TransactionStatus;
+import org.apache.servicecomb.pack.common.TransactionStatus;
import org.junit.Before;
import org.junit.Test;
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventServiceTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventServiceTest.java
index 6993d79..5fe970d 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventServiceTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventServiceTest.java
@@ -38,7 +38,7 @@ import org.apache.servicecomb.saga.alpha.server.tcc.jpa.ParticipatedEvent;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.ParticipatedEventRepository;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxEvent;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxType;
-import org.apache.servicecomb.saga.common.TransactionStatus;
+import org.apache.servicecomb.pack.common.TransactionStatus;
import org.apache.servicecomb.saga.pack.contract.grpc.GrpcServiceConfig;
import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccCoordinateCommand;
import org.junit.After;
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventServiceTransactionTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventServiceTransactionTest.java
index e1694f8..acbcbcf 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventServiceTransactionTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventServiceTransactionTest.java
@@ -34,7 +34,7 @@ import org.apache.servicecomb.saga.alpha.server.tcc.jpa.ParticipatedEventReposit
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxEvent;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxEventDBRepository;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxType;
-import org.apache.servicecomb.saga.common.TransactionStatus;
+import org.apache.servicecomb.pack.common.TransactionStatus;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/RetryableMessageSender.java b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/RetryableMessageSender.java
index 6869dae..99bba38 100644
--- a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/RetryableMessageSender.java
+++ b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/RetryableMessageSender.java
@@ -17,7 +17,7 @@
package org.apache.servicecomb.saga.omega.connector.grpc.saga;
-import static org.apache.servicecomb.saga.common.EventType.SagaStartedEvent;
+import static org.apache.servicecomb.pack.common.EventType.SagaStartedEvent;
import java.util.concurrent.BlockingQueue;
import org.apache.servicecomb.saga.omega.transaction.AlphaResponse;
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalancedSenderTestBase.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalancedSenderTestBase.java
index efefc15..376e59f 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalancedSenderTestBase.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalancedSenderTestBase.java
@@ -27,13 +27,10 @@ import java.util.Map;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
-import org.apache.servicecomb.saga.common.EventType;
-import org.apache.servicecomb.saga.omega.connector.grpc.saga.SagaLoadBalanceSender;
+import org.apache.servicecomb.pack.common.EventType;
import org.apache.servicecomb.saga.omega.transaction.MessageDeserializer;
import org.apache.servicecomb.saga.omega.transaction.MessageHandler;
-import org.apache.servicecomb.saga.omega.transaction.MessageSender;
import org.apache.servicecomb.saga.omega.transaction.MessageSerializer;
-import org.apache.servicecomb.saga.omega.transaction.SagaMessageSender;
import org.apache.servicecomb.saga.omega.transaction.TxEvent;
import org.apache.servicecomb.saga.pack.contract.grpc.GrpcAck;
import org.apache.servicecomb.saga.pack.contract.grpc.GrpcCompensateCommand;
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/GrpcTccClientMessageSenderTest.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/GrpcTccClientMessageSenderTest.java
index 0c425b0..a6cbcf3 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/GrpcTccClientMessageSenderTest.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/GrpcTccClientMessageSenderTest.java
@@ -23,8 +23,7 @@ import static org.hamcrest.core.Is.is;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-import org.apache.servicecomb.saga.common.TransactionStatus;
-import org.apache.servicecomb.saga.omega.connector.grpc.tcc.GrpcTccClientMessageSender;
+import org.apache.servicecomb.pack.common.TransactionStatus;
import org.apache.servicecomb.saga.omega.context.ServiceConfig;
import org.apache.servicecomb.saga.omega.transaction.AlphaResponse;
import org.apache.servicecomb.saga.omega.transaction.tcc.TccMessageHandler;
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java
index 569203d..00d6af2 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java
@@ -42,7 +42,7 @@ import java.util.Map;
import java.util.Queue;
import java.util.concurrent.Callable;
import java.util.concurrent.TimeUnit;
-import org.apache.servicecomb.saga.common.TransactionStatus;
+import org.apache.servicecomb.pack.common.TransactionStatus;
import org.apache.servicecomb.saga.omega.connector.grpc.AlphaClusterConfig;
import org.apache.servicecomb.saga.omega.connector.grpc.LoadBalanceSenderTestBase;
import org.apache.servicecomb.saga.omega.connector.grpc.core.FastestSender;
diff --git a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TccInterceptorTest.java b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TccInterceptorTest.java
index 7f43476..7c9cebe 100644
--- a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TccInterceptorTest.java
+++ b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TccInterceptorTest.java
@@ -29,9 +29,8 @@ import static org.mockito.Mockito.when;
import java.util.List;
import java.util.UUID;
-import org.apache.servicecomb.saga.common.TransactionStatus;
+import org.apache.servicecomb.pack.common.TransactionStatus;
import org.apache.servicecomb.saga.omega.context.IdGenerator;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
import org.apache.servicecomb.saga.omega.transaction.tcc.TccMessageHandler;
import org.apache.servicecomb.saga.omega.transaction.tcc.events.CoordinatedEvent;
import org.apache.servicecomb.saga.omega.transaction.tcc.events.ParticipatedEvent;
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/SagaEndedEvent.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/SagaEndedEvent.java
index 2e28b5e..4684d5d 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/SagaEndedEvent.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/SagaEndedEvent.java
@@ -17,7 +17,7 @@
package org.apache.servicecomb.saga.omega.transaction;
-import org.apache.servicecomb.saga.common.EventType;
+import org.apache.servicecomb.pack.common.EventType;
public class SagaEndedEvent extends TxEvent {
SagaEndedEvent(String globalTxId, String localTxId) {
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/SagaStartedEvent.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/SagaStartedEvent.java
index 0e87a97..7112041 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/SagaStartedEvent.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/SagaStartedEvent.java
@@ -17,7 +17,7 @@
package org.apache.servicecomb.saga.omega.transaction;
-import org.apache.servicecomb.saga.common.EventType;
+import org.apache.servicecomb.pack.common.EventType;
public class SagaStartedEvent extends TxEvent {
public SagaStartedEvent(String globalTxId, String localTxId, int timeout) {
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxAbortedEvent.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxAbortedEvent.java
index 0a4146a..6e53354 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxAbortedEvent.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxAbortedEvent.java
@@ -20,7 +20,7 @@ package org.apache.servicecomb.saga.omega.transaction;
import java.io.PrintWriter;
import java.io.StringWriter;
-import org.apache.servicecomb.saga.common.EventType;
+import org.apache.servicecomb.pack.common.EventType;
public class TxAbortedEvent extends TxEvent {
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxCompensatedEvent.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxCompensatedEvent.java
index cd709e4..7194fa2 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxCompensatedEvent.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxCompensatedEvent.java
@@ -17,7 +17,7 @@
package org.apache.servicecomb.saga.omega.transaction;
-import org.apache.servicecomb.saga.common.EventType;
+import org.apache.servicecomb.pack.common.EventType;
public class TxCompensatedEvent extends TxEvent {
public TxCompensatedEvent(String globalTxId, String localTxId, String parentTxId, String compensationMethod) {
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxEndedEvent.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxEndedEvent.java
index f702c43..26c0bc1 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxEndedEvent.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxEndedEvent.java
@@ -17,7 +17,7 @@
package org.apache.servicecomb.saga.omega.transaction;
-import org.apache.servicecomb.saga.common.EventType;
+import org.apache.servicecomb.pack.common.EventType;
public class TxEndedEvent extends TxEvent {
public TxEndedEvent(String globalTxId, String localTxId, String parentTxId, String compensationMethod) {
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxEvent.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxEvent.java
index a158af1..213b2da 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxEvent.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxEvent.java
@@ -19,7 +19,7 @@ package org.apache.servicecomb.saga.omega.transaction;
import java.util.Arrays;
-import org.apache.servicecomb.saga.common.EventType;
+import org.apache.servicecomb.pack.common.EventType;
public class TxEvent {
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxStartedEvent.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxStartedEvent.java
index 5d2ae12..e74682c 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxStartedEvent.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxStartedEvent.java
@@ -17,7 +17,7 @@
package org.apache.servicecomb.saga.omega.transaction;
-import org.apache.servicecomb.saga.common.EventType;
+import org.apache.servicecomb.pack.common.EventType;
public class TxStartedEvent extends TxEvent {
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/CoordinateMessageHandler.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/CoordinateMessageHandler.java
index 657c9fb..71e0474 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/CoordinateMessageHandler.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/CoordinateMessageHandler.java
@@ -17,7 +17,7 @@
package org.apache.servicecomb.saga.omega.transaction.tcc;
-import org.apache.servicecomb.saga.common.TransactionStatus;
+import org.apache.servicecomb.pack.common.TransactionStatus;
import org.apache.servicecomb.saga.omega.context.CallbackContext;
import org.apache.servicecomb.saga.omega.context.OmegaContext;
import org.apache.servicecomb.saga.omega.transaction.tcc.events.CoordinatedEvent;
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccParticipatorAspect.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccParticipatorAspect.java
index 8849660..db2917e 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccParticipatorAspect.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccParticipatorAspect.java
@@ -19,7 +19,7 @@ package org.apache.servicecomb.saga.omega.transaction.tcc;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.Method;
-import org.apache.servicecomb.saga.common.TransactionStatus;
+import org.apache.servicecomb.pack.common.TransactionStatus;
import org.apache.servicecomb.saga.omega.context.OmegaContext;
import org.apache.servicecomb.saga.omega.transaction.annotations.Participate;
import org.apache.servicecomb.saga.omega.transaction.tcc.events.ParticipatedEvent;
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAnnotationProcessor.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAnnotationProcessor.java
index 1d4cf24..cf264cf 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAnnotationProcessor.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAnnotationProcessor.java
@@ -17,7 +17,7 @@
package org.apache.servicecomb.saga.omega.transaction.tcc;
import javax.transaction.TransactionalException;
-import org.apache.servicecomb.saga.common.TransactionStatus;
+import org.apache.servicecomb.pack.common.TransactionStatus;
import org.apache.servicecomb.saga.omega.context.OmegaContext;
import org.apache.servicecomb.saga.omega.transaction.AlphaResponse;
import org.apache.servicecomb.saga.omega.transaction.OmegaException;
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/CoordinatedEvent.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/CoordinatedEvent.java
index 2a80153..38ef4ff 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/CoordinatedEvent.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/CoordinatedEvent.java
@@ -17,7 +17,7 @@
package org.apache.servicecomb.saga.omega.transaction.tcc.events;
-import org.apache.servicecomb.saga.common.TransactionStatus;
+import org.apache.servicecomb.pack.common.TransactionStatus;
public class CoordinatedEvent {
private final String globalTxId;
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/ParticipatedEvent.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/ParticipatedEvent.java
index f55fd43..18c5d45 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/ParticipatedEvent.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/ParticipatedEvent.java
@@ -17,7 +17,7 @@
package org.apache.servicecomb.saga.omega.transaction.tcc.events;
-import org.apache.servicecomb.saga.common.TransactionStatus;
+import org.apache.servicecomb.pack.common.TransactionStatus;
public class ParticipatedEvent {
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/TccEndedEvent.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/TccEndedEvent.java
index 3944fb1..dff9a6f 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/TccEndedEvent.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/TccEndedEvent.java
@@ -16,7 +16,7 @@
*/
package org.apache.servicecomb.saga.omega.transaction.tcc.events;
-import org.apache.servicecomb.saga.common.TransactionStatus;
+import org.apache.servicecomb.pack.common.TransactionStatus;
public class TccEndedEvent {
private final String globalTxId;
diff --git a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/CompensableInterceptorTest.java b/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/CompensableInterceptorTest.java
index aec9d5a..c646a08 100644
--- a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/CompensableInterceptorTest.java
+++ b/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/CompensableInterceptorTest.java
@@ -28,7 +28,7 @@ import java.util.List;
import java.util.Random;
import java.util.UUID;
-import org.apache.servicecomb.saga.common.EventType;
+import org.apache.servicecomb.pack.common.EventType;
import org.apache.servicecomb.saga.omega.context.IdGenerator;
import org.apache.servicecomb.saga.omega.context.OmegaContext;
import org.junit.Before;
diff --git a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/CompensationMessageHandlerTest.java b/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/CompensationMessageHandlerTest.java
index ce40d71..6f94d5c 100644
--- a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/CompensationMessageHandlerTest.java
+++ b/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/CompensationMessageHandlerTest.java
@@ -26,7 +26,7 @@ import static org.mockito.Mockito.verify;
import java.util.ArrayList;
import java.util.List;
-import org.apache.servicecomb.saga.common.EventType;
+import org.apache.servicecomb.pack.common.EventType;
import org.apache.servicecomb.saga.omega.context.CallbackContext;
import org.junit.Before;
import org.junit.Test;
diff --git a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/DefaultRecoveryTest.java b/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/DefaultRecoveryTest.java
index 3f8b17f..bb8c0ed 100644
--- a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/DefaultRecoveryTest.java
+++ b/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/DefaultRecoveryTest.java
@@ -34,7 +34,7 @@ import java.util.UUID;
import javax.transaction.InvalidTransactionException;
-import org.apache.servicecomb.saga.common.EventType;
+import org.apache.servicecomb.pack.common.EventType;
import org.apache.servicecomb.saga.omega.context.IdGenerator;
import org.apache.servicecomb.saga.omega.context.OmegaContext;
import org.apache.servicecomb.saga.omega.transaction.annotations.Compensable;
diff --git a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/ForwardRecoveryTest.java b/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/ForwardRecoveryTest.java
index 98b3980..6103caf 100644
--- a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/ForwardRecoveryTest.java
+++ b/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/ForwardRecoveryTest.java
@@ -33,7 +33,7 @@ import java.util.UUID;
import javax.transaction.InvalidTransactionException;
-import org.apache.servicecomb.saga.common.EventType;
+import org.apache.servicecomb.pack.common.EventType;
import org.apache.servicecomb.saga.omega.context.IdGenerator;
import org.apache.servicecomb.saga.omega.context.OmegaContext;
import org.apache.servicecomb.saga.omega.transaction.annotations.Compensable;
diff --git a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAnnotationProcessorTest.java b/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAnnotationProcessorTest.java
index 9052e2f..f65be03 100644
--- a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAnnotationProcessorTest.java
+++ b/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAnnotationProcessorTest.java
@@ -30,7 +30,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import javax.transaction.TransactionalException;
-import org.apache.servicecomb.saga.common.EventType;
+import org.apache.servicecomb.pack.common.EventType;
import org.apache.servicecomb.saga.omega.context.IdGenerator;
import org.apache.servicecomb.saga.omega.context.OmegaContext;
import org.junit.Before;
diff --git a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAspectTest.java b/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAspectTest.java
index a9ff338..e613272 100644
--- a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAspectTest.java
+++ b/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAspectTest.java
@@ -27,7 +27,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
-import org.apache.servicecomb.saga.common.EventType;
+import org.apache.servicecomb.pack.common.EventType;
import org.apache.servicecomb.saga.omega.context.IdGenerator;
import org.apache.servicecomb.saga.omega.context.OmegaContext;
import org.apache.servicecomb.saga.omega.context.annotations.SagaStart;
diff --git a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/TransactionAspectTest.java b/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/TransactionAspectTest.java
index 3c05140..6dc4f41 100644
--- a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/TransactionAspectTest.java
+++ b/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/TransactionAspectTest.java
@@ -27,7 +27,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
-import org.apache.servicecomb.saga.common.EventType;
+import org.apache.servicecomb.pack.common.EventType;
import org.apache.servicecomb.saga.omega.context.IdGenerator;
import org.apache.servicecomb.saga.omega.context.OmegaContext;
import org.apache.servicecomb.saga.omega.transaction.annotations.Compensable;
diff --git a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/tcc/CoordinateMessageHandlerTest.java b/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/tcc/CoordinateMessageHandlerTest.java
index 6dbb721..f03fa59 100644
--- a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/tcc/CoordinateMessageHandlerTest.java
+++ b/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/tcc/CoordinateMessageHandlerTest.java
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertThat;
import java.util.ArrayList;
import java.util.List;
-import org.apache.servicecomb.saga.common.TransactionStatus;
+import org.apache.servicecomb.pack.common.TransactionStatus;
import org.apache.servicecomb.saga.omega.context.CallbackContext;
import org.apache.servicecomb.saga.omega.context.OmegaContext;
import org.apache.servicecomb.saga.omega.transaction.AlphaResponse;
diff --git a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccParticipatorAspectTest.java b/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccParticipatorAspectTest.java
index f52da03..6295607 100644
--- a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccParticipatorAspectTest.java
+++ b/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccParticipatorAspectTest.java
@@ -26,7 +26,7 @@ import static org.mockito.Mockito.when;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
-import org.apache.servicecomb.saga.common.TransactionStatus;
+import org.apache.servicecomb.pack.common.TransactionStatus;
import org.apache.servicecomb.saga.omega.context.IdGenerator;
import org.apache.servicecomb.saga.omega.context.OmegaContext;
import org.apache.servicecomb.saga.omega.transaction.AlphaResponse;
diff --git a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAnnotationProcessorTest.java b/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAnnotationProcessorTest.java
index 1853874..f3b1c18 100644
--- a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAnnotationProcessorTest.java
+++ b/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAnnotationProcessorTest.java
@@ -28,7 +28,7 @@ import java.util.UUID;
import javax.transaction.TransactionalException;
-import org.apache.servicecomb.saga.common.TransactionStatus;
+import org.apache.servicecomb.pack.common.TransactionStatus;
import org.apache.servicecomb.saga.omega.context.IdGenerator;
import org.apache.servicecomb.saga.omega.context.OmegaContext;
import org.apache.servicecomb.saga.omega.transaction.AlphaResponse;
diff --git a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAspectTest.java b/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAspectTest.java
index 0fe096d..a0ac89a 100644
--- a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAspectTest.java
+++ b/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAspectTest.java
@@ -27,7 +27,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
-import org.apache.servicecomb.saga.common.TransactionStatus;
+import org.apache.servicecomb.pack.common.TransactionStatus;
import org.apache.servicecomb.saga.omega.context.IdGenerator;
import org.apache.servicecomb.saga.omega.context.OmegaContext;
import org.apache.servicecomb.saga.omega.context.annotations.TccStart;
diff --git a/pack-common/src/main/java/org/apache/servicecomb/saga/common/EventType.java b/pack-common/src/main/java/org/apache/servicecomb/pack/common/EventType.java
similarity index 95%
rename from pack-common/src/main/java/org/apache/servicecomb/saga/common/EventType.java
rename to pack-common/src/main/java/org/apache/servicecomb/pack/common/EventType.java
index d7743d9..f3d0585 100644
--- a/pack-common/src/main/java/org/apache/servicecomb/saga/common/EventType.java
+++ b/pack-common/src/main/java/org/apache/servicecomb/pack/common/EventType.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.common;
+package org.apache.servicecomb.pack.common;
public enum EventType {
SagaStartedEvent,
diff --git a/pack-common/src/main/java/org/apache/servicecomb/saga/common/TransactionStatus.java b/pack-common/src/main/java/org/apache/servicecomb/pack/common/TransactionStatus.java
similarity index 95%
rename from pack-common/src/main/java/org/apache/servicecomb/saga/common/TransactionStatus.java
rename to pack-common/src/main/java/org/apache/servicecomb/pack/common/TransactionStatus.java
index ea5a662..1c88d19 100644
--- a/pack-common/src/main/java/org/apache/servicecomb/saga/common/TransactionStatus.java
+++ b/pack-common/src/main/java/org/apache/servicecomb/pack/common/TransactionStatus.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.common;
+package org.apache.servicecomb.pack.common;
public enum TransactionStatus {
Succeed,
[servicecomb-pack] 02/13: SCB-976 Updated the pom file for removing
modules
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/servicecomb-pack.git
commit 004960392f430c77097e86493a536bbb86488c5d
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Fri Dec 14 10:43:06 2018 +0800
SCB-976 Updated the pom file for removing modules
---
integration-tests/coverage-aggregate/pom.xml | 22 ++++++-------------
pom.xml | 33 +---------------------------
saga-demo/pom.xml | 2 --
3 files changed, 8 insertions(+), 49 deletions(-)
diff --git a/integration-tests/coverage-aggregate/pom.xml b/integration-tests/coverage-aggregate/pom.xml
index ef4df2e..7169e95 100644
--- a/integration-tests/coverage-aggregate/pom.xml
+++ b/integration-tests/coverage-aggregate/pom.xml
@@ -31,39 +31,31 @@
<dependencies>
<dependency>
<groupId>org.apache.servicecomb.saga</groupId>
- <artifactId>saga-core</artifactId>
+ <artifactId>omega-context</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.saga</groupId>
- <artifactId>saga-format</artifactId>
+ <artifactId>omega-transaction</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.saga</groupId>
- <artifactId>saga-spring</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb.saga.transports</groupId>
- <artifactId>transport-httpclient</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb.saga.discovery</groupId>
- <artifactId>saga-discovery-servicecenter</artifactId>
+ <artifactId>omega-spring-tx</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.saga</groupId>
- <artifactId>omega-context</artifactId>
+ <artifactId>omega-transport-resttemplate</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.saga</groupId>
- <artifactId>omega-transaction</artifactId>
+ <artifactId>omega-transport-dubbo</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.saga</groupId>
- <artifactId>omega-spring-tx</artifactId>
+ <artifactId>omega-transport-feign</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.saga</groupId>
- <artifactId>omega-transport-resttemplate</artifactId>
+ <artifactId>omega-transport-servicecomb</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.saga</groupId>
diff --git a/pom.xml b/pom.xml
index f1eef13..d5b59bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,13 +31,7 @@
<version>0.3.0-SNAPSHOT</version>
<modules>
- <module>saga-core</module>
- <module>saga-core-akka</module>
- <module>transports</module>
- <module>saga-spring</module>
<module>docker-build-config</module>
- <module>saga-format</module>
- <module>saga-discovery</module>
<module>saga-web</module>
<module>omega</module>
<module>alpha</module>
@@ -247,32 +241,6 @@
<version>0.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
- <artifactId>saga-core</artifactId>
- <version>0.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
- <artifactId>saga-core-akka</artifactId>
- <version>0.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
- <artifactId>saga-core</artifactId>
- <type>test-jar</type>
- <version>0.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
- <artifactId>saga-format</artifactId>
- <version>0.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
- <artifactId>saga-spring</artifactId>
- <version>0.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>org.apache.servicecomb.saga.transports</groupId>
<artifactId>transport-httpclient</artifactId>
<version>0.3.0-SNAPSHOT</version>
@@ -357,6 +325,7 @@
<artifactId>pack-common</artifactId>
<version>0.3.0-SNAPSHOT</version>
</dependency>
+ <!-- TODO rename this artifact -->
<dependency>
<groupId>org.apache.servicecomb.saga</groupId>
<artifactId>saga-persistence-jpa</artifactId>
diff --git a/saga-demo/pom.xml b/saga-demo/pom.xml
index 614dfa6..d2c0db3 100644
--- a/saga-demo/pom.xml
+++ b/saga-demo/pom.xml
@@ -33,8 +33,6 @@
<module>saga-dubbo-demo</module>
<module>saga-spring-demo</module>
<module>saga-servicecomb-demo</module>
- <module>dependency-free-transaction-demo</module>
- <module>conditional-transaction-demo</module>
<module>tcc-spring-demo</module>
</modules>
[servicecomb-pack] 03/13: SCB-976 Updated the group id to
org.apache.servicecomb.pack
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/servicecomb-pack.git
commit 8f130c276aa4d887f8e7c769e59d305d95556c50
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Fri Dec 14 11:05:35 2018 +0800
SCB-976 Updated the group id to org.apache.servicecomb.pack
---
alpha/alpha-core/pom.xml | 6 +--
alpha/alpha-server/pom.xml | 12 ++---
alpha/pom.xml | 4 +-
docker-build-config/pom.xml | 4 +-
integration-tests/coverage-aggregate/pom.xml | 28 ++++++------
integration-tests/pack-tests/pom.xml | 14 +++---
integration-tests/pom.xml | 6 +--
omega/omega-connector/omega-connector-grpc/pom.xml | 8 ++--
omega/omega-connector/pom.xml | 4 +-
omega/omega-context/pom.xml | 4 +-
omega/omega-format/pom.xml | 6 +--
omega/omega-spring-starter/pom.xml | 10 ++---
omega/omega-spring-tx/pom.xml | 10 ++---
omega/omega-transaction/pom.xml | 8 ++--
.../omega-transport/omega-transport-dubbo/pom.xml | 2 +-
.../omega-transport/omega-transport-feign/pom.xml | 2 +-
.../omega-transport-resttemplate/pom.xml | 4 +-
.../omega-transport-servicecomb/pom.xml | 2 +-
omega/omega-transport/pom.xml | 8 ++--
omega/pom.xml | 8 ++--
pack-common/pom.xml | 4 +-
pack-contracts/pack-contract-grpc/pom.xml | 4 +-
pack-contracts/pom.xml | 4 +-
pom.xml | 51 ++++++++--------------
saga-demo/pom.xml | 6 +--
saga-demo/saga-dubbo-demo/pom.xml | 10 ++---
saga-demo/saga-dubbo-demo/service-api/pom.xml | 4 +-
saga-demo/saga-dubbo-demo/service-pub/pom.xml | 4 +-
saga-demo/saga-dubbo-demo/servicea/pom.xml | 10 ++---
saga-demo/saga-dubbo-demo/serviceb/pom.xml | 8 ++--
saga-demo/saga-dubbo-demo/servicec/pom.xml | 4 +-
saga-demo/saga-servicecomb-demo/pom.xml | 4 +-
.../saga-servicecomb-demo/scb-booking/pom.xml | 4 +-
saga-demo/saga-servicecomb-demo/scb-car/pom.xml | 4 +-
saga-demo/saga-servicecomb-demo/scb-hotel/pom.xml | 4 +-
saga-demo/saga-spring-demo/booking/pom.xml | 8 ++--
saga-demo/saga-spring-demo/car/pom.xml | 8 ++--
saga-demo/saga-spring-demo/hotel/pom.xml | 8 ++--
saga-demo/saga-spring-demo/pom.xml | 2 +-
saga-demo/tcc-spring-demo/inventory/pom.xml | 2 +-
saga-demo/tcc-spring-demo/ordering/pom.xml | 2 +-
saga-demo/tcc-spring-demo/payment/pom.xml | 2 +-
saga-demo/tcc-spring-demo/pom.xml | 2 +-
saga-distribution/pom.xml | 2 +-
saga-persistence/pom.xml | 2 +-
saga-persistence/saga-persistence-jpa/pom.xml | 2 +-
saga-web/pom.xml | 4 +-
47 files changed, 152 insertions(+), 167 deletions(-)
diff --git a/alpha/alpha-core/pom.xml b/alpha/alpha-core/pom.xml
index 57c631f..bc154bb 100644
--- 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/alpha/alpha-server/pom.xml b/alpha/alpha-server/pom.xml
index 2a6856a..eb1b49a 100644
--- a/alpha/alpha-server/pom.xml
+++ b/alpha/alpha-server/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>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-server</artifactId>
- <name>Saga::Alpha::Server</name>
+ <name>Pack::Alpha::Server</name>
<dependencyManagement>
<dependencies>
@@ -63,15 +63,15 @@
<artifactId>grpc-netty</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>pack-contract-grpc</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>alpha-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>pack-common</artifactId>
</dependency>
<dependency>
@@ -89,7 +89,7 @@
<artifactId>spring-boot-starter-log4j2</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>saga-persistence-jpa</artifactId>
</dependency>
<dependency>
diff --git a/alpha/pom.xml b/alpha/pom.xml
index 4e58d97..57d2006 100644
--- a/alpha/pom.xml
+++ b/alpha/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>alpha</artifactId>
- <name>Saga::Alpha</name>
+ <name>Pack::Alpha</name>
<packaging>pom</packaging>
<modules>
diff --git a/docker-build-config/pom.xml b/docker-build-config/pom.xml
index 6395fd8..c14e005 100644
--- a/docker-build-config/pom.xml
+++ b/docker-build-config/pom.xml
@@ -19,13 +19,13 @@
<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</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>docker-build-config</artifactId>
- <name>Saga::Docker Build Config</name>
+ <name>Pack::Docker Build Config</name>
<packaging>pom</packaging>
diff --git a/integration-tests/coverage-aggregate/pom.xml b/integration-tests/coverage-aggregate/pom.xml
index 7169e95..8d92958 100644
--- a/integration-tests/coverage-aggregate/pom.xml
+++ b/integration-tests/coverage-aggregate/pom.xml
@@ -18,63 +18,63 @@
<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>
- <groupId>org.apache.servicecomb.saga.tests</groupId>
+ <groupId>org.apache.servicecomb.pack.tests</groupId>
<artifactId>integration-tests</artifactId>
<version>0.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>coverage-aggregate</artifactId>
- <name>Saga::Integration Tests::Coverage Aggregate</name>
+ <name>Pack::Integration Tests::Coverage Aggregate</name>
<dependencies>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-context</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-transaction</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-spring-tx</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-transport-resttemplate</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-transport-dubbo</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-transport-feign</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-transport-servicecomb</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-format</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-connector-grpc</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>alpha-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>alpha-server</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga.tests</groupId>
+ <groupId>org.apache.servicecomb.pack.tests</groupId>
<artifactId>pack-tests</artifactId>
<version>0.3.0-SNAPSHOT</version>
</dependency>
diff --git a/integration-tests/pack-tests/pom.xml b/integration-tests/pack-tests/pom.xml
index dcb3678..f94d2f9 100644
--- a/integration-tests/pack-tests/pom.xml
+++ b/integration-tests/pack-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>integration-tests</artifactId>
- <groupId>org.apache.servicecomb.saga.tests</groupId>
+ <groupId>org.apache.servicecomb.pack.tests</groupId>
<version>0.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pack-tests</artifactId>
- <name>Saga::Integration Tests::Pack Tests</name>
+ <name>Pack::Integration Tests::Pack Tests</name>
<dependencyManagement>
@@ -56,19 +56,19 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>pack-common</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>alpha-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-spring-starter</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-transport-resttemplate</artifactId>
</dependency>
<dependency>
@@ -107,7 +107,7 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>saga-persistence-jpa</artifactId>
<scope>test</scope>
</dependency>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 4253779..e790890 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -19,14 +19,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</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>
- <groupId>org.apache.servicecomb.saga.tests</groupId>
+ <groupId>org.apache.servicecomb.pack.tests</groupId>
<artifactId>integration-tests</artifactId>
- <name>Saga::Integration Tests</name>
+ <name>Pack::Integration Tests</name>
<packaging>pom</packaging>
<modules>
diff --git a/omega/omega-connector/omega-connector-grpc/pom.xml b/omega/omega-connector/omega-connector-grpc/pom.xml
index f4d7bf1..b211d9b 100644
--- a/omega/omega-connector/omega-connector-grpc/pom.xml
+++ b/omega/omega-connector/omega-connector-grpc/pom.xml
@@ -23,13 +23,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>omega-connector</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>omega-connector-grpc</artifactId>
- <name>Saga::Omega::Connector::GRPC</name>
+ <name>Pack::Omega::Connector::GRPC</name>
<dependencies>
<dependency>
@@ -45,11 +45,11 @@
<artifactId>netty-tcnative-boringssl-static</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-transaction</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>pack-contract-grpc</artifactId>
</dependency>
<dependency>
diff --git a/omega/omega-connector/pom.xml b/omega/omega-connector/pom.xml
index cc2ed73..4edf0fb 100644
--- a/omega/omega-connector/pom.xml
+++ b/omega/omega-connector/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>omega</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>omega-connector</artifactId>
- <name>Saga::Omega::Connector</name>
+ <name>Pack::Omega::Connector</name>
<packaging>pom</packaging>
<modules>
<module>omega-connector-grpc</module>
diff --git a/omega/omega-context/pom.xml b/omega/omega-context/pom.xml
index 654295c..c595c99 100644
--- a/omega/omega-context/pom.xml
+++ b/omega/omega-context/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>omega</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>omega-context</artifactId>
- <name>Saga::Omega::Context</name>
+ <name>Pack::Omega::Context</name>
<dependencies>
<dependency>
diff --git a/omega/omega-format/pom.xml b/omega/omega-format/pom.xml
index c4be4b2..efd215a 100644
--- a/omega/omega-format/pom.xml
+++ b/omega/omega-format/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>omega</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>omega-format</artifactId>
- <name>Saga::Omega::Format</name>
+ <name>Pack::Omega::Format</name>
<dependencies>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-transaction</artifactId>
</dependency>
<dependency>
diff --git a/omega/omega-spring-starter/pom.xml b/omega/omega-spring-starter/pom.xml
index 7baae84..49279fa 100644
--- a/omega/omega-spring-starter/pom.xml
+++ b/omega/omega-spring-starter/pom.xml
@@ -21,21 +21,21 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>omega</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>omega-spring-starter</artifactId>
- <name>Saga::Omega::Spring Starter</name>
+ <name>Pack::Omega::Spring Starter</name>
<dependencies>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-spring-tx</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-format</artifactId>
</dependency>
<dependency>
@@ -47,7 +47,7 @@
<artifactId>grpc-stub</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-connector-grpc</artifactId>
</dependency>
</dependencies>
diff --git a/omega/omega-spring-tx/pom.xml b/omega/omega-spring-tx/pom.xml
index ec6c020..fb51024 100644
--- a/omega/omega-spring-tx/pom.xml
+++ b/omega/omega-spring-tx/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>omega</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>omega-spring-tx</artifactId>
- <name>Saga::Omega::Spring TX</name>
+ <name>Pack::Omega::Spring TX</name>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -40,11 +40,11 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-context</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-transaction</artifactId>
</dependency>
@@ -75,7 +75,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>saga-persistence-jpa</artifactId>
<scope>test</scope>
</dependency>
diff --git a/omega/omega-transaction/pom.xml b/omega/omega-transaction/pom.xml
index 8b487cd..e9f357f 100644
--- a/omega/omega-transaction/pom.xml
+++ b/omega/omega-transaction/pom.xml
@@ -21,21 +21,21 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>omega</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>omega-transaction</artifactId>
- <name>Saga::Omega::Transaction</name>
+ <name>Pack::Omega::Transaction</name>
<dependencies>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>pack-common</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-context</artifactId>
</dependency>
<dependency>
diff --git a/omega/omega-transport/omega-transport-dubbo/pom.xml b/omega/omega-transport/omega-transport-dubbo/pom.xml
index ec9522e..09018ca 100644
--- a/omega/omega-transport/omega-transport-dubbo/pom.xml
+++ b/omega/omega-transport/omega-transport-dubbo/pom.xml
@@ -22,7 +22,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>omega-transport</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>
diff --git a/omega/omega-transport/omega-transport-feign/pom.xml b/omega/omega-transport/omega-transport-feign/pom.xml
index fd9b050..d8d3f7b 100644
--- a/omega/omega-transport/omega-transport-feign/pom.xml
+++ b/omega/omega-transport/omega-transport-feign/pom.xml
@@ -22,7 +22,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>omega-transport</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>
diff --git a/omega/omega-transport/omega-transport-resttemplate/pom.xml b/omega/omega-transport/omega-transport-resttemplate/pom.xml
index d9e348a..7edfad7 100644
--- a/omega/omega-transport/omega-transport-resttemplate/pom.xml
+++ b/omega/omega-transport/omega-transport-resttemplate/pom.xml
@@ -22,13 +22,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>omega-transport</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>omega-transport-resttemplate</artifactId>
- <name>Saga::Omega::Transport::Rest Template</name>
+ <name>Pack::Omega::Transport::Rest Template</name>
<dependencies>
<dependency>
diff --git a/omega/omega-transport/omega-transport-servicecomb/pom.xml b/omega/omega-transport/omega-transport-servicecomb/pom.xml
index 951de05..835e96f 100644
--- a/omega/omega-transport/omega-transport-servicecomb/pom.xml
+++ b/omega/omega-transport/omega-transport-servicecomb/pom.xml
@@ -21,7 +21,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>omega-transport</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>
diff --git a/omega/omega-transport/pom.xml b/omega/omega-transport/pom.xml
index f3626f3..6d1b288 100644
--- a/omega/omega-transport/pom.xml
+++ b/omega/omega-transport/pom.xml
@@ -22,13 +22,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>omega</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>omega-transport</artifactId>
- <name>Saga::Omega::Transport</name>
+ <name>Pack::Omega::Transport</name>
<packaging>pom</packaging>
<modules>
@@ -40,11 +40,11 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-context</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-transaction</artifactId>
</dependency>
diff --git a/omega/pom.xml b/omega/pom.xml
index bc431b5..abfcd09 100644
--- a/omega/pom.xml
+++ b/omega/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>omega</artifactId>
- <name>Saga::Omega</name>
+ <name>Pack::Omega</name>
<packaging>pom</packaging>
<modules>
@@ -62,12 +62,12 @@
<scope>import</scope>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-context</artifactId>
<version>0.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-transaction</artifactId>
<version>0.3.0-SNAPSHOT</version>
</dependency>
diff --git a/pack-common/pom.xml b/pack-common/pom.xml
index c32d7a2..2cf1625 100644
--- a/pack-common/pom.xml
+++ b/pack-common/pom.xml
@@ -21,12 +21,12 @@
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>pack-common</artifactId>
- <name>Saga::Pack Common</name>
+ <name>Pack::Pack Common</name>
</project>
diff --git a/pack-contracts/pack-contract-grpc/pom.xml b/pack-contracts/pack-contract-grpc/pom.xml
index f7b794b..7c805bb 100644
--- a/pack-contracts/pack-contract-grpc/pom.xml
+++ b/pack-contracts/pack-contract-grpc/pom.xml
@@ -24,13 +24,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>pack-contracts</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>pack-contract-grpc</artifactId>
- <name>Saga::Pack Contracts::Grpc</name>
+ <name>Pack::Pack Contracts::Grpc</name>
<dependencies>
<dependency>
diff --git a/pack-contracts/pom.xml b/pack-contracts/pom.xml
index ed2a5d5..4d6d2da 100644
--- a/pack-contracts/pom.xml
+++ b/pack-contracts/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>pack-contracts</artifactId>
- <name>Saga::Pack Contracts</name>
+ <name>Pack::Pack Contracts</name>
<packaging>pom</packaging>
<modules>
diff --git a/pom.xml b/pom.xml
index d5b59bc..b10dc2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<version>18</version>
</parent>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>saga</artifactId>
<packaging>pom</packaging>
<version>0.3.0-SNAPSHOT</version>
@@ -236,98 +236,83 @@
<version>3.3.2.Final</version>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-transport-feign</artifactId>
<version>0.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga.transports</groupId>
+ <groupId>org.apache.servicecomb.pack.transports</groupId>
<artifactId>transport-httpclient</artifactId>
<version>0.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga.transports</groupId>
- <artifactId>transport-httpclient-spring</artifactId>
- <version>0.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb.saga.transports</groupId>
- <artifactId>transport-resttemplate</artifactId>
- <version>0.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb.saga.discovery</groupId>
- <artifactId>saga-discovery-servicecenter</artifactId>
- <version>0.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-context</artifactId>
<version>0.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-transaction</artifactId>
<version>0.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-spring-tx</artifactId>
<version>0.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-transport-resttemplate</artifactId>
<version>0.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-transport-dubbo</artifactId>
<version>0.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-transport-servicecomb</artifactId>
<version>0.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-connector-grpc</artifactId>
<version>0.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-spring-starter</artifactId>
<version>0.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-format</artifactId>
<version>0.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>alpha-core</artifactId>
<version>0.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>alpha-server</artifactId>
<version>0.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>pack-contract-grpc</artifactId>
<version>0.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>pack-common</artifactId>
<version>0.3.0-SNAPSHOT</version>
</dependency>
<!-- TODO rename this artifact -->
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>saga-persistence-jpa</artifactId>
<version>0.3.0-SNAPSHOT</version>
</dependency>
@@ -622,7 +607,7 @@
<configuration>
<mixins>
<mixin>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>docker-build-config</artifactId>
<version>${project.version}</version>
</mixin>
diff --git a/saga-demo/pom.xml b/saga-demo/pom.xml
index d2c0db3..556201b 100644
--- a/saga-demo/pom.xml
+++ b/saga-demo/pom.xml
@@ -19,14 +19,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</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>
- <groupId>org.apache.servicecomb.saga.demo</groupId>
+ <groupId>org.apache.servicecomb.pack.demo</groupId>
<artifactId>saga-demo</artifactId>
- <name>Saga::Demo</name>
+ <name>Pack::Demo</name>
<packaging>pom</packaging>
<modules>
diff --git a/saga-demo/saga-dubbo-demo/pom.xml b/saga-demo/saga-dubbo-demo/pom.xml
index 3ba7d0c..ef4c783 100644
--- a/saga-demo/saga-dubbo-demo/pom.xml
+++ b/saga-demo/saga-dubbo-demo/pom.xml
@@ -20,13 +20,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>saga-demo</artifactId>
- <groupId>org.apache.servicecomb.saga.demo</groupId>
+ <groupId>org.apache.servicecomb.pack.demo</groupId>
<version>0.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>saga-dubbo-demo</artifactId>
- <name>Saga::Demo::Dubbo-Demo</name>
+ <name>Pack::Demo::Dubbo-Demo</name>
<packaging>pom</packaging>
<properties>
@@ -60,7 +60,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-transport-dubbo</artifactId>
<version>${saga.version}</version>
</dependency>
@@ -69,7 +69,7 @@
<artifactId>spring-jdbc</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-spring-starter</artifactId>
</dependency>
<dependency>
@@ -81,7 +81,7 @@
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-transport-resttemplate</artifactId>
</dependency>
<dependency>
diff --git a/saga-demo/saga-dubbo-demo/service-api/pom.xml b/saga-demo/saga-dubbo-demo/service-api/pom.xml
index 4c4ceac..805422b 100644
--- a/saga-demo/saga-dubbo-demo/service-api/pom.xml
+++ b/saga-demo/saga-dubbo-demo/service-api/pom.xml
@@ -35,6 +35,6 @@
</parent>
<artifactId>service-api</artifactId>
- <name>Saga::Demo::Dubbo-Demo::ServiceAPI</name>
+ <name>Pack::Demo::Dubbo-Demo::ServiceAPI</name>
-</project>
\ No newline at end of file
+</project>
diff --git a/saga-demo/saga-dubbo-demo/service-pub/pom.xml b/saga-demo/saga-dubbo-demo/service-pub/pom.xml
index 2c4dea9..b8ebb92 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>
+ <name>Pack::Demo::Dubbo-Demo::ServicePub</name>
-</project>
\ No newline at end of file
+</project>
diff --git a/saga-demo/saga-dubbo-demo/servicea/pom.xml b/saga-demo/saga-dubbo-demo/servicea/pom.xml
index 9dad60d..47da69a 100644
--- a/saga-demo/saga-dubbo-demo/servicea/pom.xml
+++ b/saga-demo/saga-dubbo-demo/servicea/pom.xml
@@ -22,25 +22,25 @@
<modelVersion>4.0.0</modelVersion>
<dependencies>
<dependency>
- <groupId>org.apache.servicecomb.saga.demo</groupId>
+ <groupId>org.apache.servicecomb.pack.demo</groupId>
<artifactId>service-api</artifactId>
<version>${saga.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga.demo</groupId>
+ <groupId>org.apache.servicecomb.pack.demo</groupId>
<artifactId>service-pub</artifactId>
<version>${saga.version}</version>
</dependency>
</dependencies>
<parent>
- <groupId>org.apache.servicecomb.saga.demo</groupId>
+ <groupId>org.apache.servicecomb.pack.demo</groupId>
<artifactId>saga-dubbo-demo</artifactId>
<version>0.3.0-SNAPSHOT</version>
</parent>
<artifactId>servicea</artifactId>
- <name>Saga::Demo::Dubbo-Demo::ServiceA</name>
+ <name>Pack::Demo::Dubbo-Demo::ServiceA</name>
<build>
<plugins>
@@ -91,4 +91,4 @@
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
diff --git a/saga-demo/saga-dubbo-demo/serviceb/pom.xml b/saga-demo/saga-dubbo-demo/serviceb/pom.xml
index 7aa8bbc..66ffc04 100644
--- a/saga-demo/saga-dubbo-demo/serviceb/pom.xml
+++ b/saga-demo/saga-dubbo-demo/serviceb/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<dependencies>
<dependency>
- <groupId>org.apache.servicecomb.saga.demo</groupId>
+ <groupId>org.apache.servicecomb.pack.demo</groupId>
<artifactId>service-api</artifactId>
<version>0.3.0-SNAPSHOT</version>
<scope>compile</scope>
@@ -30,13 +30,13 @@
</dependencies>
<parent>
- <groupId>org.apache.servicecomb.saga.demo</groupId>
+ <groupId>org.apache.servicecomb.pack.demo</groupId>
<artifactId>saga-dubbo-demo</artifactId>
<version>0.3.0-SNAPSHOT</version>
</parent>
<artifactId>serviceb</artifactId>
- <name>Saga::Demo::Dubbo-Demo::ServiceB</name>
+ <name>Pack::Demo::Dubbo-Demo::ServiceB</name>
<build>
<plugins>
@@ -87,4 +87,4 @@
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
diff --git a/saga-demo/saga-dubbo-demo/servicec/pom.xml b/saga-demo/saga-dubbo-demo/servicec/pom.xml
index 6046ed8..e99dd98 100644
--- a/saga-demo/saga-dubbo-demo/servicec/pom.xml
+++ b/saga-demo/saga-dubbo-demo/servicec/pom.xml
@@ -36,7 +36,7 @@
</parent>
<artifactId>servicec</artifactId>
- <name>Saga::Demo::Dubbo-Demo::ServiceC</name>
+ <name>Pack::Demo::Dubbo-Demo::ServiceC</name>
<build>
<plugins>
@@ -87,4 +87,4 @@
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
diff --git a/saga-demo/saga-servicecomb-demo/pom.xml b/saga-demo/saga-servicecomb-demo/pom.xml
index ef8f46b..e72ce81 100644
--- a/saga-demo/saga-servicecomb-demo/pom.xml
+++ b/saga-demo/saga-servicecomb-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>saga-demo</artifactId>
- <groupId>org.apache.servicecomb.saga.demo</groupId>
+ <groupId>org.apache.servicecomb.pack.demo</groupId>
<version>0.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>saga-servicecomb-demo</artifactId>
- <name>Saga::Demo::ServiceComb-Demo</name>
+ <name>Pack::Demo::ServiceComb-Demo</name>
<packaging>pom</packaging>
diff --git a/saga-demo/saga-servicecomb-demo/scb-booking/pom.xml b/saga-demo/saga-servicecomb-demo/scb-booking/pom.xml
index 4a21c10..1858aae 100644
--- a/saga-demo/saga-servicecomb-demo/scb-booking/pom.xml
+++ b/saga-demo/saga-servicecomb-demo/scb-booking/pom.xml
@@ -27,6 +27,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>scb-booking</artifactId>
- <name>Saga::Demo::ServiceComb-Demo::Booking</name>
+ <name>Pack::Demo::ServiceComb-Demo::Booking</name>
-</project>
\ No newline at end of file
+</project>
diff --git a/saga-demo/saga-servicecomb-demo/scb-car/pom.xml b/saga-demo/saga-servicecomb-demo/scb-car/pom.xml
index 8f13b37..1c32849 100644
--- a/saga-demo/saga-servicecomb-demo/scb-car/pom.xml
+++ b/saga-demo/saga-servicecomb-demo/scb-car/pom.xml
@@ -27,6 +27,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>scb-car</artifactId>
- <name>Saga::Demo::ServiceComb-Demo::Car</name>
+ <name>Pack::Demo::ServiceComb-Demo::Car</name>
-</project>
\ No newline at end of file
+</project>
diff --git a/saga-demo/saga-servicecomb-demo/scb-hotel/pom.xml b/saga-demo/saga-servicecomb-demo/scb-hotel/pom.xml
index b617d4d..23424f2 100644
--- a/saga-demo/saga-servicecomb-demo/scb-hotel/pom.xml
+++ b/saga-demo/saga-servicecomb-demo/scb-hotel/pom.xml
@@ -27,6 +27,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>scb-hotel</artifactId>
- <name>Saga::Demo::ServiceComb-Demo::Hotel</name>
+ <name>Pack::Demo::ServiceComb-Demo::Hotel</name>
-</project>
\ No newline at end of file
+</project>
diff --git a/saga-demo/saga-spring-demo/booking/pom.xml b/saga-demo/saga-spring-demo/booking/pom.xml
index b1d77c8..6f854e7 100644
--- a/saga-demo/saga-spring-demo/booking/pom.xml
+++ b/saga-demo/saga-spring-demo/booking/pom.xml
@@ -19,13 +19,13 @@
<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-demo</artifactId>
- <groupId>org.apache.servicecomb.saga.demo</groupId>
+ <groupId>org.apache.servicecomb.pack.demo</groupId>
<version>0.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>booking</artifactId>
- <name>Saga::Demo::Spring-Demo::Booking</name>
+ <name>Pack::Demo::Spring-Demo::Booking</name>
<dependencies>
<dependency>
@@ -37,11 +37,11 @@
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-spring-starter</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-transport-resttemplate</artifactId>
</dependency>
</dependencies>
diff --git a/saga-demo/saga-spring-demo/car/pom.xml b/saga-demo/saga-spring-demo/car/pom.xml
index 169c13e..7314c54 100644
--- a/saga-demo/saga-spring-demo/car/pom.xml
+++ b/saga-demo/saga-spring-demo/car/pom.xml
@@ -19,13 +19,13 @@
<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-demo</artifactId>
- <groupId>org.apache.servicecomb.saga.demo</groupId>
+ <groupId>org.apache.servicecomb.pack.demo</groupId>
<version>0.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>car</artifactId>
- <name>Saga::Demo::Spring-Demo::Car</name>
+ <name>Pack::Demo::Spring-Demo::Car</name>
<dependencies>
<dependency>
@@ -37,11 +37,11 @@
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-spring-starter</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-transport-resttemplate</artifactId>
</dependency>
</dependencies>
diff --git a/saga-demo/saga-spring-demo/hotel/pom.xml b/saga-demo/saga-spring-demo/hotel/pom.xml
index 57c8557..56fc35c 100644
--- a/saga-demo/saga-spring-demo/hotel/pom.xml
+++ b/saga-demo/saga-spring-demo/hotel/pom.xml
@@ -19,13 +19,13 @@
<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-demo</artifactId>
- <groupId>org.apache.servicecomb.saga.demo</groupId>
+ <groupId>org.apache.servicecomb.pack.demo</groupId>
<version>0.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>hotel</artifactId>
- <name>Saga::Demo::Spring-Demo::Hotel</name>
+ <name>Pack::Demo::Spring-Demo::Hotel</name>
<dependencies>
<dependency>
@@ -37,11 +37,11 @@
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-spring-starter</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-transport-resttemplate</artifactId>
</dependency>
</dependencies>
diff --git a/saga-demo/saga-spring-demo/pom.xml b/saga-demo/saga-spring-demo/pom.xml
index 63aff40..ab5bece 100644
--- a/saga-demo/saga-spring-demo/pom.xml
+++ b/saga-demo/saga-spring-demo/pom.xml
@@ -25,7 +25,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>saga-spring-demo</artifactId>
- <name>Saga::Demo::Spring-Demo</name>
+ <name>Pack::Demo::Spring-Demo</name>
<packaging>pom</packaging>
<modules>
diff --git a/saga-demo/tcc-spring-demo/inventory/pom.xml b/saga-demo/tcc-spring-demo/inventory/pom.xml
index bd2f287..8d44906 100644
--- a/saga-demo/tcc-spring-demo/inventory/pom.xml
+++ b/saga-demo/tcc-spring-demo/inventory/pom.xml
@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>tcc-inventory</artifactId>
- <name>Saga::Demo::Tcc-Spring-Demo::Tcc-Inventory</name>
+ <name>Pack::Demo::Tcc-Spring-Demo::Tcc-Inventory</name>
<dependencies>
<!-- Add the JPA starter -->
diff --git a/saga-demo/tcc-spring-demo/ordering/pom.xml b/saga-demo/tcc-spring-demo/ordering/pom.xml
index 8158a35..4dae748 100644
--- a/saga-demo/tcc-spring-demo/ordering/pom.xml
+++ b/saga-demo/tcc-spring-demo/ordering/pom.xml
@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>tcc-ordering</artifactId>
- <name>Saga::Demo::Tcc-Spring-Demo::Tcc-Ordering</name>
+ <name>Pack::Demo::Tcc-Spring-Demo::Tcc-Ordering</name>
<build>
<plugins>
diff --git a/saga-demo/tcc-spring-demo/payment/pom.xml b/saga-demo/tcc-spring-demo/payment/pom.xml
index 9c07521..9a91dbd 100644
--- a/saga-demo/tcc-spring-demo/payment/pom.xml
+++ b/saga-demo/tcc-spring-demo/payment/pom.xml
@@ -25,7 +25,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>tcc-payment</artifactId>
- <name>Saga::Demo::Tcc-Spring-Demo::Tcc-Payment</name>
+ <name>Pack::Demo::Tcc-Spring-Demo::Tcc-Payment</name>
<dependencies>
<!-- Add the JPA starter -->
diff --git a/saga-demo/tcc-spring-demo/pom.xml b/saga-demo/tcc-spring-demo/pom.xml
index 76bc069..e7e7ec9 100644
--- a/saga-demo/tcc-spring-demo/pom.xml
+++ b/saga-demo/tcc-spring-demo/pom.xml
@@ -25,7 +25,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>tcc-spring-demo</artifactId>
- <name>Saga::Demo::Tcc-Spring-Demo</name>
+ <name>Pack::Demo::Tcc-Spring-Demo</name>
<packaging>pom</packaging>
<modules>
diff --git a/saga-distribution/pom.xml b/saga-distribution/pom.xml
index aeab76a..7451170 100644
--- a/saga-distribution/pom.xml
+++ b/saga-distribution/pom.xml
@@ -24,7 +24,7 @@
<version>0.3.0-SNAPSHOT</version>
</parent>
<artifactId>apache-servicecomb-incubating-saga-distribution</artifactId>
- <name>Saga::Distribution</name>
+ <name>Pack::Distribution</name>
<packaging>pom</packaging>
<dependencies>
<dependency>
diff --git a/saga-persistence/pom.xml b/saga-persistence/pom.xml
index 134c83d..5f0cd41 100644
--- a/saga-persistence/pom.xml
+++ b/saga-persistence/pom.xml
@@ -21,7 +21,7 @@
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>
diff --git a/saga-persistence/saga-persistence-jpa/pom.xml b/saga-persistence/saga-persistence-jpa/pom.xml
index 6bd5dd8..b08dc8d 100644
--- a/saga-persistence/saga-persistence-jpa/pom.xml
+++ b/saga-persistence/saga-persistence-jpa/pom.xml
@@ -21,7 +21,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>saga-persistence</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>
diff --git a/saga-web/pom.xml b/saga-web/pom.xml
index 007e6d0..2622563 100644
--- a/saga-web/pom.xml
+++ b/saga-web/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>saga-web</artifactId>
- <name>Saga::Web</name>
+ <name>Pack::Web</name>
<dependencyManagement>
<dependencies>
[servicecomb-pack] 04/13: SCB-976 Removed the Saga related name
from poms and directories
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/servicecomb-pack.git
commit be1eb1c629dce6058254f6125fd9140b545f0744
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Fri Dec 14 11:28:40 2018 +0800
SCB-976 Removed the Saga related name from poms and directories
---
alpha/alpha-server/pom.xml | 2 +-
{saga-demo => demo}/pom.xml | 0
{saga-demo => demo}/saga-dubbo-demo/README.md | 0
.../saga-dubbo-demo}/docker-compose-alpha.yaml | 0
.../saga-dubbo-demo/docker-compose-demo.yaml | 0
.../saga-dubbo-demo/docker-compose.mysql.yaml | 0
{saga-demo => demo}/saga-dubbo-demo/docker-compose.yaml | 0
{saga-demo => demo}/saga-dubbo-demo/pom.xml | 0
{saga-demo => demo}/saga-dubbo-demo/saga-dubbo-demo.sh | 0
{saga-demo => demo}/saga-dubbo-demo/service-api/pom.xml | 0
.../apache/servicecomb/saga/demo/dubbo/api/IService.java | 0
.../apache/servicecomb/saga/demo/dubbo/api/IServiceA.java | 0
.../apache/servicecomb/saga/demo/dubbo/api/IServiceB.java | 0
.../apache/servicecomb/saga/demo/dubbo/api/IServiceC.java | 0
.../service-api/src/main/resources/dubbo.properties | 0
{saga-demo => demo}/saga-dubbo-demo/service-pub/pom.xml | 0
.../apache/servicecomb/saga/demo/dubbo/pub/AbsService.java | 0
.../apache/servicecomb/saga/demo/dubbo/pub/IInvokeCode.java | 0
.../servicecomb/saga/demo/dubbo/pub/InvokeContext.java | 0
.../apache/servicecomb/saga/demo/dubbo/pub/ServiceVO.java | 0
{saga-demo => demo}/saga-dubbo-demo/servicea/pom.xml | 0
.../servicecomb/saga/demo/dubbo/servicea/ApplicationA.java | 0
.../servicecomb/saga/demo/dubbo/servicea/ServiceA.java | 0
.../saga/demo/dubbo/servicea/web/DubboDemoController.java | 0
.../saga/demo/dubbo/servicea/web/MvcConfigurer.java | 0
.../servicea/src/main/resources/application.yaml | 0
.../servicea/src/main/resources/dubbo-context.xml | 0
.../saga-dubbo-demo/servicea}/src/main/resources/jdbc.xml | 0
.../saga-dubbo-demo/servicea}/src/main/resources/log4j2.xml | 0
.../servicea/src/main/resources/schema-mysql.sql | 0
.../servicea/src/main/resources/schema-postgresql.sql | 0
.../servicea/src/main/resources/static/index.html | 0
{saga-demo => demo}/saga-dubbo-demo/serviceb/pom.xml | 0
.../servicecomb/saga/demo/dubbo/serviceb/ApplicationB.java | 0
.../servicecomb/saga/demo/dubbo/serviceb/ServiceB.java | 0
.../serviceb/src/main/resources/application.yaml | 0
.../serviceb/src/main/resources/dubbo-context.xml | 0
.../saga-dubbo-demo/serviceb/src/main/resources/jdbc.xml | 0
.../saga-dubbo-demo/serviceb}/src/main/resources/log4j2.xml | 0
.../serviceb/src/main/resources/schema-mysql.sql | 0
.../serviceb/src/main/resources/schema-postgresql.sql | 0
{saga-demo => demo}/saga-dubbo-demo/servicec/pom.xml | 0
.../servicecomb/saga/demo/dubbo/servicec/ApplicationC.java | 0
.../servicecomb/saga/demo/dubbo/servicec/ServiceC.java | 0
.../servicec/src/main/resources/application.yaml | 0
.../servicec/src/main/resources/dubbo-context.xml | 0
.../saga-dubbo-demo/servicec}/src/main/resources/jdbc.xml | 0
.../saga-dubbo-demo/servicec}/src/main/resources/log4j2.xml | 0
.../servicec/src/main/resources/schema-mysql.sql | 0
.../servicec/src/main/resources/schema-postgresql.sql | 0
{saga-demo => demo}/saga-dubbo-demo/sql/schema-mysql.sql | 0
{saga-demo => demo}/saga-k8s-resources/README.md | 0
{saga-demo => demo}/saga-k8s-resources/base/alpha.yaml | 0
.../saga-k8s-resources/base/jmeter-collector.yaml | 0
{saga-demo => demo}/saga-k8s-resources/base/postgresql.yaml | 0
.../saga-k8s-resources/spring-demo/booking.yaml | 0
{saga-demo => demo}/saga-k8s-resources/spring-demo/car.yaml | 0
.../saga-k8s-resources/spring-demo/hotel.yaml | 0
.../spring-demo/test/jmeter.configmap.yaml | 0
.../saga-k8s-resources/spring-demo/test/jmeter.yaml | 0
{saga-demo => demo}/saga-servicecomb-demo/README.md | 0
.../saga-servicecomb-demo/docker-compose.yaml | 0
{saga-demo => demo}/saga-servicecomb-demo/pom.xml | 0
.../saga-servicecomb-demo/saga-servicecomb-demo.sh | 0
.../saga-servicecomb-demo/scb-booking/pom.xml | 0
.../saga/demo/scb/booking/BookingApplication.java | 0
.../saga/demo/scb/booking/BookingController.java | 0
.../scb-booking}/src/main/resources/application.yaml | 0
.../scb-booking}/src/main/resources/log4j2.xml | 0
.../scb-booking/src/main/resources/microservice.yaml | 0
{saga-demo => demo}/saga-servicecomb-demo/scb-car/pom.xml | 0
.../servicecomb/saga/demo/scb/car/CarApplication.java | 0
.../apache/servicecomb/saga/demo/scb/car/CarBooking.java | 0
.../servicecomb/saga/demo/scb/car/CarBookingController.java | 0
.../servicecomb/saga/demo/scb/car/CarBookingService.java | 0
.../scb-car}/src/main/resources/application.yaml | 0
.../scb-car}/src/main/resources/log4j2.xml | 0
.../scb-car/src/main/resources/microservice.yaml | 0
{saga-demo => demo}/saga-servicecomb-demo/scb-hotel/pom.xml | 0
.../servicecomb/saga/demo/scb/hotel/HotelApplication.java | 0
.../servicecomb/saga/demo/scb/hotel/HotelBooking.java | 0
.../saga/demo/scb/hotel/HotelBookingController.java | 0
.../saga/demo/scb/hotel/HotelBookingService.java | 0
.../scb-hotel}/src/main/resources/application.yaml | 0
.../scb-hotel}/src/main/resources/log4j2.xml | 0
.../scb-hotel/src/main/resources/microservice.yaml | 0
{saga-demo => demo}/saga-spring-demo/README.md | 0
{saga-demo => demo}/saga-spring-demo/booking/pom.xml | 0
.../servicecomb/saga/demo/pack/booking/Application.java | 0
.../saga/demo/pack/booking/BookingController.java | 0
.../servicecomb/saga/demo/pack/booking/MyConfiguration.java | 0
.../booking}/src/main/resources/application.yaml | 0
.../saga-spring-demo/booking}/src/main/resources/log4j2.xml | 0
.../booking/src/main/resources/static/index.html | 0
{saga-demo => demo}/saga-spring-demo/car/pom.xml | 0
.../apache/servicecomb/saga/demo/pack/car/Application.java | 0
.../apache/servicecomb/saga/demo/pack/car/CarBooking.java | 0
.../saga/demo/pack/car/CarBookingController.java | 0
.../servicecomb/saga/demo/pack/car/CarBookingService.java | 0
.../car}/src/main/resources/application.yaml | 0
.../saga-spring-demo/car}/src/main/resources/log4j2.xml | 0
.../saga-spring-demo/docker-compose-alpha-perf.yaml | 0
.../saga-spring-demo/docker-compose-alpha.yaml | 0
.../saga-spring-demo/docker-compose-demo.yaml | 0
.../saga-spring-demo}/docker-compose.mysql.yaml | 0
{saga-demo => demo}/saga-spring-demo/docker-compose.yaml | 0
{saga-demo => demo}/saga-spring-demo/hotel/pom.xml | 0
.../servicecomb/saga/demo/pack/hotel/Application.java | 0
.../servicecomb/saga/demo/pack/hotel/HotelBooking.java | 0
.../saga/demo/pack/hotel/HotelBookingController.java | 0
.../saga/demo/pack/hotel/HotelBookingService.java | 0
.../hotel}/src/main/resources/application.yaml | 0
.../saga-spring-demo/hotel}/src/main/resources/log4j2.xml | 0
{saga-demo => demo}/saga-spring-demo/pom.xml | 0
{saga-demo => demo}/saga-spring-demo/saga-demo.sh | 0
{saga-demo => demo}/tcc-spring-demo/README.md | 0
.../tcc-spring-demo}/docker-compose-alpha.yaml | 0
.../tcc-spring-demo/docker-compose-demo.yaml | 0
.../tcc-spring-demo}/docker-compose.mysql.yaml | 0
{saga-demo => demo}/tcc-spring-demo/docker-compose.yaml | 0
{saga-demo => demo}/tcc-spring-demo/inventory/pom.xml | 2 +-
.../saga/demo/pack/inventory/InventoryService.java | 0
.../servicecomb/saga/demo/pack/inventory/Product.java | 0
.../saga/demo/pack/inventory/ProductController.java | 0
.../servicecomb/saga/demo/pack/inventory/ProductDao.java | 0
.../servicecomb/saga/demo/pack/inventory/ProductOrder.java | 0
.../saga/demo/pack/inventory/TccInventoryApplication.java | 0
.../inventory/src/main/resources/application.yaml | 0
.../inventory}/src/main/resources/log4j2.xml | 0
.../saga/demo/pack/inventory/InventoryServiceTest.java | 0
.../saga/demo/pack/inventory/ProductControllerTest.java | 0
.../saga/demo/pack/inventory/TestApplication.java | 0
{saga-demo => demo}/tcc-spring-demo/ordering/pom.xml | 0
.../saga/demo/pack/ordering/OrderingController.java | 0
.../saga/demo/pack/ordering/TccOrderingApplication.java | 0
.../ordering/src/main/resources/application.yaml | 0
.../tcc-spring-demo/ordering}/src/main/resources/log4j2.xml | 0
{saga-demo => demo}/tcc-spring-demo/payment/pom.xml | 2 +-
.../apache/servicecomb/saga/demo/pack/payment/Account.java | 0
.../servicecomb/saga/demo/pack/payment/AccountDao.java | 0
.../apache/servicecomb/saga/demo/pack/payment/Payment.java | 0
.../saga/demo/pack/payment/PaymentController.java | 0
.../servicecomb/saga/demo/pack/payment/PaymentService.java | 0
.../saga/demo/pack/payment/TccPaymentApplication.java | 0
.../payment/src/main/resources/application.yaml | 0
.../tcc-spring-demo/payment}/src/main/resources/log4j2.xml | 0
.../saga/demo/pack/payment/PaymentControllerTest.java | 0
.../saga/demo/pack/payment/PaymentServiceTest.java | 0
.../servicecomb/saga/demo/pack/payment/TestApplication.java | 0
{saga-demo => demo}/tcc-spring-demo/pom.xml | 0
{saga-demo => demo}/tcc-spring-demo/saga-demo.sh | 0
{saga-distribution => distribution}/pom.xml | 0
{saga-distribution => distribution}/src/assembly/bin.xml | 0
{saga-distribution => distribution}/src/assembly/src.xml | 0
{saga-distribution => distribution}/src/release/LICENSE | 0
{saga-distribution => distribution}/src/release/NOTICE | 0
.../src/release/licenses/LICENSE-asm | 0
.../src/release/licenses/LICENSE-boringssl | 0
.../src/release/licenses/LICENSE-epl-v10 | 0
.../src/release/licenses/LICENSE-esotericsoftware | 0
.../src/release/licenses/LICENSE-javax | 0
.../src/release/licenses/LICENSE-logback | 0
.../src/release/licenses/LICENSE-ngxadmin | 0
.../src/release/licenses/LICENSE-openfeign | 0
.../src/release/licenses/LICENSE-postgresql | 0
.../src/release/licenses/LICENSE-protobuf | 0
.../src/release/licenses/LICENSE-slf4j | 0
.../src/release/licenses/NOTICE-grpc | 0
.../src/release/licenses/NOTICE-netty | 0
.../src/release/licenses/NOTICE-netty-tcnative | 0
.../src/release/licenses/NOTICE-tomcat | 0
integration-tests/pack-tests/pom.xml | 2 +-
omega/omega-spring-tx/pom.xml | 2 +-
.../persistence-jpa}/pom.xml | 3 ++-
.../saga/persistence/jpa/EclipseLinkJpaConfiguration.java | 0
.../src/main/resources/META-INF/spring.factories | 0
{saga-persistence => persistence}/pom.xml | 5 +++--
pom.xml | 12 ++++++------
{saga-web => web}/pom.xml | 2 +-
.../org/apache/servicecomb/saga/web/SagaWebApplication.java | 0
{saga-web => web}/src/main/resources/application.yaml | 0
{saga-web => web}/src/main/resources/microservice.yaml | 0
.../src/main/resources/saga-frontend/README.md | 0
.../src/main/resources/saga-frontend/angular.json | 0
.../src/main/resources/saga-frontend/package.json | 0
.../resources/saga-frontend/src/app/@core/core.module.ts | 0
.../saga-frontend/src/app/@core/data/data.module.ts | 0
.../saga-frontend/src/app/@core/data/saga-events.service.ts | 0
.../saga-frontend/src/app/@core/data/state.service.ts | 0
.../saga-frontend/src/app/@core/module-import-guard.ts | 0
.../saga-frontend/src/app/@core/utils/analytics.service.ts | 0
.../saga-frontend/src/app/@core/utils/util.service.ts | 0
.../src/app/@theme/components/footer/footer.component.scss | 0
.../src/app/@theme/components/footer/footer.component.ts | 0
.../src/app/@theme/components/header/header.component.html | 0
.../src/app/@theme/components/header/header.component.scss | 0
.../src/app/@theme/components/header/header.component.ts | 0
.../saga-frontend/src/app/@theme/components/index.ts | 0
.../app/@theme/components/switcher/switcher.component.scss | 0
.../app/@theme/components/switcher/switcher.component.ts | 0
.../components/theme-settings/theme-settings.component.scss | 0
.../components/theme-settings/theme-settings.component.ts | 0
.../components/theme-switcher/theme-switcher.component.html | 0
.../components/theme-switcher/theme-switcher.component.scss | 0
.../components/theme-switcher/theme-switcher.component.ts | 0
.../themes-switcher-list/theme-switcher-list.component.scss | 0
.../themes-switcher-list/themes-switcher-list.component.ts | 0
.../src/app/@theme/layouts/default/default.layout.scss | 0
.../src/app/@theme/layouts/default/default.layout.ts | 0
.../resources/saga-frontend/src/app/@theme/layouts/index.ts | 0
.../app/@theme/layouts/one-column/one-column.layout.scss | 0
.../src/app/@theme/layouts/one-column/one-column.layout.ts | 0
.../saga-frontend/src/app/@theme/pipes/capitalize.pipe.ts | 0
.../resources/saga-frontend/src/app/@theme/pipes/index.ts | 0
.../saga-frontend/src/app/@theme/pipes/no-sanitize.pipe.ts | 0
.../src/app/@theme/pipes/number-with-commas.pipe.ts | 0
.../saga-frontend/src/app/@theme/pipes/plural.pipe.ts | 0
.../saga-frontend/src/app/@theme/pipes/round.pipe.ts | 0
.../saga-frontend/src/app/@theme/pipes/timing.pipe.ts | 0
.../saga-frontend/src/app/@theme/styles/bootstrap-rtl.scss | 0
.../saga-frontend/src/app/@theme/styles/font-size.scss | 0
.../saga-frontend/src/app/@theme/styles/pace.theme.scss | 0
.../saga-frontend/src/app/@theme/styles/styles.scss | 0
.../saga-frontend/src/app/@theme/styles/theme.corporate.ts | 0
.../saga-frontend/src/app/@theme/styles/theme.cosmic.ts | 0
.../saga-frontend/src/app/@theme/styles/theme.default.ts | 0
.../saga-frontend/src/app/@theme/styles/themes.scss | 0
.../resources/saga-frontend/src/app/@theme/theme.module.ts | 0
.../resources/saga-frontend/src/app/app-routing.module.ts | 0
.../main/resources/saga-frontend/src/app/app.component.ts | 0
.../src/main/resources/saga-frontend/src/app/app.module.ts | 0
.../pages/dashboard/count-cards/count-cards.component.html | 0
.../pages/dashboard/count-cards/count-cards.component.scss | 0
.../pages/dashboard/count-cards/count-cards.component.ts | 0
.../src/app/pages/dashboard/dashboard.component.html | 0
.../src/app/pages/dashboard/dashboard.component.scss | 0
.../src/app/pages/dashboard/dashboard.component.ts | 0
.../src/app/pages/dashboard/dashboard.module.ts | 0
.../dashboard/recent-table/recent-table.component.html | 0
.../dashboard/recent-table/recent-table.component.scss | 0
.../pages/dashboard/recent-table/recent-table.component.ts | 0
.../app/pages/miscellaneous/miscellaneous-routing.module.ts | 0
.../src/app/pages/miscellaneous/miscellaneous.component.ts | 0
.../src/app/pages/miscellaneous/miscellaneous.module.ts | 0
.../pages/miscellaneous/not-found/not-found.component.html | 0
.../pages/miscellaneous/not-found/not-found.component.scss | 0
.../pages/miscellaneous/not-found/not-found.component.ts | 0
.../resources/saga-frontend/src/app/pages/pages-menu.ts | 0
.../saga-frontend/src/app/pages/pages-routing.module.ts | 0
.../saga-frontend/src/app/pages/pages.component.ts | 0
.../resources/saga-frontend/src/app/pages/pages.module.ts | 0
.../src/app/pages/transactions/customRender.component.ts | 0
.../app/pages/transactions/findTransaction.component.html | 0
.../src/app/pages/transactions/findTransaction.component.ts | 0
.../src/app/pages/transactions/transactions.component.html | 0
.../src/app/pages/transactions/transactions.component.ts | 0
.../src/app/pages/transactions/transactions.module.ts | 0
.../app/pages/transactions/transactionsTable.component.html | 0
.../app/pages/transactions/transactionsTable.component.scss | 0
.../app/pages/transactions/transactionsTable.component.ts | 0
.../saga-frontend/src/assets/images/square_pattern.svg | 0
.../src/assets/images/square_pattern_cosmic.svg | 0
.../saga-frontend/src/environments/environment.prod.ts | 0
.../resources/saga-frontend/src/environments/environment.ts | 0
.../src/main/resources/saga-frontend/src/favicon.ico | Bin
.../src/main/resources/saga-frontend/src/favicon.png | Bin
.../src/main/resources/saga-frontend/src/index.html | 0
.../src/main/resources/saga-frontend/src/main.ts | 0
.../src/main/resources/saga-frontend/src/polyfills.ts | 0
.../src/main/resources/saga-frontend/src/tsconfig.app.json | 0
.../src/main/resources/saga-frontend/src/typings.d.ts | 0
.../src/main/resources/saga-frontend/tsconfig.json | 0
{saga-web => web}/src/main/resources/static/css/request.css | 0
{saga-web => web}/src/main/resources/static/css/style.css | 0
{saga-web => web}/src/main/resources/static/detail.html | 0
{saga-web => web}/src/main/resources/static/index.html | 0
{saga-web => web}/src/main/resources/static/js/date.js | 0
{saga-web => web}/src/main/resources/static/js/request.js | 0
{saga-web => web}/src/main/resources/static/js/table.js | 0
{saga-web => web}/src/main/resources/static/request.html | 0
{saga-web => web}/src/main/resources/static/result.html | 0
281 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/alpha/alpha-server/pom.xml b/alpha/alpha-server/pom.xml
index eb1b49a..ae81145 100644
--- a/alpha/alpha-server/pom.xml
+++ b/alpha/alpha-server/pom.xml
@@ -90,7 +90,7 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb.pack</groupId>
- <artifactId>saga-persistence-jpa</artifactId>
+ <artifactId>persistence-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
diff --git a/saga-demo/pom.xml b/demo/pom.xml
similarity index 100%
rename from saga-demo/pom.xml
rename to demo/pom.xml
diff --git a/saga-demo/saga-dubbo-demo/README.md b/demo/saga-dubbo-demo/README.md
similarity index 100%
rename from saga-demo/saga-dubbo-demo/README.md
rename to demo/saga-dubbo-demo/README.md
diff --git a/saga-demo/tcc-spring-demo/docker-compose-alpha.yaml b/demo/saga-dubbo-demo/docker-compose-alpha.yaml
similarity index 100%
rename from saga-demo/tcc-spring-demo/docker-compose-alpha.yaml
rename to demo/saga-dubbo-demo/docker-compose-alpha.yaml
diff --git a/saga-demo/saga-dubbo-demo/docker-compose-demo.yaml b/demo/saga-dubbo-demo/docker-compose-demo.yaml
similarity index 100%
rename from saga-demo/saga-dubbo-demo/docker-compose-demo.yaml
rename to demo/saga-dubbo-demo/docker-compose-demo.yaml
diff --git a/saga-demo/saga-dubbo-demo/docker-compose.mysql.yaml b/demo/saga-dubbo-demo/docker-compose.mysql.yaml
similarity index 100%
rename from saga-demo/saga-dubbo-demo/docker-compose.mysql.yaml
rename to demo/saga-dubbo-demo/docker-compose.mysql.yaml
diff --git a/saga-demo/saga-dubbo-demo/docker-compose.yaml b/demo/saga-dubbo-demo/docker-compose.yaml
similarity index 100%
rename from saga-demo/saga-dubbo-demo/docker-compose.yaml
rename to demo/saga-dubbo-demo/docker-compose.yaml
diff --git a/saga-demo/saga-dubbo-demo/pom.xml b/demo/saga-dubbo-demo/pom.xml
similarity index 100%
rename from saga-demo/saga-dubbo-demo/pom.xml
rename to demo/saga-dubbo-demo/pom.xml
diff --git a/saga-demo/saga-dubbo-demo/saga-dubbo-demo.sh b/demo/saga-dubbo-demo/saga-dubbo-demo.sh
similarity index 100%
rename from saga-demo/saga-dubbo-demo/saga-dubbo-demo.sh
rename to demo/saga-dubbo-demo/saga-dubbo-demo.sh
diff --git a/saga-demo/saga-dubbo-demo/service-api/pom.xml b/demo/saga-dubbo-demo/service-api/pom.xml
similarity index 100%
rename from saga-demo/saga-dubbo-demo/service-api/pom.xml
rename to demo/saga-dubbo-demo/service-api/pom.xml
diff --git a/saga-demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/saga/demo/dubbo/api/IService.java b/demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/saga/demo/dubbo/api/IService.java
similarity index 100%
rename from saga-demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/saga/demo/dubbo/api/IService.java
rename to demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/saga/demo/dubbo/api/IService.java
diff --git a/saga-demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/saga/demo/dubbo/api/IServiceA.java b/demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/saga/demo/dubbo/api/IServiceA.java
similarity index 100%
rename from saga-demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/saga/demo/dubbo/api/IServiceA.java
rename to demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/saga/demo/dubbo/api/IServiceA.java
diff --git a/saga-demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/saga/demo/dubbo/api/IServiceB.java b/demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/saga/demo/dubbo/api/IServiceB.java
similarity index 100%
rename from saga-demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/saga/demo/dubbo/api/IServiceB.java
rename to demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/saga/demo/dubbo/api/IServiceB.java
diff --git a/saga-demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/saga/demo/dubbo/api/IServiceC.java b/demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/saga/demo/dubbo/api/IServiceC.java
similarity index 100%
rename from saga-demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/saga/demo/dubbo/api/IServiceC.java
rename to demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/saga/demo/dubbo/api/IServiceC.java
diff --git a/saga-demo/saga-dubbo-demo/service-api/src/main/resources/dubbo.properties b/demo/saga-dubbo-demo/service-api/src/main/resources/dubbo.properties
similarity index 100%
rename from saga-demo/saga-dubbo-demo/service-api/src/main/resources/dubbo.properties
rename to demo/saga-dubbo-demo/service-api/src/main/resources/dubbo.properties
diff --git a/saga-demo/saga-dubbo-demo/service-pub/pom.xml b/demo/saga-dubbo-demo/service-pub/pom.xml
similarity index 100%
rename from saga-demo/saga-dubbo-demo/service-pub/pom.xml
rename to demo/saga-dubbo-demo/service-pub/pom.xml
diff --git a/saga-demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/saga/demo/dubbo/pub/AbsService.java b/demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/saga/demo/dubbo/pub/AbsService.java
similarity index 100%
rename from saga-demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/saga/demo/dubbo/pub/AbsService.java
rename to demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/saga/demo/dubbo/pub/AbsService.java
diff --git a/saga-demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/saga/demo/dubbo/pub/IInvokeCode.java b/demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/saga/demo/dubbo/pub/IInvokeCode.java
similarity index 100%
rename from saga-demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/saga/demo/dubbo/pub/IInvokeCode.java
rename to demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/saga/demo/dubbo/pub/IInvokeCode.java
diff --git a/saga-demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/saga/demo/dubbo/pub/InvokeContext.java b/demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/saga/demo/dubbo/pub/InvokeContext.java
similarity index 100%
rename from saga-demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/saga/demo/dubbo/pub/InvokeContext.java
rename to demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/saga/demo/dubbo/pub/InvokeContext.java
diff --git a/saga-demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/saga/demo/dubbo/pub/ServiceVO.java b/demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/saga/demo/dubbo/pub/ServiceVO.java
similarity index 100%
rename from saga-demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/saga/demo/dubbo/pub/ServiceVO.java
rename to demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/saga/demo/dubbo/pub/ServiceVO.java
diff --git a/saga-demo/saga-dubbo-demo/servicea/pom.xml b/demo/saga-dubbo-demo/servicea/pom.xml
similarity index 100%
rename from saga-demo/saga-dubbo-demo/servicea/pom.xml
rename to demo/saga-dubbo-demo/servicea/pom.xml
diff --git a/saga-demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/ApplicationA.java b/demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/ApplicationA.java
similarity index 100%
rename from saga-demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/ApplicationA.java
rename to demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/ApplicationA.java
diff --git a/saga-demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/ServiceA.java b/demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/ServiceA.java
similarity index 100%
rename from saga-demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/ServiceA.java
rename to demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/ServiceA.java
diff --git a/saga-demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/web/DubboDemoController.java b/demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/web/DubboDemoController.java
similarity index 100%
rename from saga-demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/web/DubboDemoController.java
rename to demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/web/DubboDemoController.java
diff --git a/saga-demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/web/MvcConfigurer.java b/demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/web/MvcConfigurer.java
similarity index 100%
rename from saga-demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/web/MvcConfigurer.java
rename to demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/web/MvcConfigurer.java
diff --git a/saga-demo/saga-dubbo-demo/servicea/src/main/resources/application.yaml b/demo/saga-dubbo-demo/servicea/src/main/resources/application.yaml
similarity index 100%
rename from saga-demo/saga-dubbo-demo/servicea/src/main/resources/application.yaml
rename to demo/saga-dubbo-demo/servicea/src/main/resources/application.yaml
diff --git a/saga-demo/saga-dubbo-demo/servicea/src/main/resources/dubbo-context.xml b/demo/saga-dubbo-demo/servicea/src/main/resources/dubbo-context.xml
similarity index 100%
rename from saga-demo/saga-dubbo-demo/servicea/src/main/resources/dubbo-context.xml
rename to demo/saga-dubbo-demo/servicea/src/main/resources/dubbo-context.xml
diff --git a/saga-demo/saga-dubbo-demo/servicec/src/main/resources/jdbc.xml b/demo/saga-dubbo-demo/servicea/src/main/resources/jdbc.xml
similarity index 100%
rename from saga-demo/saga-dubbo-demo/servicec/src/main/resources/jdbc.xml
rename to demo/saga-dubbo-demo/servicea/src/main/resources/jdbc.xml
diff --git a/saga-demo/tcc-spring-demo/payment/src/main/resources/log4j2.xml b/demo/saga-dubbo-demo/servicea/src/main/resources/log4j2.xml
similarity index 100%
rename from saga-demo/tcc-spring-demo/payment/src/main/resources/log4j2.xml
rename to demo/saga-dubbo-demo/servicea/src/main/resources/log4j2.xml
diff --git a/saga-demo/saga-dubbo-demo/servicea/src/main/resources/schema-mysql.sql b/demo/saga-dubbo-demo/servicea/src/main/resources/schema-mysql.sql
similarity index 100%
rename from saga-demo/saga-dubbo-demo/servicea/src/main/resources/schema-mysql.sql
rename to demo/saga-dubbo-demo/servicea/src/main/resources/schema-mysql.sql
diff --git a/saga-demo/saga-dubbo-demo/servicea/src/main/resources/schema-postgresql.sql b/demo/saga-dubbo-demo/servicea/src/main/resources/schema-postgresql.sql
similarity index 100%
rename from saga-demo/saga-dubbo-demo/servicea/src/main/resources/schema-postgresql.sql
rename to demo/saga-dubbo-demo/servicea/src/main/resources/schema-postgresql.sql
diff --git a/saga-demo/saga-dubbo-demo/servicea/src/main/resources/static/index.html b/demo/saga-dubbo-demo/servicea/src/main/resources/static/index.html
similarity index 100%
rename from saga-demo/saga-dubbo-demo/servicea/src/main/resources/static/index.html
rename to demo/saga-dubbo-demo/servicea/src/main/resources/static/index.html
diff --git a/saga-demo/saga-dubbo-demo/serviceb/pom.xml b/demo/saga-dubbo-demo/serviceb/pom.xml
similarity index 100%
rename from saga-demo/saga-dubbo-demo/serviceb/pom.xml
rename to demo/saga-dubbo-demo/serviceb/pom.xml
diff --git a/saga-demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/saga/demo/dubbo/serviceb/ApplicationB.java b/demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/saga/demo/dubbo/serviceb/ApplicationB.java
similarity index 100%
rename from saga-demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/saga/demo/dubbo/serviceb/ApplicationB.java
rename to demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/saga/demo/dubbo/serviceb/ApplicationB.java
diff --git a/saga-demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/saga/demo/dubbo/serviceb/ServiceB.java b/demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/saga/demo/dubbo/serviceb/ServiceB.java
similarity index 100%
rename from saga-demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/saga/demo/dubbo/serviceb/ServiceB.java
rename to demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/saga/demo/dubbo/serviceb/ServiceB.java
diff --git a/saga-demo/saga-dubbo-demo/serviceb/src/main/resources/application.yaml b/demo/saga-dubbo-demo/serviceb/src/main/resources/application.yaml
similarity index 100%
rename from saga-demo/saga-dubbo-demo/serviceb/src/main/resources/application.yaml
rename to demo/saga-dubbo-demo/serviceb/src/main/resources/application.yaml
diff --git a/saga-demo/saga-dubbo-demo/serviceb/src/main/resources/dubbo-context.xml b/demo/saga-dubbo-demo/serviceb/src/main/resources/dubbo-context.xml
similarity index 100%
rename from saga-demo/saga-dubbo-demo/serviceb/src/main/resources/dubbo-context.xml
rename to demo/saga-dubbo-demo/serviceb/src/main/resources/dubbo-context.xml
diff --git a/saga-demo/saga-dubbo-demo/serviceb/src/main/resources/jdbc.xml b/demo/saga-dubbo-demo/serviceb/src/main/resources/jdbc.xml
similarity index 100%
rename from saga-demo/saga-dubbo-demo/serviceb/src/main/resources/jdbc.xml
rename to demo/saga-dubbo-demo/serviceb/src/main/resources/jdbc.xml
diff --git a/saga-demo/tcc-spring-demo/ordering/src/main/resources/log4j2.xml b/demo/saga-dubbo-demo/serviceb/src/main/resources/log4j2.xml
similarity index 100%
rename from saga-demo/tcc-spring-demo/ordering/src/main/resources/log4j2.xml
rename to demo/saga-dubbo-demo/serviceb/src/main/resources/log4j2.xml
diff --git a/saga-demo/saga-dubbo-demo/serviceb/src/main/resources/schema-mysql.sql b/demo/saga-dubbo-demo/serviceb/src/main/resources/schema-mysql.sql
similarity index 100%
rename from saga-demo/saga-dubbo-demo/serviceb/src/main/resources/schema-mysql.sql
rename to demo/saga-dubbo-demo/serviceb/src/main/resources/schema-mysql.sql
diff --git a/saga-demo/saga-dubbo-demo/serviceb/src/main/resources/schema-postgresql.sql b/demo/saga-dubbo-demo/serviceb/src/main/resources/schema-postgresql.sql
similarity index 100%
rename from saga-demo/saga-dubbo-demo/serviceb/src/main/resources/schema-postgresql.sql
rename to demo/saga-dubbo-demo/serviceb/src/main/resources/schema-postgresql.sql
diff --git a/saga-demo/saga-dubbo-demo/servicec/pom.xml b/demo/saga-dubbo-demo/servicec/pom.xml
similarity index 100%
rename from saga-demo/saga-dubbo-demo/servicec/pom.xml
rename to demo/saga-dubbo-demo/servicec/pom.xml
diff --git a/saga-demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicec/ApplicationC.java b/demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicec/ApplicationC.java
similarity index 100%
rename from saga-demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicec/ApplicationC.java
rename to demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicec/ApplicationC.java
diff --git a/saga-demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicec/ServiceC.java b/demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicec/ServiceC.java
similarity index 100%
rename from saga-demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicec/ServiceC.java
rename to demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicec/ServiceC.java
diff --git a/saga-demo/saga-dubbo-demo/servicec/src/main/resources/application.yaml b/demo/saga-dubbo-demo/servicec/src/main/resources/application.yaml
similarity index 100%
rename from saga-demo/saga-dubbo-demo/servicec/src/main/resources/application.yaml
rename to demo/saga-dubbo-demo/servicec/src/main/resources/application.yaml
diff --git a/saga-demo/saga-dubbo-demo/servicec/src/main/resources/dubbo-context.xml b/demo/saga-dubbo-demo/servicec/src/main/resources/dubbo-context.xml
similarity index 100%
rename from saga-demo/saga-dubbo-demo/servicec/src/main/resources/dubbo-context.xml
rename to demo/saga-dubbo-demo/servicec/src/main/resources/dubbo-context.xml
diff --git a/saga-demo/saga-dubbo-demo/servicea/src/main/resources/jdbc.xml b/demo/saga-dubbo-demo/servicec/src/main/resources/jdbc.xml
similarity index 100%
rename from saga-demo/saga-dubbo-demo/servicea/src/main/resources/jdbc.xml
rename to demo/saga-dubbo-demo/servicec/src/main/resources/jdbc.xml
diff --git a/saga-demo/tcc-spring-demo/inventory/src/main/resources/log4j2.xml b/demo/saga-dubbo-demo/servicec/src/main/resources/log4j2.xml
similarity index 100%
rename from saga-demo/tcc-spring-demo/inventory/src/main/resources/log4j2.xml
rename to demo/saga-dubbo-demo/servicec/src/main/resources/log4j2.xml
diff --git a/saga-demo/saga-dubbo-demo/servicec/src/main/resources/schema-mysql.sql b/demo/saga-dubbo-demo/servicec/src/main/resources/schema-mysql.sql
similarity index 100%
rename from saga-demo/saga-dubbo-demo/servicec/src/main/resources/schema-mysql.sql
rename to demo/saga-dubbo-demo/servicec/src/main/resources/schema-mysql.sql
diff --git a/saga-demo/saga-dubbo-demo/servicec/src/main/resources/schema-postgresql.sql b/demo/saga-dubbo-demo/servicec/src/main/resources/schema-postgresql.sql
similarity index 100%
rename from saga-demo/saga-dubbo-demo/servicec/src/main/resources/schema-postgresql.sql
rename to demo/saga-dubbo-demo/servicec/src/main/resources/schema-postgresql.sql
diff --git a/saga-demo/saga-dubbo-demo/sql/schema-mysql.sql b/demo/saga-dubbo-demo/sql/schema-mysql.sql
similarity index 100%
rename from saga-demo/saga-dubbo-demo/sql/schema-mysql.sql
rename to demo/saga-dubbo-demo/sql/schema-mysql.sql
diff --git a/saga-demo/saga-k8s-resources/README.md b/demo/saga-k8s-resources/README.md
similarity index 100%
rename from saga-demo/saga-k8s-resources/README.md
rename to demo/saga-k8s-resources/README.md
diff --git a/saga-demo/saga-k8s-resources/base/alpha.yaml b/demo/saga-k8s-resources/base/alpha.yaml
similarity index 100%
rename from saga-demo/saga-k8s-resources/base/alpha.yaml
rename to demo/saga-k8s-resources/base/alpha.yaml
diff --git a/saga-demo/saga-k8s-resources/base/jmeter-collector.yaml b/demo/saga-k8s-resources/base/jmeter-collector.yaml
similarity index 100%
rename from saga-demo/saga-k8s-resources/base/jmeter-collector.yaml
rename to demo/saga-k8s-resources/base/jmeter-collector.yaml
diff --git a/saga-demo/saga-k8s-resources/base/postgresql.yaml b/demo/saga-k8s-resources/base/postgresql.yaml
similarity index 100%
rename from saga-demo/saga-k8s-resources/base/postgresql.yaml
rename to demo/saga-k8s-resources/base/postgresql.yaml
diff --git a/saga-demo/saga-k8s-resources/spring-demo/booking.yaml b/demo/saga-k8s-resources/spring-demo/booking.yaml
similarity index 100%
rename from saga-demo/saga-k8s-resources/spring-demo/booking.yaml
rename to demo/saga-k8s-resources/spring-demo/booking.yaml
diff --git a/saga-demo/saga-k8s-resources/spring-demo/car.yaml b/demo/saga-k8s-resources/spring-demo/car.yaml
similarity index 100%
rename from saga-demo/saga-k8s-resources/spring-demo/car.yaml
rename to demo/saga-k8s-resources/spring-demo/car.yaml
diff --git a/saga-demo/saga-k8s-resources/spring-demo/hotel.yaml b/demo/saga-k8s-resources/spring-demo/hotel.yaml
similarity index 100%
rename from saga-demo/saga-k8s-resources/spring-demo/hotel.yaml
rename to demo/saga-k8s-resources/spring-demo/hotel.yaml
diff --git a/saga-demo/saga-k8s-resources/spring-demo/test/jmeter.configmap.yaml b/demo/saga-k8s-resources/spring-demo/test/jmeter.configmap.yaml
similarity index 100%
rename from saga-demo/saga-k8s-resources/spring-demo/test/jmeter.configmap.yaml
rename to demo/saga-k8s-resources/spring-demo/test/jmeter.configmap.yaml
diff --git a/saga-demo/saga-k8s-resources/spring-demo/test/jmeter.yaml b/demo/saga-k8s-resources/spring-demo/test/jmeter.yaml
similarity index 100%
rename from saga-demo/saga-k8s-resources/spring-demo/test/jmeter.yaml
rename to demo/saga-k8s-resources/spring-demo/test/jmeter.yaml
diff --git a/saga-demo/saga-servicecomb-demo/README.md b/demo/saga-servicecomb-demo/README.md
similarity index 100%
rename from saga-demo/saga-servicecomb-demo/README.md
rename to demo/saga-servicecomb-demo/README.md
diff --git a/saga-demo/saga-servicecomb-demo/docker-compose.yaml b/demo/saga-servicecomb-demo/docker-compose.yaml
similarity index 100%
rename from saga-demo/saga-servicecomb-demo/docker-compose.yaml
rename to demo/saga-servicecomb-demo/docker-compose.yaml
diff --git a/saga-demo/saga-servicecomb-demo/pom.xml b/demo/saga-servicecomb-demo/pom.xml
similarity index 100%
rename from saga-demo/saga-servicecomb-demo/pom.xml
rename to demo/saga-servicecomb-demo/pom.xml
diff --git a/saga-demo/saga-servicecomb-demo/saga-servicecomb-demo.sh b/demo/saga-servicecomb-demo/saga-servicecomb-demo.sh
similarity index 100%
rename from saga-demo/saga-servicecomb-demo/saga-servicecomb-demo.sh
rename to demo/saga-servicecomb-demo/saga-servicecomb-demo.sh
diff --git a/saga-demo/saga-servicecomb-demo/scb-booking/pom.xml b/demo/saga-servicecomb-demo/scb-booking/pom.xml
similarity index 100%
rename from saga-demo/saga-servicecomb-demo/scb-booking/pom.xml
rename to demo/saga-servicecomb-demo/scb-booking/pom.xml
diff --git a/saga-demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/saga/demo/scb/booking/BookingApplication.java b/demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/saga/demo/scb/booking/BookingApplication.java
similarity index 100%
rename from saga-demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/saga/demo/scb/booking/BookingApplication.java
rename to demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/saga/demo/scb/booking/BookingApplication.java
diff --git a/saga-demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/saga/demo/scb/booking/BookingController.java b/demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/saga/demo/scb/booking/BookingController.java
similarity index 100%
rename from saga-demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/saga/demo/scb/booking/BookingController.java
rename to demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/saga/demo/scb/booking/BookingController.java
diff --git a/saga-demo/saga-spring-demo/booking/src/main/resources/application.yaml b/demo/saga-servicecomb-demo/scb-booking/src/main/resources/application.yaml
similarity index 100%
rename from saga-demo/saga-spring-demo/booking/src/main/resources/application.yaml
rename to demo/saga-servicecomb-demo/scb-booking/src/main/resources/application.yaml
diff --git a/saga-demo/saga-spring-demo/hotel/src/main/resources/log4j2.xml b/demo/saga-servicecomb-demo/scb-booking/src/main/resources/log4j2.xml
similarity index 100%
rename from saga-demo/saga-spring-demo/hotel/src/main/resources/log4j2.xml
rename to demo/saga-servicecomb-demo/scb-booking/src/main/resources/log4j2.xml
diff --git a/saga-demo/saga-servicecomb-demo/scb-booking/src/main/resources/microservice.yaml b/demo/saga-servicecomb-demo/scb-booking/src/main/resources/microservice.yaml
similarity index 100%
rename from saga-demo/saga-servicecomb-demo/scb-booking/src/main/resources/microservice.yaml
rename to demo/saga-servicecomb-demo/scb-booking/src/main/resources/microservice.yaml
diff --git a/saga-demo/saga-servicecomb-demo/scb-car/pom.xml b/demo/saga-servicecomb-demo/scb-car/pom.xml
similarity index 100%
rename from saga-demo/saga-servicecomb-demo/scb-car/pom.xml
rename to demo/saga-servicecomb-demo/scb-car/pom.xml
diff --git a/saga-demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarApplication.java b/demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarApplication.java
similarity index 100%
rename from saga-demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarApplication.java
rename to demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarApplication.java
diff --git a/saga-demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarBooking.java b/demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarBooking.java
similarity index 100%
rename from saga-demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarBooking.java
rename to demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarBooking.java
diff --git a/saga-demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarBookingController.java b/demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarBookingController.java
similarity index 100%
rename from saga-demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarBookingController.java
rename to demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarBookingController.java
diff --git a/saga-demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarBookingService.java b/demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarBookingService.java
similarity index 100%
rename from saga-demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarBookingService.java
rename to demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarBookingService.java
diff --git a/saga-demo/saga-spring-demo/car/src/main/resources/application.yaml b/demo/saga-servicecomb-demo/scb-car/src/main/resources/application.yaml
similarity index 100%
rename from saga-demo/saga-spring-demo/car/src/main/resources/application.yaml
rename to demo/saga-servicecomb-demo/scb-car/src/main/resources/application.yaml
diff --git a/saga-demo/saga-spring-demo/car/src/main/resources/log4j2.xml b/demo/saga-servicecomb-demo/scb-car/src/main/resources/log4j2.xml
similarity index 100%
rename from saga-demo/saga-spring-demo/car/src/main/resources/log4j2.xml
rename to demo/saga-servicecomb-demo/scb-car/src/main/resources/log4j2.xml
diff --git a/saga-demo/saga-servicecomb-demo/scb-car/src/main/resources/microservice.yaml b/demo/saga-servicecomb-demo/scb-car/src/main/resources/microservice.yaml
similarity index 100%
rename from saga-demo/saga-servicecomb-demo/scb-car/src/main/resources/microservice.yaml
rename to demo/saga-servicecomb-demo/scb-car/src/main/resources/microservice.yaml
diff --git a/saga-demo/saga-servicecomb-demo/scb-hotel/pom.xml b/demo/saga-servicecomb-demo/scb-hotel/pom.xml
similarity index 100%
rename from saga-demo/saga-servicecomb-demo/scb-hotel/pom.xml
rename to demo/saga-servicecomb-demo/scb-hotel/pom.xml
diff --git a/saga-demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelApplication.java b/demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelApplication.java
similarity index 100%
rename from saga-demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelApplication.java
rename to demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelApplication.java
diff --git a/saga-demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelBooking.java b/demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelBooking.java
similarity index 100%
rename from saga-demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelBooking.java
rename to demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelBooking.java
diff --git a/saga-demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelBookingController.java b/demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelBookingController.java
similarity index 100%
rename from saga-demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelBookingController.java
rename to demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelBookingController.java
diff --git a/saga-demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelBookingService.java b/demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelBookingService.java
similarity index 100%
rename from saga-demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelBookingService.java
rename to demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelBookingService.java
diff --git a/saga-demo/saga-spring-demo/hotel/src/main/resources/application.yaml b/demo/saga-servicecomb-demo/scb-hotel/src/main/resources/application.yaml
similarity index 100%
rename from saga-demo/saga-spring-demo/hotel/src/main/resources/application.yaml
rename to demo/saga-servicecomb-demo/scb-hotel/src/main/resources/application.yaml
diff --git a/saga-demo/saga-spring-demo/booking/src/main/resources/log4j2.xml b/demo/saga-servicecomb-demo/scb-hotel/src/main/resources/log4j2.xml
similarity index 100%
rename from saga-demo/saga-spring-demo/booking/src/main/resources/log4j2.xml
rename to demo/saga-servicecomb-demo/scb-hotel/src/main/resources/log4j2.xml
diff --git a/saga-demo/saga-servicecomb-demo/scb-hotel/src/main/resources/microservice.yaml b/demo/saga-servicecomb-demo/scb-hotel/src/main/resources/microservice.yaml
similarity index 100%
rename from saga-demo/saga-servicecomb-demo/scb-hotel/src/main/resources/microservice.yaml
rename to demo/saga-servicecomb-demo/scb-hotel/src/main/resources/microservice.yaml
diff --git a/saga-demo/saga-spring-demo/README.md b/demo/saga-spring-demo/README.md
similarity index 100%
rename from saga-demo/saga-spring-demo/README.md
rename to demo/saga-spring-demo/README.md
diff --git a/saga-demo/saga-spring-demo/booking/pom.xml b/demo/saga-spring-demo/booking/pom.xml
similarity index 100%
rename from saga-demo/saga-spring-demo/booking/pom.xml
rename to demo/saga-spring-demo/booking/pom.xml
diff --git a/saga-demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/Application.java b/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-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/Application.java
rename to demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/Application.java
diff --git a/saga-demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/BookingController.java b/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-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/BookingController.java
rename to demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/BookingController.java
diff --git a/saga-demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/MyConfiguration.java b/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-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/MyConfiguration.java
rename to demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/MyConfiguration.java
diff --git a/saga-demo/saga-servicecomb-demo/scb-booking/src/main/resources/application.yaml b/demo/saga-spring-demo/booking/src/main/resources/application.yaml
similarity index 100%
rename from saga-demo/saga-servicecomb-demo/scb-booking/src/main/resources/application.yaml
rename to demo/saga-spring-demo/booking/src/main/resources/application.yaml
diff --git a/saga-demo/saga-servicecomb-demo/scb-hotel/src/main/resources/log4j2.xml b/demo/saga-spring-demo/booking/src/main/resources/log4j2.xml
similarity index 100%
rename from saga-demo/saga-servicecomb-demo/scb-hotel/src/main/resources/log4j2.xml
rename to demo/saga-spring-demo/booking/src/main/resources/log4j2.xml
diff --git a/saga-demo/saga-spring-demo/booking/src/main/resources/static/index.html b/demo/saga-spring-demo/booking/src/main/resources/static/index.html
similarity index 100%
rename from saga-demo/saga-spring-demo/booking/src/main/resources/static/index.html
rename to demo/saga-spring-demo/booking/src/main/resources/static/index.html
diff --git a/saga-demo/saga-spring-demo/car/pom.xml b/demo/saga-spring-demo/car/pom.xml
similarity index 100%
rename from saga-demo/saga-spring-demo/car/pom.xml
rename to demo/saga-spring-demo/car/pom.xml
diff --git a/saga-demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/Application.java b/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-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/Application.java
rename to demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/Application.java
diff --git a/saga-demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBooking.java b/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-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBooking.java
rename to demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBooking.java
diff --git a/saga-demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingController.java b/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-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingController.java
rename to demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingController.java
diff --git a/saga-demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingService.java b/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-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingService.java
rename to demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingService.java
diff --git a/saga-demo/saga-servicecomb-demo/scb-car/src/main/resources/application.yaml b/demo/saga-spring-demo/car/src/main/resources/application.yaml
similarity index 100%
rename from saga-demo/saga-servicecomb-demo/scb-car/src/main/resources/application.yaml
rename to demo/saga-spring-demo/car/src/main/resources/application.yaml
diff --git a/saga-demo/saga-servicecomb-demo/scb-car/src/main/resources/log4j2.xml b/demo/saga-spring-demo/car/src/main/resources/log4j2.xml
similarity index 100%
rename from saga-demo/saga-servicecomb-demo/scb-car/src/main/resources/log4j2.xml
rename to demo/saga-spring-demo/car/src/main/resources/log4j2.xml
diff --git a/saga-demo/saga-spring-demo/docker-compose-alpha-perf.yaml b/demo/saga-spring-demo/docker-compose-alpha-perf.yaml
similarity index 100%
rename from saga-demo/saga-spring-demo/docker-compose-alpha-perf.yaml
rename to demo/saga-spring-demo/docker-compose-alpha-perf.yaml
diff --git a/saga-demo/saga-spring-demo/docker-compose-alpha.yaml b/demo/saga-spring-demo/docker-compose-alpha.yaml
similarity index 100%
rename from saga-demo/saga-spring-demo/docker-compose-alpha.yaml
rename to demo/saga-spring-demo/docker-compose-alpha.yaml
diff --git a/saga-demo/saga-spring-demo/docker-compose-demo.yaml b/demo/saga-spring-demo/docker-compose-demo.yaml
similarity index 100%
rename from saga-demo/saga-spring-demo/docker-compose-demo.yaml
rename to demo/saga-spring-demo/docker-compose-demo.yaml
diff --git a/saga-demo/tcc-spring-demo/docker-compose.mysql.yaml b/demo/saga-spring-demo/docker-compose.mysql.yaml
similarity index 100%
rename from saga-demo/tcc-spring-demo/docker-compose.mysql.yaml
rename to demo/saga-spring-demo/docker-compose.mysql.yaml
diff --git a/saga-demo/saga-spring-demo/docker-compose.yaml b/demo/saga-spring-demo/docker-compose.yaml
similarity index 100%
rename from saga-demo/saga-spring-demo/docker-compose.yaml
rename to demo/saga-spring-demo/docker-compose.yaml
diff --git a/saga-demo/saga-spring-demo/hotel/pom.xml b/demo/saga-spring-demo/hotel/pom.xml
similarity index 100%
rename from saga-demo/saga-spring-demo/hotel/pom.xml
rename to demo/saga-spring-demo/hotel/pom.xml
diff --git a/saga-demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/Application.java b/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-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/Application.java
rename to demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/Application.java
diff --git a/saga-demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBooking.java b/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-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBooking.java
rename to demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBooking.java
diff --git a/saga-demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingController.java b/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-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingController.java
rename to demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingController.java
diff --git a/saga-demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingService.java b/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-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingService.java
rename to demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingService.java
diff --git a/saga-demo/saga-servicecomb-demo/scb-hotel/src/main/resources/application.yaml b/demo/saga-spring-demo/hotel/src/main/resources/application.yaml
similarity index 100%
rename from saga-demo/saga-servicecomb-demo/scb-hotel/src/main/resources/application.yaml
rename to demo/saga-spring-demo/hotel/src/main/resources/application.yaml
diff --git a/saga-demo/saga-servicecomb-demo/scb-booking/src/main/resources/log4j2.xml b/demo/saga-spring-demo/hotel/src/main/resources/log4j2.xml
similarity index 100%
rename from saga-demo/saga-servicecomb-demo/scb-booking/src/main/resources/log4j2.xml
rename to demo/saga-spring-demo/hotel/src/main/resources/log4j2.xml
diff --git a/saga-demo/saga-spring-demo/pom.xml b/demo/saga-spring-demo/pom.xml
similarity index 100%
rename from saga-demo/saga-spring-demo/pom.xml
rename to demo/saga-spring-demo/pom.xml
diff --git a/saga-demo/saga-spring-demo/saga-demo.sh b/demo/saga-spring-demo/saga-demo.sh
similarity index 100%
rename from saga-demo/saga-spring-demo/saga-demo.sh
rename to demo/saga-spring-demo/saga-demo.sh
diff --git a/saga-demo/tcc-spring-demo/README.md b/demo/tcc-spring-demo/README.md
similarity index 100%
rename from saga-demo/tcc-spring-demo/README.md
rename to demo/tcc-spring-demo/README.md
diff --git a/saga-demo/saga-dubbo-demo/docker-compose-alpha.yaml b/demo/tcc-spring-demo/docker-compose-alpha.yaml
similarity index 100%
rename from saga-demo/saga-dubbo-demo/docker-compose-alpha.yaml
rename to demo/tcc-spring-demo/docker-compose-alpha.yaml
diff --git a/saga-demo/tcc-spring-demo/docker-compose-demo.yaml b/demo/tcc-spring-demo/docker-compose-demo.yaml
similarity index 100%
rename from saga-demo/tcc-spring-demo/docker-compose-demo.yaml
rename to demo/tcc-spring-demo/docker-compose-demo.yaml
diff --git a/saga-demo/saga-spring-demo/docker-compose.mysql.yaml b/demo/tcc-spring-demo/docker-compose.mysql.yaml
similarity index 100%
rename from saga-demo/saga-spring-demo/docker-compose.mysql.yaml
rename to demo/tcc-spring-demo/docker-compose.mysql.yaml
diff --git a/saga-demo/tcc-spring-demo/docker-compose.yaml b/demo/tcc-spring-demo/docker-compose.yaml
similarity index 100%
rename from saga-demo/tcc-spring-demo/docker-compose.yaml
rename to demo/tcc-spring-demo/docker-compose.yaml
diff --git a/saga-demo/tcc-spring-demo/inventory/pom.xml b/demo/tcc-spring-demo/inventory/pom.xml
similarity index 98%
rename from saga-demo/tcc-spring-demo/inventory/pom.xml
rename to demo/tcc-spring-demo/inventory/pom.xml
index 8d44906..7bd1d4f 100644
--- a/saga-demo/tcc-spring-demo/inventory/pom.xml
+++ b/demo/tcc-spring-demo/inventory/pom.xml
@@ -48,7 +48,7 @@
<!-- Added the eclipse link JPA configuration-->
<dependency>
<groupId>org.apache.servicecomb.saga</groupId>
- <artifactId>saga-persistence-jpa</artifactId>
+ <artifactId>persistence-jpa</artifactId>
</dependency>
<!-- Added the driver of h2 -->
<dependency>
diff --git a/saga-demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/InventoryService.java b/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/InventoryService.java
similarity index 100%
rename from saga-demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/InventoryService.java
rename to demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/InventoryService.java
diff --git a/saga-demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/Product.java b/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/Product.java
similarity index 100%
rename from saga-demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/Product.java
rename to demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/Product.java
diff --git a/saga-demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/ProductController.java b/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/ProductController.java
similarity index 100%
rename from saga-demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/ProductController.java
rename to demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/ProductController.java
diff --git a/saga-demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/ProductDao.java b/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/ProductDao.java
similarity index 100%
rename from saga-demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/ProductDao.java
rename to demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/ProductDao.java
diff --git a/saga-demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/ProductOrder.java b/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/ProductOrder.java
similarity index 100%
rename from saga-demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/ProductOrder.java
rename to demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/ProductOrder.java
diff --git a/saga-demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/TccInventoryApplication.java b/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/TccInventoryApplication.java
similarity index 100%
rename from saga-demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/TccInventoryApplication.java
rename to demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/TccInventoryApplication.java
diff --git a/saga-demo/tcc-spring-demo/inventory/src/main/resources/application.yaml b/demo/tcc-spring-demo/inventory/src/main/resources/application.yaml
similarity index 100%
rename from saga-demo/tcc-spring-demo/inventory/src/main/resources/application.yaml
rename to demo/tcc-spring-demo/inventory/src/main/resources/application.yaml
diff --git a/saga-demo/saga-dubbo-demo/servicec/src/main/resources/log4j2.xml b/demo/tcc-spring-demo/inventory/src/main/resources/log4j2.xml
similarity index 100%
rename from saga-demo/saga-dubbo-demo/servicec/src/main/resources/log4j2.xml
rename to demo/tcc-spring-demo/inventory/src/main/resources/log4j2.xml
diff --git a/saga-demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/saga/demo/pack/inventory/InventoryServiceTest.java b/demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/saga/demo/pack/inventory/InventoryServiceTest.java
similarity index 100%
rename from saga-demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/saga/demo/pack/inventory/InventoryServiceTest.java
rename to demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/saga/demo/pack/inventory/InventoryServiceTest.java
diff --git a/saga-demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/saga/demo/pack/inventory/ProductControllerTest.java b/demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/saga/demo/pack/inventory/ProductControllerTest.java
similarity index 100%
rename from saga-demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/saga/demo/pack/inventory/ProductControllerTest.java
rename to demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/saga/demo/pack/inventory/ProductControllerTest.java
diff --git a/saga-demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/saga/demo/pack/inventory/TestApplication.java b/demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/saga/demo/pack/inventory/TestApplication.java
similarity index 100%
rename from saga-demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/saga/demo/pack/inventory/TestApplication.java
rename to demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/saga/demo/pack/inventory/TestApplication.java
diff --git a/saga-demo/tcc-spring-demo/ordering/pom.xml b/demo/tcc-spring-demo/ordering/pom.xml
similarity index 100%
rename from saga-demo/tcc-spring-demo/ordering/pom.xml
rename to demo/tcc-spring-demo/ordering/pom.xml
diff --git a/saga-demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/saga/demo/pack/ordering/OrderingController.java b/demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/saga/demo/pack/ordering/OrderingController.java
similarity index 100%
rename from saga-demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/saga/demo/pack/ordering/OrderingController.java
rename to demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/saga/demo/pack/ordering/OrderingController.java
diff --git a/saga-demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/saga/demo/pack/ordering/TccOrderingApplication.java b/demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/saga/demo/pack/ordering/TccOrderingApplication.java
similarity index 100%
rename from saga-demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/saga/demo/pack/ordering/TccOrderingApplication.java
rename to demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/saga/demo/pack/ordering/TccOrderingApplication.java
diff --git a/saga-demo/tcc-spring-demo/ordering/src/main/resources/application.yaml b/demo/tcc-spring-demo/ordering/src/main/resources/application.yaml
similarity index 100%
rename from saga-demo/tcc-spring-demo/ordering/src/main/resources/application.yaml
rename to demo/tcc-spring-demo/ordering/src/main/resources/application.yaml
diff --git a/saga-demo/saga-dubbo-demo/serviceb/src/main/resources/log4j2.xml b/demo/tcc-spring-demo/ordering/src/main/resources/log4j2.xml
similarity index 100%
rename from saga-demo/saga-dubbo-demo/serviceb/src/main/resources/log4j2.xml
rename to demo/tcc-spring-demo/ordering/src/main/resources/log4j2.xml
diff --git a/saga-demo/tcc-spring-demo/payment/pom.xml b/demo/tcc-spring-demo/payment/pom.xml
similarity index 98%
rename from saga-demo/tcc-spring-demo/payment/pom.xml
rename to demo/tcc-spring-demo/payment/pom.xml
index 9a91dbd..b8aa181 100644
--- a/saga-demo/tcc-spring-demo/payment/pom.xml
+++ b/demo/tcc-spring-demo/payment/pom.xml
@@ -46,7 +46,7 @@
<!-- Added the eclipse link JPA configuration-->
<dependency>
<groupId>org.apache.servicecomb.saga</groupId>
- <artifactId>saga-persistence-jpa</artifactId>
+ <artifactId>persistence-jpa</artifactId>
</dependency>
<!-- Added the driver of h2 -->
<dependency>
diff --git a/saga-demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/Account.java b/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/Account.java
similarity index 100%
rename from saga-demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/Account.java
rename to demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/Account.java
diff --git a/saga-demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/AccountDao.java b/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/AccountDao.java
similarity index 100%
rename from saga-demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/AccountDao.java
rename to demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/AccountDao.java
diff --git a/saga-demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/Payment.java b/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/Payment.java
similarity index 100%
rename from saga-demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/Payment.java
rename to demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/Payment.java
diff --git a/saga-demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentController.java b/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentController.java
similarity index 100%
rename from saga-demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentController.java
rename to demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentController.java
diff --git a/saga-demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentService.java b/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentService.java
similarity index 100%
rename from saga-demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentService.java
rename to demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentService.java
diff --git a/saga-demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/TccPaymentApplication.java b/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/TccPaymentApplication.java
similarity index 100%
rename from saga-demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/TccPaymentApplication.java
rename to demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/TccPaymentApplication.java
diff --git a/saga-demo/tcc-spring-demo/payment/src/main/resources/application.yaml b/demo/tcc-spring-demo/payment/src/main/resources/application.yaml
similarity index 100%
rename from saga-demo/tcc-spring-demo/payment/src/main/resources/application.yaml
rename to demo/tcc-spring-demo/payment/src/main/resources/application.yaml
diff --git a/saga-demo/saga-dubbo-demo/servicea/src/main/resources/log4j2.xml b/demo/tcc-spring-demo/payment/src/main/resources/log4j2.xml
similarity index 100%
rename from saga-demo/saga-dubbo-demo/servicea/src/main/resources/log4j2.xml
rename to demo/tcc-spring-demo/payment/src/main/resources/log4j2.xml
diff --git a/saga-demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentControllerTest.java b/demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentControllerTest.java
similarity index 100%
rename from saga-demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentControllerTest.java
rename to demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentControllerTest.java
diff --git a/saga-demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentServiceTest.java b/demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentServiceTest.java
similarity index 100%
rename from saga-demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentServiceTest.java
rename to demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentServiceTest.java
diff --git a/saga-demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/saga/demo/pack/payment/TestApplication.java b/demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/saga/demo/pack/payment/TestApplication.java
similarity index 100%
rename from saga-demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/saga/demo/pack/payment/TestApplication.java
rename to demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/saga/demo/pack/payment/TestApplication.java
diff --git a/saga-demo/tcc-spring-demo/pom.xml b/demo/tcc-spring-demo/pom.xml
similarity index 100%
rename from saga-demo/tcc-spring-demo/pom.xml
rename to demo/tcc-spring-demo/pom.xml
diff --git a/saga-demo/tcc-spring-demo/saga-demo.sh b/demo/tcc-spring-demo/saga-demo.sh
similarity index 100%
rename from saga-demo/tcc-spring-demo/saga-demo.sh
rename to demo/tcc-spring-demo/saga-demo.sh
diff --git a/saga-distribution/pom.xml b/distribution/pom.xml
similarity index 100%
rename from saga-distribution/pom.xml
rename to distribution/pom.xml
diff --git a/saga-distribution/src/assembly/bin.xml b/distribution/src/assembly/bin.xml
similarity index 100%
rename from saga-distribution/src/assembly/bin.xml
rename to distribution/src/assembly/bin.xml
diff --git a/saga-distribution/src/assembly/src.xml b/distribution/src/assembly/src.xml
similarity index 100%
rename from saga-distribution/src/assembly/src.xml
rename to distribution/src/assembly/src.xml
diff --git a/saga-distribution/src/release/LICENSE b/distribution/src/release/LICENSE
similarity index 100%
rename from saga-distribution/src/release/LICENSE
rename to distribution/src/release/LICENSE
diff --git a/saga-distribution/src/release/NOTICE b/distribution/src/release/NOTICE
similarity index 100%
rename from saga-distribution/src/release/NOTICE
rename to distribution/src/release/NOTICE
diff --git a/saga-distribution/src/release/licenses/LICENSE-asm b/distribution/src/release/licenses/LICENSE-asm
similarity index 100%
rename from saga-distribution/src/release/licenses/LICENSE-asm
rename to distribution/src/release/licenses/LICENSE-asm
diff --git a/saga-distribution/src/release/licenses/LICENSE-boringssl b/distribution/src/release/licenses/LICENSE-boringssl
similarity index 100%
rename from saga-distribution/src/release/licenses/LICENSE-boringssl
rename to distribution/src/release/licenses/LICENSE-boringssl
diff --git a/saga-distribution/src/release/licenses/LICENSE-epl-v10 b/distribution/src/release/licenses/LICENSE-epl-v10
similarity index 100%
rename from saga-distribution/src/release/licenses/LICENSE-epl-v10
rename to distribution/src/release/licenses/LICENSE-epl-v10
diff --git a/saga-distribution/src/release/licenses/LICENSE-esotericsoftware b/distribution/src/release/licenses/LICENSE-esotericsoftware
similarity index 100%
rename from saga-distribution/src/release/licenses/LICENSE-esotericsoftware
rename to distribution/src/release/licenses/LICENSE-esotericsoftware
diff --git a/saga-distribution/src/release/licenses/LICENSE-javax b/distribution/src/release/licenses/LICENSE-javax
similarity index 100%
rename from saga-distribution/src/release/licenses/LICENSE-javax
rename to distribution/src/release/licenses/LICENSE-javax
diff --git a/saga-distribution/src/release/licenses/LICENSE-logback b/distribution/src/release/licenses/LICENSE-logback
similarity index 100%
rename from saga-distribution/src/release/licenses/LICENSE-logback
rename to distribution/src/release/licenses/LICENSE-logback
diff --git a/saga-distribution/src/release/licenses/LICENSE-ngxadmin b/distribution/src/release/licenses/LICENSE-ngxadmin
similarity index 100%
rename from saga-distribution/src/release/licenses/LICENSE-ngxadmin
rename to distribution/src/release/licenses/LICENSE-ngxadmin
diff --git a/saga-distribution/src/release/licenses/LICENSE-openfeign b/distribution/src/release/licenses/LICENSE-openfeign
similarity index 100%
rename from saga-distribution/src/release/licenses/LICENSE-openfeign
rename to distribution/src/release/licenses/LICENSE-openfeign
diff --git a/saga-distribution/src/release/licenses/LICENSE-postgresql b/distribution/src/release/licenses/LICENSE-postgresql
similarity index 100%
rename from saga-distribution/src/release/licenses/LICENSE-postgresql
rename to distribution/src/release/licenses/LICENSE-postgresql
diff --git a/saga-distribution/src/release/licenses/LICENSE-protobuf b/distribution/src/release/licenses/LICENSE-protobuf
similarity index 100%
rename from saga-distribution/src/release/licenses/LICENSE-protobuf
rename to distribution/src/release/licenses/LICENSE-protobuf
diff --git a/saga-distribution/src/release/licenses/LICENSE-slf4j b/distribution/src/release/licenses/LICENSE-slf4j
similarity index 100%
rename from saga-distribution/src/release/licenses/LICENSE-slf4j
rename to distribution/src/release/licenses/LICENSE-slf4j
diff --git a/saga-distribution/src/release/licenses/NOTICE-grpc b/distribution/src/release/licenses/NOTICE-grpc
similarity index 100%
rename from saga-distribution/src/release/licenses/NOTICE-grpc
rename to distribution/src/release/licenses/NOTICE-grpc
diff --git a/saga-distribution/src/release/licenses/NOTICE-netty b/distribution/src/release/licenses/NOTICE-netty
similarity index 100%
rename from saga-distribution/src/release/licenses/NOTICE-netty
rename to distribution/src/release/licenses/NOTICE-netty
diff --git a/saga-distribution/src/release/licenses/NOTICE-netty-tcnative b/distribution/src/release/licenses/NOTICE-netty-tcnative
similarity index 100%
rename from saga-distribution/src/release/licenses/NOTICE-netty-tcnative
rename to distribution/src/release/licenses/NOTICE-netty-tcnative
diff --git a/saga-distribution/src/release/licenses/NOTICE-tomcat b/distribution/src/release/licenses/NOTICE-tomcat
similarity index 100%
rename from saga-distribution/src/release/licenses/NOTICE-tomcat
rename to distribution/src/release/licenses/NOTICE-tomcat
diff --git a/integration-tests/pack-tests/pom.xml b/integration-tests/pack-tests/pom.xml
index f94d2f9..2f2ca9c 100644
--- a/integration-tests/pack-tests/pom.xml
+++ b/integration-tests/pack-tests/pom.xml
@@ -108,7 +108,7 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb.pack</groupId>
- <artifactId>saga-persistence-jpa</artifactId>
+ <artifactId>persistence-jpa</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/omega/omega-spring-tx/pom.xml b/omega/omega-spring-tx/pom.xml
index fb51024..f76ac38 100644
--- a/omega/omega-spring-tx/pom.xml
+++ b/omega/omega-spring-tx/pom.xml
@@ -76,7 +76,7 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb.pack</groupId>
- <artifactId>saga-persistence-jpa</artifactId>
+ <artifactId>persistence-jpa</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/saga-persistence/saga-persistence-jpa/pom.xml b/persistence/persistence-jpa/pom.xml
similarity index 97%
rename from saga-persistence/saga-persistence-jpa/pom.xml
rename to persistence/persistence-jpa/pom.xml
index b08dc8d..cdc35f3 100644
--- a/saga-persistence/saga-persistence-jpa/pom.xml
+++ b/persistence/persistence-jpa/pom.xml
@@ -26,7 +26,8 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>saga-persistence-jpa</artifactId>
+ <name>Pack::Persistence::JPA</name>
+ <artifactId>persistence-jpa</artifactId>
<dependencyManagement>
<dependencies>
diff --git a/saga-persistence/saga-persistence-jpa/src/main/java/org/apache/servicecomb/saga/persistence/jpa/EclipseLinkJpaConfiguration.java b/persistence/persistence-jpa/src/main/java/org/apache/servicecomb/saga/persistence/jpa/EclipseLinkJpaConfiguration.java
similarity index 100%
rename from saga-persistence/saga-persistence-jpa/src/main/java/org/apache/servicecomb/saga/persistence/jpa/EclipseLinkJpaConfiguration.java
rename to persistence/persistence-jpa/src/main/java/org/apache/servicecomb/saga/persistence/jpa/EclipseLinkJpaConfiguration.java
diff --git a/saga-persistence/saga-persistence-jpa/src/main/resources/META-INF/spring.factories b/persistence/persistence-jpa/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from saga-persistence/saga-persistence-jpa/src/main/resources/META-INF/spring.factories
rename to persistence/persistence-jpa/src/main/resources/META-INF/spring.factories
diff --git a/saga-persistence/pom.xml b/persistence/pom.xml
similarity index 92%
rename from saga-persistence/pom.xml
rename to persistence/pom.xml
index 5f0cd41..990ab84 100644
--- a/saga-persistence/pom.xml
+++ b/persistence/pom.xml
@@ -26,10 +26,11 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>saga-persistence</artifactId>
+ <artifactId>persistence</artifactId>
+ <name>Pack::Persistence</name>
<packaging>pom</packaging>
<modules>
- <module>saga-persistence-jpa</module>
+ <module>persistence-jpa</module>
</modules>
diff --git a/pom.xml b/pom.xml
index b10dc2c..5c8aa56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,13 +32,13 @@
<modules>
<module>docker-build-config</module>
- <module>saga-web</module>
<module>omega</module>
<module>alpha</module>
<module>pack-contracts</module>
<module>pack-common</module>
<module>integration-tests</module>
- <module>saga-persistence</module>
+ <module>persistence</module>
+ <module>web</module>
</modules>
<properties>
@@ -313,7 +313,7 @@
<!-- TODO rename this artifact -->
<dependency>
<groupId>org.apache.servicecomb.pack</groupId>
- <artifactId>saga-persistence-jpa</artifactId>
+ <artifactId>persistence-jpa</artifactId>
<version>0.3.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -777,8 +777,8 @@
<profile>
<id>release</id>
<modules>
- <module>saga-demo</module>
- <module>saga-distribution</module>
+ <module>demo</module>
+ <module>distribution</module>
</modules>
<build>
<plugins>
@@ -839,7 +839,7 @@
<profile>
<id>demo</id>
<modules>
- <module>saga-demo</module>
+ <module>demo</module>
<module>acceptance-tests</module>
</modules>
</profile>
diff --git a/saga-web/pom.xml b/web/pom.xml
similarity index 99%
rename from saga-web/pom.xml
rename to web/pom.xml
index 2622563..83d39b5 100644
--- a/saga-web/pom.xml
+++ b/web/pom.xml
@@ -26,7 +26,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>saga-web</artifactId>
+ <artifactId>pack-web</artifactId>
<name>Pack::Web</name>
<dependencyManagement>
diff --git a/saga-web/src/main/java/org/apache/servicecomb/saga/web/SagaWebApplication.java b/web/src/main/java/org/apache/servicecomb/saga/web/SagaWebApplication.java
similarity index 100%
rename from saga-web/src/main/java/org/apache/servicecomb/saga/web/SagaWebApplication.java
rename to web/src/main/java/org/apache/servicecomb/saga/web/SagaWebApplication.java
diff --git a/saga-web/src/main/resources/application.yaml b/web/src/main/resources/application.yaml
similarity index 100%
rename from saga-web/src/main/resources/application.yaml
rename to web/src/main/resources/application.yaml
diff --git a/saga-web/src/main/resources/microservice.yaml b/web/src/main/resources/microservice.yaml
similarity index 100%
rename from saga-web/src/main/resources/microservice.yaml
rename to web/src/main/resources/microservice.yaml
diff --git a/saga-web/src/main/resources/saga-frontend/README.md b/web/src/main/resources/saga-frontend/README.md
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/README.md
rename to web/src/main/resources/saga-frontend/README.md
diff --git a/saga-web/src/main/resources/saga-frontend/angular.json b/web/src/main/resources/saga-frontend/angular.json
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/angular.json
rename to web/src/main/resources/saga-frontend/angular.json
diff --git a/saga-web/src/main/resources/saga-frontend/package.json b/web/src/main/resources/saga-frontend/package.json
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/package.json
rename to web/src/main/resources/saga-frontend/package.json
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@core/core.module.ts b/web/src/main/resources/saga-frontend/src/app/@core/core.module.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@core/core.module.ts
rename to web/src/main/resources/saga-frontend/src/app/@core/core.module.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@core/data/data.module.ts b/web/src/main/resources/saga-frontend/src/app/@core/data/data.module.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@core/data/data.module.ts
rename to web/src/main/resources/saga-frontend/src/app/@core/data/data.module.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@core/data/saga-events.service.ts b/web/src/main/resources/saga-frontend/src/app/@core/data/saga-events.service.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@core/data/saga-events.service.ts
rename to web/src/main/resources/saga-frontend/src/app/@core/data/saga-events.service.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@core/data/state.service.ts b/web/src/main/resources/saga-frontend/src/app/@core/data/state.service.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@core/data/state.service.ts
rename to web/src/main/resources/saga-frontend/src/app/@core/data/state.service.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@core/module-import-guard.ts b/web/src/main/resources/saga-frontend/src/app/@core/module-import-guard.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@core/module-import-guard.ts
rename to web/src/main/resources/saga-frontend/src/app/@core/module-import-guard.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@core/utils/analytics.service.ts b/web/src/main/resources/saga-frontend/src/app/@core/utils/analytics.service.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@core/utils/analytics.service.ts
rename to web/src/main/resources/saga-frontend/src/app/@core/utils/analytics.service.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@core/utils/util.service.ts b/web/src/main/resources/saga-frontend/src/app/@core/utils/util.service.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@core/utils/util.service.ts
rename to web/src/main/resources/saga-frontend/src/app/@core/utils/util.service.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/components/footer/footer.component.scss b/web/src/main/resources/saga-frontend/src/app/@theme/components/footer/footer.component.scss
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/components/footer/footer.component.scss
rename to web/src/main/resources/saga-frontend/src/app/@theme/components/footer/footer.component.scss
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/components/footer/footer.component.ts b/web/src/main/resources/saga-frontend/src/app/@theme/components/footer/footer.component.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/components/footer/footer.component.ts
rename to web/src/main/resources/saga-frontend/src/app/@theme/components/footer/footer.component.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/components/header/header.component.html b/web/src/main/resources/saga-frontend/src/app/@theme/components/header/header.component.html
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/components/header/header.component.html
rename to web/src/main/resources/saga-frontend/src/app/@theme/components/header/header.component.html
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/components/header/header.component.scss b/web/src/main/resources/saga-frontend/src/app/@theme/components/header/header.component.scss
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/components/header/header.component.scss
rename to web/src/main/resources/saga-frontend/src/app/@theme/components/header/header.component.scss
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/components/header/header.component.ts b/web/src/main/resources/saga-frontend/src/app/@theme/components/header/header.component.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/components/header/header.component.ts
rename to web/src/main/resources/saga-frontend/src/app/@theme/components/header/header.component.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/components/index.ts b/web/src/main/resources/saga-frontend/src/app/@theme/components/index.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/components/index.ts
rename to web/src/main/resources/saga-frontend/src/app/@theme/components/index.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/components/switcher/switcher.component.scss b/web/src/main/resources/saga-frontend/src/app/@theme/components/switcher/switcher.component.scss
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/components/switcher/switcher.component.scss
rename to web/src/main/resources/saga-frontend/src/app/@theme/components/switcher/switcher.component.scss
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/components/switcher/switcher.component.ts b/web/src/main/resources/saga-frontend/src/app/@theme/components/switcher/switcher.component.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/components/switcher/switcher.component.ts
rename to web/src/main/resources/saga-frontend/src/app/@theme/components/switcher/switcher.component.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/components/theme-settings/theme-settings.component.scss b/web/src/main/resources/saga-frontend/src/app/@theme/components/theme-settings/theme-settings.component.scss
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/components/theme-settings/theme-settings.component.scss
rename to web/src/main/resources/saga-frontend/src/app/@theme/components/theme-settings/theme-settings.component.scss
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/components/theme-settings/theme-settings.component.ts b/web/src/main/resources/saga-frontend/src/app/@theme/components/theme-settings/theme-settings.component.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/components/theme-settings/theme-settings.component.ts
rename to web/src/main/resources/saga-frontend/src/app/@theme/components/theme-settings/theme-settings.component.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/components/theme-switcher/theme-switcher.component.html b/web/src/main/resources/saga-frontend/src/app/@theme/components/theme-switcher/theme-switcher.component.html
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/components/theme-switcher/theme-switcher.component.html
rename to web/src/main/resources/saga-frontend/src/app/@theme/components/theme-switcher/theme-switcher.component.html
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/components/theme-switcher/theme-switcher.component.scss b/web/src/main/resources/saga-frontend/src/app/@theme/components/theme-switcher/theme-switcher.component.scss
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/components/theme-switcher/theme-switcher.component.scss
rename to web/src/main/resources/saga-frontend/src/app/@theme/components/theme-switcher/theme-switcher.component.scss
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/components/theme-switcher/theme-switcher.component.ts b/web/src/main/resources/saga-frontend/src/app/@theme/components/theme-switcher/theme-switcher.component.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/components/theme-switcher/theme-switcher.component.ts
rename to web/src/main/resources/saga-frontend/src/app/@theme/components/theme-switcher/theme-switcher.component.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/components/theme-switcher/themes-switcher-list/theme-switcher-list.component.scss b/web/src/main/resources/saga-frontend/src/app/@theme/components/theme-switcher/themes-switcher-list/theme-switcher-list.component.scss
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/components/theme-switcher/themes-switcher-list/theme-switcher-list.component.scss
rename to web/src/main/resources/saga-frontend/src/app/@theme/components/theme-switcher/themes-switcher-list/theme-switcher-list.component.scss
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/components/theme-switcher/themes-switcher-list/themes-switcher-list.component.ts b/web/src/main/resources/saga-frontend/src/app/@theme/components/theme-switcher/themes-switcher-list/themes-switcher-list.component.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/components/theme-switcher/themes-switcher-list/themes-switcher-list.component.ts
rename to web/src/main/resources/saga-frontend/src/app/@theme/components/theme-switcher/themes-switcher-list/themes-switcher-list.component.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/layouts/default/default.layout.scss b/web/src/main/resources/saga-frontend/src/app/@theme/layouts/default/default.layout.scss
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/layouts/default/default.layout.scss
rename to web/src/main/resources/saga-frontend/src/app/@theme/layouts/default/default.layout.scss
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/layouts/default/default.layout.ts b/web/src/main/resources/saga-frontend/src/app/@theme/layouts/default/default.layout.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/layouts/default/default.layout.ts
rename to web/src/main/resources/saga-frontend/src/app/@theme/layouts/default/default.layout.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/layouts/index.ts b/web/src/main/resources/saga-frontend/src/app/@theme/layouts/index.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/layouts/index.ts
rename to web/src/main/resources/saga-frontend/src/app/@theme/layouts/index.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/layouts/one-column/one-column.layout.scss b/web/src/main/resources/saga-frontend/src/app/@theme/layouts/one-column/one-column.layout.scss
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/layouts/one-column/one-column.layout.scss
rename to web/src/main/resources/saga-frontend/src/app/@theme/layouts/one-column/one-column.layout.scss
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/layouts/one-column/one-column.layout.ts b/web/src/main/resources/saga-frontend/src/app/@theme/layouts/one-column/one-column.layout.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/layouts/one-column/one-column.layout.ts
rename to web/src/main/resources/saga-frontend/src/app/@theme/layouts/one-column/one-column.layout.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/pipes/capitalize.pipe.ts b/web/src/main/resources/saga-frontend/src/app/@theme/pipes/capitalize.pipe.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/pipes/capitalize.pipe.ts
rename to web/src/main/resources/saga-frontend/src/app/@theme/pipes/capitalize.pipe.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/pipes/index.ts b/web/src/main/resources/saga-frontend/src/app/@theme/pipes/index.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/pipes/index.ts
rename to web/src/main/resources/saga-frontend/src/app/@theme/pipes/index.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/pipes/no-sanitize.pipe.ts b/web/src/main/resources/saga-frontend/src/app/@theme/pipes/no-sanitize.pipe.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/pipes/no-sanitize.pipe.ts
rename to web/src/main/resources/saga-frontend/src/app/@theme/pipes/no-sanitize.pipe.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/pipes/number-with-commas.pipe.ts b/web/src/main/resources/saga-frontend/src/app/@theme/pipes/number-with-commas.pipe.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/pipes/number-with-commas.pipe.ts
rename to web/src/main/resources/saga-frontend/src/app/@theme/pipes/number-with-commas.pipe.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/pipes/plural.pipe.ts b/web/src/main/resources/saga-frontend/src/app/@theme/pipes/plural.pipe.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/pipes/plural.pipe.ts
rename to web/src/main/resources/saga-frontend/src/app/@theme/pipes/plural.pipe.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/pipes/round.pipe.ts b/web/src/main/resources/saga-frontend/src/app/@theme/pipes/round.pipe.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/pipes/round.pipe.ts
rename to web/src/main/resources/saga-frontend/src/app/@theme/pipes/round.pipe.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/pipes/timing.pipe.ts b/web/src/main/resources/saga-frontend/src/app/@theme/pipes/timing.pipe.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/pipes/timing.pipe.ts
rename to web/src/main/resources/saga-frontend/src/app/@theme/pipes/timing.pipe.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/styles/bootstrap-rtl.scss b/web/src/main/resources/saga-frontend/src/app/@theme/styles/bootstrap-rtl.scss
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/styles/bootstrap-rtl.scss
rename to web/src/main/resources/saga-frontend/src/app/@theme/styles/bootstrap-rtl.scss
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/styles/font-size.scss b/web/src/main/resources/saga-frontend/src/app/@theme/styles/font-size.scss
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/styles/font-size.scss
rename to web/src/main/resources/saga-frontend/src/app/@theme/styles/font-size.scss
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/styles/pace.theme.scss b/web/src/main/resources/saga-frontend/src/app/@theme/styles/pace.theme.scss
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/styles/pace.theme.scss
rename to web/src/main/resources/saga-frontend/src/app/@theme/styles/pace.theme.scss
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/styles/styles.scss b/web/src/main/resources/saga-frontend/src/app/@theme/styles/styles.scss
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/styles/styles.scss
rename to web/src/main/resources/saga-frontend/src/app/@theme/styles/styles.scss
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/styles/theme.corporate.ts b/web/src/main/resources/saga-frontend/src/app/@theme/styles/theme.corporate.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/styles/theme.corporate.ts
rename to web/src/main/resources/saga-frontend/src/app/@theme/styles/theme.corporate.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/styles/theme.cosmic.ts b/web/src/main/resources/saga-frontend/src/app/@theme/styles/theme.cosmic.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/styles/theme.cosmic.ts
rename to web/src/main/resources/saga-frontend/src/app/@theme/styles/theme.cosmic.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/styles/theme.default.ts b/web/src/main/resources/saga-frontend/src/app/@theme/styles/theme.default.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/styles/theme.default.ts
rename to web/src/main/resources/saga-frontend/src/app/@theme/styles/theme.default.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/styles/themes.scss b/web/src/main/resources/saga-frontend/src/app/@theme/styles/themes.scss
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/styles/themes.scss
rename to web/src/main/resources/saga-frontend/src/app/@theme/styles/themes.scss
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/@theme/theme.module.ts b/web/src/main/resources/saga-frontend/src/app/@theme/theme.module.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/@theme/theme.module.ts
rename to web/src/main/resources/saga-frontend/src/app/@theme/theme.module.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/app-routing.module.ts b/web/src/main/resources/saga-frontend/src/app/app-routing.module.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/app-routing.module.ts
rename to web/src/main/resources/saga-frontend/src/app/app-routing.module.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/app.component.ts b/web/src/main/resources/saga-frontend/src/app/app.component.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/app.component.ts
rename to web/src/main/resources/saga-frontend/src/app/app.component.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/app.module.ts b/web/src/main/resources/saga-frontend/src/app/app.module.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/app.module.ts
rename to web/src/main/resources/saga-frontend/src/app/app.module.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/pages/dashboard/count-cards/count-cards.component.html b/web/src/main/resources/saga-frontend/src/app/pages/dashboard/count-cards/count-cards.component.html
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/pages/dashboard/count-cards/count-cards.component.html
rename to web/src/main/resources/saga-frontend/src/app/pages/dashboard/count-cards/count-cards.component.html
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/pages/dashboard/count-cards/count-cards.component.scss b/web/src/main/resources/saga-frontend/src/app/pages/dashboard/count-cards/count-cards.component.scss
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/pages/dashboard/count-cards/count-cards.component.scss
rename to web/src/main/resources/saga-frontend/src/app/pages/dashboard/count-cards/count-cards.component.scss
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/pages/dashboard/count-cards/count-cards.component.ts b/web/src/main/resources/saga-frontend/src/app/pages/dashboard/count-cards/count-cards.component.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/pages/dashboard/count-cards/count-cards.component.ts
rename to web/src/main/resources/saga-frontend/src/app/pages/dashboard/count-cards/count-cards.component.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/pages/dashboard/dashboard.component.html b/web/src/main/resources/saga-frontend/src/app/pages/dashboard/dashboard.component.html
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/pages/dashboard/dashboard.component.html
rename to web/src/main/resources/saga-frontend/src/app/pages/dashboard/dashboard.component.html
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/pages/dashboard/dashboard.component.scss b/web/src/main/resources/saga-frontend/src/app/pages/dashboard/dashboard.component.scss
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/pages/dashboard/dashboard.component.scss
rename to web/src/main/resources/saga-frontend/src/app/pages/dashboard/dashboard.component.scss
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/pages/dashboard/dashboard.component.ts b/web/src/main/resources/saga-frontend/src/app/pages/dashboard/dashboard.component.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/pages/dashboard/dashboard.component.ts
rename to web/src/main/resources/saga-frontend/src/app/pages/dashboard/dashboard.component.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/pages/dashboard/dashboard.module.ts b/web/src/main/resources/saga-frontend/src/app/pages/dashboard/dashboard.module.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/pages/dashboard/dashboard.module.ts
rename to web/src/main/resources/saga-frontend/src/app/pages/dashboard/dashboard.module.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/pages/dashboard/recent-table/recent-table.component.html b/web/src/main/resources/saga-frontend/src/app/pages/dashboard/recent-table/recent-table.component.html
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/pages/dashboard/recent-table/recent-table.component.html
rename to web/src/main/resources/saga-frontend/src/app/pages/dashboard/recent-table/recent-table.component.html
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/pages/dashboard/recent-table/recent-table.component.scss b/web/src/main/resources/saga-frontend/src/app/pages/dashboard/recent-table/recent-table.component.scss
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/pages/dashboard/recent-table/recent-table.component.scss
rename to web/src/main/resources/saga-frontend/src/app/pages/dashboard/recent-table/recent-table.component.scss
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/pages/dashboard/recent-table/recent-table.component.ts b/web/src/main/resources/saga-frontend/src/app/pages/dashboard/recent-table/recent-table.component.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/pages/dashboard/recent-table/recent-table.component.ts
rename to web/src/main/resources/saga-frontend/src/app/pages/dashboard/recent-table/recent-table.component.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/pages/miscellaneous/miscellaneous-routing.module.ts b/web/src/main/resources/saga-frontend/src/app/pages/miscellaneous/miscellaneous-routing.module.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/pages/miscellaneous/miscellaneous-routing.module.ts
rename to web/src/main/resources/saga-frontend/src/app/pages/miscellaneous/miscellaneous-routing.module.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/pages/miscellaneous/miscellaneous.component.ts b/web/src/main/resources/saga-frontend/src/app/pages/miscellaneous/miscellaneous.component.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/pages/miscellaneous/miscellaneous.component.ts
rename to web/src/main/resources/saga-frontend/src/app/pages/miscellaneous/miscellaneous.component.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/pages/miscellaneous/miscellaneous.module.ts b/web/src/main/resources/saga-frontend/src/app/pages/miscellaneous/miscellaneous.module.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/pages/miscellaneous/miscellaneous.module.ts
rename to web/src/main/resources/saga-frontend/src/app/pages/miscellaneous/miscellaneous.module.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/pages/miscellaneous/not-found/not-found.component.html b/web/src/main/resources/saga-frontend/src/app/pages/miscellaneous/not-found/not-found.component.html
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/pages/miscellaneous/not-found/not-found.component.html
rename to web/src/main/resources/saga-frontend/src/app/pages/miscellaneous/not-found/not-found.component.html
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/pages/miscellaneous/not-found/not-found.component.scss b/web/src/main/resources/saga-frontend/src/app/pages/miscellaneous/not-found/not-found.component.scss
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/pages/miscellaneous/not-found/not-found.component.scss
rename to web/src/main/resources/saga-frontend/src/app/pages/miscellaneous/not-found/not-found.component.scss
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/pages/miscellaneous/not-found/not-found.component.ts b/web/src/main/resources/saga-frontend/src/app/pages/miscellaneous/not-found/not-found.component.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/pages/miscellaneous/not-found/not-found.component.ts
rename to web/src/main/resources/saga-frontend/src/app/pages/miscellaneous/not-found/not-found.component.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/pages/pages-menu.ts b/web/src/main/resources/saga-frontend/src/app/pages/pages-menu.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/pages/pages-menu.ts
rename to web/src/main/resources/saga-frontend/src/app/pages/pages-menu.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/pages/pages-routing.module.ts b/web/src/main/resources/saga-frontend/src/app/pages/pages-routing.module.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/pages/pages-routing.module.ts
rename to web/src/main/resources/saga-frontend/src/app/pages/pages-routing.module.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/pages/pages.component.ts b/web/src/main/resources/saga-frontend/src/app/pages/pages.component.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/pages/pages.component.ts
rename to web/src/main/resources/saga-frontend/src/app/pages/pages.component.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/pages/pages.module.ts b/web/src/main/resources/saga-frontend/src/app/pages/pages.module.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/pages/pages.module.ts
rename to web/src/main/resources/saga-frontend/src/app/pages/pages.module.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/pages/transactions/customRender.component.ts b/web/src/main/resources/saga-frontend/src/app/pages/transactions/customRender.component.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/pages/transactions/customRender.component.ts
rename to web/src/main/resources/saga-frontend/src/app/pages/transactions/customRender.component.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/pages/transactions/findTransaction.component.html b/web/src/main/resources/saga-frontend/src/app/pages/transactions/findTransaction.component.html
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/pages/transactions/findTransaction.component.html
rename to web/src/main/resources/saga-frontend/src/app/pages/transactions/findTransaction.component.html
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/pages/transactions/findTransaction.component.ts b/web/src/main/resources/saga-frontend/src/app/pages/transactions/findTransaction.component.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/pages/transactions/findTransaction.component.ts
rename to web/src/main/resources/saga-frontend/src/app/pages/transactions/findTransaction.component.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/pages/transactions/transactions.component.html b/web/src/main/resources/saga-frontend/src/app/pages/transactions/transactions.component.html
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/pages/transactions/transactions.component.html
rename to web/src/main/resources/saga-frontend/src/app/pages/transactions/transactions.component.html
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/pages/transactions/transactions.component.ts b/web/src/main/resources/saga-frontend/src/app/pages/transactions/transactions.component.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/pages/transactions/transactions.component.ts
rename to web/src/main/resources/saga-frontend/src/app/pages/transactions/transactions.component.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/pages/transactions/transactions.module.ts b/web/src/main/resources/saga-frontend/src/app/pages/transactions/transactions.module.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/pages/transactions/transactions.module.ts
rename to web/src/main/resources/saga-frontend/src/app/pages/transactions/transactions.module.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/pages/transactions/transactionsTable.component.html b/web/src/main/resources/saga-frontend/src/app/pages/transactions/transactionsTable.component.html
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/pages/transactions/transactionsTable.component.html
rename to web/src/main/resources/saga-frontend/src/app/pages/transactions/transactionsTable.component.html
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/pages/transactions/transactionsTable.component.scss b/web/src/main/resources/saga-frontend/src/app/pages/transactions/transactionsTable.component.scss
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/pages/transactions/transactionsTable.component.scss
rename to web/src/main/resources/saga-frontend/src/app/pages/transactions/transactionsTable.component.scss
diff --git a/saga-web/src/main/resources/saga-frontend/src/app/pages/transactions/transactionsTable.component.ts b/web/src/main/resources/saga-frontend/src/app/pages/transactions/transactionsTable.component.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/app/pages/transactions/transactionsTable.component.ts
rename to web/src/main/resources/saga-frontend/src/app/pages/transactions/transactionsTable.component.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/assets/images/square_pattern.svg b/web/src/main/resources/saga-frontend/src/assets/images/square_pattern.svg
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/assets/images/square_pattern.svg
rename to web/src/main/resources/saga-frontend/src/assets/images/square_pattern.svg
diff --git a/saga-web/src/main/resources/saga-frontend/src/assets/images/square_pattern_cosmic.svg b/web/src/main/resources/saga-frontend/src/assets/images/square_pattern_cosmic.svg
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/assets/images/square_pattern_cosmic.svg
rename to web/src/main/resources/saga-frontend/src/assets/images/square_pattern_cosmic.svg
diff --git a/saga-web/src/main/resources/saga-frontend/src/environments/environment.prod.ts b/web/src/main/resources/saga-frontend/src/environments/environment.prod.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/environments/environment.prod.ts
rename to web/src/main/resources/saga-frontend/src/environments/environment.prod.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/environments/environment.ts b/web/src/main/resources/saga-frontend/src/environments/environment.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/environments/environment.ts
rename to web/src/main/resources/saga-frontend/src/environments/environment.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/favicon.ico b/web/src/main/resources/saga-frontend/src/favicon.ico
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/favicon.ico
rename to web/src/main/resources/saga-frontend/src/favicon.ico
diff --git a/saga-web/src/main/resources/saga-frontend/src/favicon.png b/web/src/main/resources/saga-frontend/src/favicon.png
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/favicon.png
rename to web/src/main/resources/saga-frontend/src/favicon.png
diff --git a/saga-web/src/main/resources/saga-frontend/src/index.html b/web/src/main/resources/saga-frontend/src/index.html
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/index.html
rename to web/src/main/resources/saga-frontend/src/index.html
diff --git a/saga-web/src/main/resources/saga-frontend/src/main.ts b/web/src/main/resources/saga-frontend/src/main.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/main.ts
rename to web/src/main/resources/saga-frontend/src/main.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/polyfills.ts b/web/src/main/resources/saga-frontend/src/polyfills.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/polyfills.ts
rename to web/src/main/resources/saga-frontend/src/polyfills.ts
diff --git a/saga-web/src/main/resources/saga-frontend/src/tsconfig.app.json b/web/src/main/resources/saga-frontend/src/tsconfig.app.json
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/tsconfig.app.json
rename to web/src/main/resources/saga-frontend/src/tsconfig.app.json
diff --git a/saga-web/src/main/resources/saga-frontend/src/typings.d.ts b/web/src/main/resources/saga-frontend/src/typings.d.ts
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/src/typings.d.ts
rename to web/src/main/resources/saga-frontend/src/typings.d.ts
diff --git a/saga-web/src/main/resources/saga-frontend/tsconfig.json b/web/src/main/resources/saga-frontend/tsconfig.json
similarity index 100%
rename from saga-web/src/main/resources/saga-frontend/tsconfig.json
rename to web/src/main/resources/saga-frontend/tsconfig.json
diff --git a/saga-web/src/main/resources/static/css/request.css b/web/src/main/resources/static/css/request.css
similarity index 100%
rename from saga-web/src/main/resources/static/css/request.css
rename to web/src/main/resources/static/css/request.css
diff --git a/saga-web/src/main/resources/static/css/style.css b/web/src/main/resources/static/css/style.css
similarity index 100%
rename from saga-web/src/main/resources/static/css/style.css
rename to web/src/main/resources/static/css/style.css
diff --git a/saga-web/src/main/resources/static/detail.html b/web/src/main/resources/static/detail.html
similarity index 100%
rename from saga-web/src/main/resources/static/detail.html
rename to web/src/main/resources/static/detail.html
diff --git a/saga-web/src/main/resources/static/index.html b/web/src/main/resources/static/index.html
similarity index 100%
rename from saga-web/src/main/resources/static/index.html
rename to web/src/main/resources/static/index.html
diff --git a/saga-web/src/main/resources/static/js/date.js b/web/src/main/resources/static/js/date.js
similarity index 100%
rename from saga-web/src/main/resources/static/js/date.js
rename to web/src/main/resources/static/js/date.js
diff --git a/saga-web/src/main/resources/static/js/request.js b/web/src/main/resources/static/js/request.js
similarity index 100%
rename from saga-web/src/main/resources/static/js/request.js
rename to web/src/main/resources/static/js/request.js
diff --git a/saga-web/src/main/resources/static/js/table.js b/web/src/main/resources/static/js/table.js
similarity index 100%
rename from saga-web/src/main/resources/static/js/table.js
rename to web/src/main/resources/static/js/table.js
diff --git a/saga-web/src/main/resources/static/request.html b/web/src/main/resources/static/request.html
similarity index 100%
rename from saga-web/src/main/resources/static/request.html
rename to web/src/main/resources/static/request.html
diff --git a/saga-web/src/main/resources/static/result.html b/web/src/main/resources/static/result.html
similarity index 100%
rename from saga-web/src/main/resources/static/result.html
rename to web/src/main/resources/static/result.html
[servicecomb-pack] 01/13: SCB-976 removed the saga-core related
modules
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/servicecomb-pack.git
commit 865a134755b9fd076d86d86332e77883aecddcee
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Fri Dec 14 10:21:44 2018 +0800
SCB-976 removed the saga-core related modules
---
docs/api/api.md | 288 --------
docs/old_saga.md | 53 --
saga-core-akka/pom.xml | 120 ----
.../saga/core/actors/ActorBasedSaga.java | 65 --
.../saga/core/actors/ActorBasedSagaFactory.java | 83 ---
.../saga/core/actors/CompletionCallbackActor.java | 69 --
.../saga/core/actors/EventContextImpl.java | 60 --
.../servicecomb/saga/core/actors/RequestActor.java | 206 ------
.../saga/core/actors/RequestActorBuilder.java | 108 ---
.../saga/core/actors/RequestActorContext.java | 82 ---
.../saga/core/actors/messages/AbortMessage.java | 37 --
.../core/actors/messages/AbortRecoveryMessage.java | 33 -
.../core/actors/messages/CompensateMessage.java | 32 -
.../messages/CompensationRecoveryMessage.java | 22 -
.../saga/core/actors/messages/FailMessage.java | 33 -
.../saga/core/actors/messages/Message.java | 21 -
.../saga/core/actors/messages/TransactMessage.java | 40 --
.../messages/TransactionRecoveryMessage.java | 32 -
.../ActorBasedSagaExecutionComponentTest.java | 31 -
.../core/actors/ActorBasedSagaIntegrationTest.java | 692 -------------------
.../core/actors/CompletionCallbackActorTest.java | 140 ----
.../saga/core/actors/EventContextImplTest.java | 96 ---
.../saga/core/actors/RequestActorBuilderTest.java | 175 -----
.../saga/core/actors/RequestActorTest.java | 406 ------------
saga-core-akka/src/test/resources/application.conf | 21 -
saga-core-akka/src/test/resources/log4j2.xml | 30 -
saga-core/pom.xml | 111 ----
.../servicecomb/saga/core/BackwardRecovery.java | 54 --
.../apache/servicecomb/saga/core/Compensation.java | 55 --
.../saga/core/CompensationTaskConsumer.java | 69 --
.../servicecomb/saga/core/CompositeSagaLog.java | 40 --
.../saga/core/CompositeSagaResponse.java | 63 --
.../apache/servicecomb/saga/core/Descriptive.java | 23 -
.../apache/servicecomb/saga/core/EventContext.java | 28 -
.../servicecomb/saga/core/EventEnvelope.java | 47 --
.../apache/servicecomb/saga/core/EventStore.java | 25 -
.../servicecomb/saga/core/FailedSagaResponse.java | 50 --
.../org/apache/servicecomb/saga/core/Fallback.java | 45 --
.../servicecomb/saga/core/FallbackPolicy.java | 62 --
.../servicecomb/saga/core/ForwardRecovery.java | 67 --
.../servicecomb/saga/core/GraphBasedSaga.java | 139 ----
.../apache/servicecomb/saga/core/IdGenerator.java | 25 -
.../saga/core/LoggingRecoveryPolicy.java | 51 --
.../servicecomb/saga/core/LongIdGenerator.java | 30 -
.../servicecomb/saga/core/NoOpSagaRequest.java | 113 ----
.../apache/servicecomb/saga/core/Operation.java | 33 -
.../servicecomb/saga/core/PersistentLog.java | 22 -
.../servicecomb/saga/core/PersistentStore.java | 26 -
.../servicecomb/saga/core/RecoveryPolicy.java | 26 -
.../servicecomb/saga/core/RequestProcessTask.java | 67 --
.../servicecomb/saga/core/RestOperation.java | 78 ---
.../apache/servicecomb/saga/core/SQLOperation.java | 65 --
.../org/apache/servicecomb/saga/core/Saga.java | 27 -
.../apache/servicecomb/saga/core/SagaContext.java | 34 -
.../servicecomb/saga/core/SagaContextImpl.java | 144 ----
.../servicecomb/saga/core/SagaDefinition.java | 25 -
.../apache/servicecomb/saga/core/SagaEndTask.java | 48 --
.../servicecomb/saga/core/SagaEndedEvent.java | 38 --
.../apache/servicecomb/saga/core/SagaEvent.java | 44 --
.../servicecomb/saga/core/SagaException.java | 29 -
.../org/apache/servicecomb/saga/core/SagaLog.java | 22 -
.../apache/servicecomb/saga/core/SagaRequest.java | 44 --
.../servicecomb/saga/core/SagaRequestImpl.java | 153 -----
.../apache/servicecomb/saga/core/SagaResponse.java | 61 --
.../saga/core/SagaStartFailedException.java | 25 -
.../servicecomb/saga/core/SagaStartTask.java | 56 --
.../servicecomb/saga/core/SagaStartedEvent.java | 46 --
.../apache/servicecomb/saga/core/SagaState.java | 27 -
.../org/apache/servicecomb/saga/core/SagaTask.java | 31 -
.../servicecomb/saga/core/SagaTaskFactory.java | 98 ---
.../saga/core/SuccessfulSagaResponse.java | 43 --
.../apache/servicecomb/saga/core/TaskConsumer.java | 29 -
.../apache/servicecomb/saga/core/TaskRunner.java | 72 --
.../apache/servicecomb/saga/core/ToJsonFormat.java | 26 -
.../apache/servicecomb/saga/core/Transaction.java | 57 --
.../saga/core/TransactionAbortedEvent.java | 57 --
.../saga/core/TransactionAbortedException.java | 28 -
.../saga/core/TransactionCompensatedEvent.java | 56 --
.../servicecomb/saga/core/TransactionConsumer.java | 5 -
.../saga/core/TransactionEndedEvent.java | 56 --
.../saga/core/TransactionFailedException.java | 29 -
.../saga/core/TransactionStartedEvent.java | 45 --
.../saga/core/TransactionTaskConsumer.java | 126 ----
.../apache/servicecomb/saga/core/Transport.java | 22 -
.../saga/core/TransportFailedException.java | 28 -
.../core/application/SagaExecutionComponent.java | 87 ---
.../saga/core/application/SagaFactory.java | 30 -
.../application/interpreter/FromJsonFormat.java | 24 -
.../interpreter/RestRequestChecker.java | 55 --
.../saga/core/dag/ByLevelTraveller.java | 86 ---
.../saga/core/dag/FromLeafTraversalDirection.java | 38 --
.../saga/core/dag/FromRootTraversalDirection.java | 38 --
.../saga/core/dag/GraphBasedSagaFactory.java | 81 ---
.../servicecomb/saga/core/dag/GraphBuilder.java | 110 ---
.../saga/core/dag/GraphCycleDetector.java | 25 -
.../saga/core/dag/GraphCycleDetectorImpl.java | 76 ---
.../org/apache/servicecomb/saga/core/dag/Node.java | 88 ---
.../core/dag/SingleLeafDirectedAcyclicGraph.java | 38 --
.../servicecomb/saga/core/dag/Traveller.java | 29 -
.../saga/core/dag/TraversalDirection.java | 29 -
.../infrastructure/ContextAwareEventStore.java | 56 --
.../saga/infrastructure/EmbeddedEventStore.java | 58 --
.../servicecomb/saga/transports/RestTransport.java | 27 -
.../servicecomb/saga/transports/SQLTransport.java | 29 -
.../saga/transports/TransportFactory.java | 25 -
.../saga/core/BackwardRecoveryTest.java | 57 --
.../servicecomb/saga/core/CompensationImpl.java | 32 -
.../saga/core/CompositeSagaLogTest.java | 49 --
.../saga/core/CompositeSagaResponseTest.java | 81 ---
.../apache/servicecomb/saga/core/DummyEvent.java | 31 -
.../servicecomb/saga/core/FallbackPolicyTest.java | 91 ---
.../servicecomb/saga/core/ForwardRecoveryTest.java | 86 ---
.../servicecomb/saga/core/LongIdGeneratorTest.java | 36 -
.../servicecomb/saga/core/RestOperationTest.java | 95 ---
.../servicecomb/saga/core/RetrySagaLogTest.java | 89 ---
.../servicecomb/saga/core/SagaEndTaskTest.java | 47 --
.../servicecomb/saga/core/SagaEventMatcher.java | 68 --
.../saga/core/SagaExecutionComponentTestBase.java | 272 --------
.../servicecomb/saga/core/SagaIntegrationTest.java | 738 ---------------------
.../servicecomb/saga/core/SagaStartTaskTest.java | 64 --
.../servicecomb/saga/core/TransactionImpl.java | 32 -
.../dag/DirectedAcyclicGraphTraversalTest.java | 102 ---
.../dag/GraphBasedSagaExecutionComponentTest.java | 33 -
.../saga/core/dag/GraphBuilderTest.java | 154 -----
.../saga/core/dag/GraphCycleDetectorTest.java | 72 --
.../apache/servicecomb/saga/core/dag/NodeTest.java | 80 ---
.../infrastructure/ContextAwareEventStoreTest.java | 43 --
saga-core/src/test/resources/application.conf | 21 -
saga-core/src/test/resources/log4j2.xml | 30 -
saga-demo/conditional-transaction-demo/README.md | 177 -----
.../conditional-transaction-demo-tests/pom.xml | 301 ---------
.../saga/demo/tests/ConditionalTransactionIT.java | 155 -----
.../conditional-transaction-demo.sh | 53 --
.../docker-compose.yaml | 75 ---
.../conditional-transaction-demo/inventory/pom.xml | 79 ---
.../inventory/InventoryApplication.java | 29 -
.../transaction/inventory/InventoryController.java | 89 ---
.../inventory/InventoryControllerTest.java | 79 ---
.../membership/pom.xml | 79 ---
.../membership/MembershipApplication.java | 29 -
.../membership/MembershipController.java | 62 --
.../conditional-transaction-demo/payment/pom.xml | 80 ---
.../transaction/payment/PaymentApplication.java | 29 -
.../transaction/payment/PaymentController.java | 84 ---
.../transaction/payment/PaymentControllerTest.java | 61 --
saga-demo/conditional-transaction-demo/pom.xml | 40 --
.../conditional-transaction-demo/supplier/pom.xml | 79 ---
.../transaction/supplier/SupplierApplication.java | 29 -
.../transaction/supplier/SupplierController.java | 52 --
.../src/main/resources/META-INF/LICENSE.txt | 202 ------
.../src/main/resources/META-INF/NOTICE.txt | 11 -
.../dependency-free-transaction-demo/README.md | 170 -----
.../car-rental-service/pom.xml | 90 ---
.../saga/demo/car/rental/CarRentalApplication.java | 32 -
.../saga/demo/car/rental/CarRentalController.java | 100 ---
.../src/main/resources/microservice.yaml | 30 -
.../demo-tests/pom.xml | 333 ----------
.../apache/servicecomb/saga/demo/tests/DemoIT.java | 150 -----
.../dependency-free-transaction-demo.sh | 53 --
.../docker-compose.yaml | 101 ---
.../flight-booking-service/pom.xml | 90 ---
.../flight/booking/FlightBookingApplication.java | 32 -
.../flight/booking/FlightBookingController.java | 77 ---
.../src/main/resources/microservice.yaml | 30 -
.../hotel-reservation-service/pom.xml | 90 ---
.../reservation/HotelReservationApplication.java | 32 -
.../reservation/HotelReservationController.java | 78 ---
.../src/main/resources/microservice.yaml | 30 -
.../payment-service/pom.xml | 90 ---
.../saga/demo/payment/PaymentApplication.java | 32 -
.../saga/demo/payment/PaymentController.java | 81 ---
.../src/main/resources/microservice.yaml | 32 -
saga-demo/dependency-free-transaction-demo/pom.xml | 62 --
saga-discovery/pom.xml | 37 --
.../saga-discovery-servicecenter/pom.xml | 124 ----
.../center/ServiceCenterDiscoveryConfig.java | 43 --
.../src/main/resources/META-INF/spring.factories | 18 -
.../src/main/resources/microservice.yaml | 30 -
.../discovery/service/center/DummyController.java | 56 --
.../center/ServiceCenterDiscoveryApplication.java | 32 -
.../ServiceCenterDiscoveryRestTransportTest.java | 130 ----
.../src/test/resources/log4j2-test.xml | 30 -
.../src/test/resources/registry.yaml | 23 -
saga-format/pom.xml | 90 ---
.../saga/core/FailedSagaRequestContext.java | 40 --
.../servicecomb/saga/core/JacksonToJsonFormat.java | 65 --
.../servicecomb/saga/core/SagaRequestContext.java | 37 --
.../saga/core/SuccessfulSagaRequestContext.java | 41 --
.../servicecomb/saga/format/ChildrenExtractor.java | 59 --
.../servicecomb/saga/format/JacksonFallback.java | 81 ---
.../saga/format/JacksonFromJsonFormat.java | 58 --
.../saga/format/JacksonRestCompensation.java | 44 --
.../saga/format/JacksonRestFallback.java | 55 --
.../saga/format/JacksonRestOperation.java | 71 --
.../saga/format/JacksonRestTransaction.java | 44 --
.../saga/format/JacksonSQLCompensation.java | 40 --
.../saga/format/JacksonSQLOperation.java | 49 --
.../saga/format/JacksonSQLTransaction.java | 40 --
.../saga/format/JacksonSagaEventFormat.java | 147 ----
.../saga/format/JsonFailedSagaResponse.java | 29 -
.../saga/format/JsonRestSagaRequest.java | 73 --
.../saga/format/JsonSQLSagaRequest.java | 69 --
.../saga/format/JsonSagaDefinition.java | 61 --
.../servicecomb/saga/format/JsonSagaRequest.java | 41 --
.../saga/format/JsonSuccessfulSagaResponse.java | 30 -
.../servicecomb/saga/format/SagaEventFormat.java | 25 -
.../servicecomb/saga/format/TransportAware.java | 27 -
.../saga/format/ChildrenExtractorTest.java | 75 ---
.../format/JacksonFromJsonFormatForSQLTest.java | 232 -------
.../saga/format/JacksonFromJsonFormatTest.java | 299 ---------
.../saga/format/JacksonRestOperationTest.java | 73 --
.../saga/format/JsonRestSagaRequestTest.java | 101 ---
.../saga/format/JsonSQLSagaRequestTest.java | 72 --
.../saga/format/JsonSagaDefinitionTest.java | 34 -
.../saga/format/SagaEventFormatTest.java | 184 -----
saga-spring/pom.xml | 261 --------
.../saga/spring/JpaPersistentStore.java | 69 --
.../servicecomb/saga/spring/SagaController.java | 222 -------
.../servicecomb/saga/spring/SagaEventEntity.java | 85 ---
.../servicecomb/saga/spring/SagaEventRepo.java | 44 --
.../saga/spring/SagaExecutionQueryService.java | 160 -----
.../saga/spring/SagaRecoveryListener.java | 37 --
.../saga/spring/SagaShutdownListener.java | 42 --
.../saga/spring/SagaSpringApplication.java | 39 --
.../servicecomb/saga/spring/SagaSpringConfig.java | 136 ----
saga-spring/src/main/resources/META-INF/aop.xml | 25 -
.../src/main/resources/META-INF/spring.factories | 20 -
saga-spring/src/main/resources/application.conf | 88 ---
saga-spring/src/main/resources/application.yaml | 30 -
saga-spring/src/main/resources/log4j2.xml | 30 -
.../src/main/resources/schema-postgresql.sql | 26 -
.../ActorBasedSagaSpringApplicationTest.java | 25 -
.../GraphBasedSagaSpringApplicationTest.java | 25 -
.../saga/spring/GreetingController.java | 42 --
.../servicecomb/saga/spring/SagaRecoveryTest.java | 181 -----
.../saga/spring/SagaServiceDiscoveryTest.java | 110 ---
.../saga/spring/SagaSpringApplicationTestBase.java | 390 -----------
saga-spring/src/test/resources/data.sql | 29 -
saga-spring/src/test/resources/log4j2-test.xml | 30 -
saga-spring/src/test/resources/registry.yaml | 23 -
transports/pom.xml | 39 --
transports/transport-httpclient-spring/pom.xml | 80 ---
.../saga/transports/HttpClientTransportConfig.java | 40 --
.../src/main/resources/META-INF/spring.factories | 19 -
.../saga/transports/RestTransportTest.java | 123 ----
.../src/test/resources/log4j2.xml | 30 -
transports/transport-httpclient/pom.xml | 63 --
.../transports/httpclient/HttpClientTransport.java | 121 ----
.../httpclient/HttpClientTransportTest.java | 192 ------
.../src/test/resources/log4j2.xml | 30 -
transports/transport-resttemplate/pom.xml | 71 --
.../resttemplate/RestTemplateTransport.java | 121 ----
252 files changed, 19148 deletions(-)
diff --git a/docs/api/api.md b/docs/api/api.md
deleted file mode 100755
index 756a75c..0000000
--- a/docs/api/api.md
+++ /dev/null
@@ -1,288 +0,0 @@
-# Saga API
-### Post transaction and compensation requests to Saga
-```
-POST /requests
-```
-
-#### Description
-
-1. Define requests in order and recovery policy by JSON format as below,put them to body.
-```
-{
- "policy": "",
- "requests": [
- {
- "id": "",
- "type": "",
- "serviceName": "",
- "parents": [
-
- ],
- "transaction": {
- "method": "",
- "path": "",
- "retries": "",
- "params": {
-
- }
- },
- "compensation": {
- "method": "",
- "path": "",
- "retries": "",
- "params": {
-
- }
- }
- }
- ]
-}
-```
-JSON parameters:
-- policy - support `BackwardRecovery` or `ForwardRecovery`.
-- requests - transactions array.
- - id - request id. It should be unique among this collection of requests.
- - type - support `rest` for now.
- - serviceName - user-defined service name.
- - parents - request ids. It means this request is only executed after all requests in the parents field are completed.
- - transaction - user-defined transaction that executed by the Saga.
- - method - user-defined, HTTP method.
- - path - user-defined, HTTP path.
- - retries - int, optional, default -1. The max retry times for transaction. If this parameter is less than or equal to 0, transaction will retry infinitely.
- - params - support `form`,`json`,`body`,`query`.
- - compensation - user-defined compensation that executed by the Saga.
- - method - user-defined, HTTP method.
- - path - user-defined, HTTP path.
- - retries - int, optional, default 3. The max retry times for compensation.
- - params - support `form`,`json`,`body`,`query`.
-
-2. Set content type to `text/plain`.
-
-3. Send them to Saga service.
-
-#### Example request
-```
-curl -XPOST -H "Content-Type: text/plain" -d @./request.json http://<docker.host.ip:saga.port>/requests
-```
-
-#### Example response
-```
-success
-```
-
-#### Status codes
-- **200** – no error
-- **400** – bad parameter
-- **500** – server error
-
-
-### Get all the Saga events
-```
-GET /events
-```
-
-#### Description
-Get all the Saga events.
-
-#### Example request
-```
-curl -XGET http://<docker.host.ip:saga.port>/events
-```
-
-#### Example response
-```
-{
- "88658e73-eff5-4d31-887e-019201d6b560": [
- {
- "id": 1,
- "sagaId": "88658e73-eff5-4d31-887e-019201d6b560",
- "creationTime": "2017-09-15T01:15:40Z",
- "type": "SagaStartedEvent",
- "contentJson": "{\"policy\": \"BackwardRecovery\", \"requests\": [{\"id\": \"request-car\", \"type\": \"rest\", \"serviceName\": \"car-rental-service\", \"transaction\": {\"path\": \"/rentals\", \"method\": \"post\", \"params\": {\"form\": {\"customerId\": \"mike\"}}}, \"compensation\": {\"path\": \"/rentals\", \"method\": \"put\", \"params\": {\"form\": {\"customerId\": \"mike\"}}}}, {\"id\": \"request-hotel\", \"type\": \"rest\", \"serviceName\": \"hotel-reservation-service [...]
- },
- {
- "id": 2,
- "sagaId": "88658e73-eff5-4d31-887e-019201d6b560",
- "creationTime": "2017-09-15T01:15:40Z",
- "type": "TransactionStartedEvent",
- "contentJson": "{\"id\": \"request-flight\", \"type\": \"rest\", \"parents\": [], \"fallback\": {\"type\": \"NOP\"}, \"serviceName\": \"flight-booking-service\", \"transaction\": {\"path\": \"/bookings\", \"method\": \"post\", \"params\": {\"form\": {\"customerId\": \"mike\"}}}, \"compensation\": {\"path\": \"/bookings\", \"method\": \"put\", \"params\": {\"form\": {\"customerId\": \"mike\"}}, \"retries\": 3}}"
- },
- {
- "id": 3,
- "sagaId": "88658e73-eff5-4d31-887e-019201d6b560",
- "creationTime": "2017-09-15T01:15:40Z",
- "type": "TransactionStartedEvent",
- "contentJson": "{\"id\": \"request-car\", \"type\": \"rest\", \"parents\": [], \"fallback\": {\"type\": \"NOP\"}, \"serviceName\": \"car-rental-service\", \"transaction\": {\"path\": \"/rentals\", \"method\": \"post\", \"params\": {\"form\": {\"customerId\": \"mike\"}}}, \"compensation\": {\"path\": \"/rentals\", \"method\": \"put\", \"params\": {\"form\": {\"customerId\": \"mike\"}}, \"retries\": 3}}"
- },
- {
- "id": 4,
- "sagaId": "88658e73-eff5-4d31-887e-019201d6b560",
- "creationTime": "2017-09-15T01:15:40Z",
- "type": "TransactionStartedEvent",
- "contentJson": "{\"id\": \"request-hotel\", \"type\": \"rest\", \"parents\": [], \"fallback\": {\"type\": \"NOP\"}, \"serviceName\": \"hotel-reservation-service\", \"transaction\": {\"path\": \"/reservations\", \"method\": \"post\", \"params\": {\"form\": {\"customerId\": \"mike\"}}}, \"compensation\": {\"path\": \"/reservations\", \"method\": \"put\", \"params\": {\"form\": {\"customerId\": \"mike\"}}, \"retries\": 3}}"
- },
- {
- "id": 5,
- "sagaId": "88658e73-eff5-4d31-887e-019201d6b560",
- "creationTime": "2017-09-15T01:15:40Z",
- "type": "TransactionEndedEvent",
- "contentJson": "{\"request\": {\"id\": \"request-flight\", \"type\": \"rest\", \"parents\": [], \"fallback\": {\"type\": \"NOP\"}, \"serviceName\": \"flight-booking-service\", \"transaction\": {\"path\": \"/bookings\", \"method\": \"post\", \"params\": {\"form\": {\"customerId\": \"mike\"}}}, \"compensation\": {\"path\": \"/bookings\", \"method\": \"put\", \"params\": {\"form\": {\"customerId\": \"mike\"}}, \"retries\": 3}}, \"response\": {\"body\": \"{\\n \\\"statusCode\\\" [...]
- },
- {
- "id": 6,
- "sagaId": "88658e73-eff5-4d31-887e-019201d6b560",
- "creationTime": "2017-09-15T01:15:40Z",
- "type": "TransactionEndedEvent",
- "contentJson": "{\"request\": {\"id\": \"request-hotel\", \"type\": \"rest\", \"parents\": [], \"fallback\": {\"type\": \"NOP\"}, \"serviceName\": \"hotel-reservation-service\", \"transaction\": {\"path\": \"/reservations\", \"method\": \"post\", \"params\": {\"form\": {\"customerId\": \"mike\"}}}, \"compensation\": {\"path\": \"/reservations\", \"method\": \"put\", \"params\": {\"form\": {\"customerId\": \"mike\"}}, \"retries\": 3}}, \"response\": {\"body\": \"{\\n \\\"stat [...]
- },
- {
- "id": 7,
- "sagaId": "88658e73-eff5-4d31-887e-019201d6b560",
- "creationTime": "2017-09-15T01:15:41Z",
- "type": "TransactionEndedEvent",
- "contentJson": "{\"request\": {\"id\": \"request-car\", \"type\": \"rest\", \"parents\": [], \"fallback\": {\"type\": \"NOP\"}, \"serviceName\": \"car-rental-service\", \"transaction\": {\"path\": \"/rentals\", \"method\": \"post\", \"params\": {\"form\": {\"customerId\": \"mike\"}}}, \"compensation\": {\"path\": \"/rentals\", \"method\": \"put\", \"params\": {\"form\": {\"customerId\": \"mike\"}}, \"retries\": 3}}, \"response\": {\"body\": \"{\\n \\\"statusCode\\\": 200,\\n [...]
- },
- {
- "id": 8,
- "sagaId": "88658e73-eff5-4d31-887e-019201d6b560",
- "creationTime": "2017-09-15T01:15:41Z",
- "type": "TransactionStartedEvent",
- "contentJson": "{\"id\": \"request-payment\", \"type\": \"rest\", \"parents\": [\"request-car\", \"request-flight\", \"request-hotel\"], \"fallback\": {\"type\": \"NOP\"}, \"serviceName\": \"payment-service\", \"transaction\": {\"path\": \"/payments\", \"method\": \"post\", \"params\": {\"form\": {\"customerId\": \"mike\"}}}, \"compensation\": {\"path\": \"/payments\", \"method\": \"put\", \"params\": {\"form\": {\"customerId\": \"mike\"}}, \"retries\": 3}}"
- },
- {
- "id": 9,
- "sagaId": "88658e73-eff5-4d31-887e-019201d6b560",
- "creationTime": "2017-09-15T01:15:41Z",
- "type": "TransactionEndedEvent",
- "contentJson": "{\"request\": {\"id\": \"request-payment\", \"type\": \"rest\", \"parents\": [\"request-car\", \"request-flight\", \"request-hotel\"], \"fallback\": {\"type\": \"NOP\"}, \"serviceName\": \"payment-service\", \"transaction\": {\"path\": \"/payments\", \"method\": \"post\", \"params\": {\"form\": {\"customerId\": \"mike\"}}}, \"compensation\": {\"path\": \"/payments\", \"method\": \"put\", \"params\": {\"form\": {\"customerId\": \"mike\"}}, \"retries\": 3}}, \"r [...]
- },
- {
- "id": 10,
- "sagaId": "88658e73-eff5-4d31-887e-019201d6b560",
- "creationTime": "2017-09-15T01:15:41Z",
- "type": "SagaEndedEvent",
- "contentJson": "{}"
- }
- ]
-}
-```
-
-#### Status codes
-- **200** – no error
-
-### Invoke embedded Saga to execute SQL transaction
-
-In order to Invoke embedded saga, it is necessary to add dependencies to your applications.
-
-There are a `maven` example
-
-```
-<dependencies>
-
- ...
-
- <dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
- <artifactId>saga-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
- <artifactId>saga-format</artifactId>
- </dependency>
-
- ...
-
-</dependencies>
-```
-
-#### Description
-
-1. Implement SQLTransport interface in your own applications.
-
-2. Instance `SagaExecutionComponent` and inject it into your own applications.
-
-3. Define requests in order and recovery policy by JSON format as below in your applications.
-
-```
-{
- "policy": "",
- "requests": [
- {
- "id": "",
- "type": "",
- "datasource": "",
- "parents": [
-
- ],
- "transaction": {
- "sql": "",
- "retries": "",
- "params": [
- []
- ]
- },
- "compensation": {
- "sql": "",
- "retries": "",
- "params": [
- []
- ]
- }
- }
- ]
-}
-```
-JSON parameters:
-- policy - support `BackwardRecovery` or `ForwardRecovery`.
-- requests - transactions array.
- - id - request id. It should be unique among this collection of requests.
- - type - support `sql` for now.
- - datasource - user-defined datasource name.
- - parents - request ids. It means this request is only executed after all requests in the parents field are completed.
- - transaction - user-defined transaction that executed by the Saga.
- - sql - user-defined, forward sql.
- - retries - int, optional, default -1. The max retry times for transaction. If this parameter is less than or equal to 0, transaction will retry infinitely.
- - params - parameters for forward sql.
- - compensation - user-defined compensation that executed by the Saga.
- - sql - user-defined, backward sql.
- - retries - int, optional, default 3. The max retry times for compensation.
- - params - parameters for backward sql.
-
-4. Invoke `SagaExecutionComponent.run(String json)` function to execute saga.
-
-#### Example Implement SQLTransport interface
-
-```
-public class ExampleSQLTransport implements SQLTransport {
- @Override
- public SagaResponse with(final String datasource, final String sql, final List<String> params) {
- try {
- // invoke your own code to execute sql.
- } catch (Exception e) {
- throw new TransportFailedException("execute SQL " + sql + " occur exception: ", e);
- }
- return new JsonSuccessfulSagaResponse("{}");
- }
-}
-```
-
-#### Example Instance `SagaExecutionComponent`
-
-```
- private final SQLTransport sqlTransport = new ExampleSQLTransport;
-
- private final TransportFactory<SQLTransport> transportFactory = new TransportFactory<SQLTransport>() {
- @Override
- public SQLTransport getTransport() {
- return sqlTransport;
- }
- };
-
- private final SagaExecutionComponent coordinator = new SagaExecutionComponent(
- new EmbeddedPersistentStore(),
- new JacksonFromJsonFormat(transportFactory),
- null,
- new GraphBasedSagaFactory(500, eventStore, new ChildrenExtractor(), Executors.newFixedThreadPool(5))
- );
-```
-
diff --git a/docs/old_saga.md b/docs/old_saga.md
deleted file mode 100755
index 171b069..0000000
--- a/docs/old_saga.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# Previous Saga's Documentation
-## Major Architecture of Saga
-* saga-core(transaction and compensation handling logic)
-* saga-format(data serialization and deserialization)
-* saga-transports(communication protocol implementation such as rest or rpc in the future)
-* saga-discovery(service discovery)
-* saga-spring(restful service framework)
-
-
-
-## Prerequisites
-You will need:
-1. [Oracle JDK 1.8+][jdk]
-2. [Maven 3.x][maven]
-3. [Docker][docker]
-4. [PostgreSQL][postgres]
-5. [Service Center(optional)][service_center]
-6. [Docker compose(optional)][docker_compose]
-7. [Docker machine(optional)][docker_machine]
-
-[jdk]: http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html
-[maven]: https://maven.apache.org/install.html
-[docker]: https://www.docker.com/get-docker
-[postgres]: https://www.postgresql.org/download/
-[service_center]: https://github.com/apache/servicecomb-service-center
-[docker_compose]: https://docs.docker.com/compose/install/
-[docker_machine]: https://docs.docker.com/machine/install-machine/
-
-## Building
-Download the source code.
-```
-git clone https://github.com/apache/servicecomb-saga.git
-```
-
-Enter the Saga root directory,build Saga project by maven command and generate a docker image named saga-spring in local.
-```
-mvn package -DskipTests -Pdocker
-```
-
-## Run Services
-A `docker-compose.yaml` file is provided to start Saga services and its dependencies(Service center and Mysql) as docker containers.
-User also can configure specified Service center or Mysql in `docker-compose.yaml`.
-
-Enter the Saga root directory, run all service images using command,
-```
-docker-compose up
-```
-
-## Reference API
-See [Saga API](docs/api/api.md) for details.
-
-## Example
-See [Saga demo](https://github.com/apache/servicecomb-saga/tree/master/saga-demo) for details.
diff --git a/saga-core-akka/pom.xml b/saga-core-akka/pom.xml
deleted file mode 100644
index a019a25..0000000
--- a/saga-core-akka/pom.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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</artifactId>
- <groupId>org.apache.servicecomb.saga</groupId>
- <version>0.3.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>saga-core-akka</artifactId>
- <name>Saga::Core::Akka</name>
-
- <dependencies>
- <dependency>
- <groupId>com.lmax</groupId>
- <artifactId>disruptor</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
- <artifactId>saga-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.typesafe.akka</groupId>
- <artifactId>akka-actor_2.12</artifactId>
- </dependency>
- <dependency>
- <groupId>com.typesafe.akka</groupId>
- <artifactId>akka-slf4j_2.12</artifactId>
- </dependency>
- <dependency>
- <groupId>io.kamon</groupId>
- <artifactId>kamon-core_2.12</artifactId>
- </dependency>
- <dependency>
- <groupId>io.kamon</groupId>
- <artifactId>kamon-annotation_2.12</artifactId>
- </dependency>
-
- <!-- test dependencies -->
- <dependency>
- <groupId>com.typesafe.akka</groupId>
- <artifactId>akka-testkit_2.12</artifactId>
- </dependency>
- <dependency>
- <groupId>org.scalatest</groupId>
- <artifactId>scalatest_2.12</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <!-- need to use this version of running the test -->
- <version>1.10.19</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
- <dependency>
- <groupId>org.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- </dependency>
- <dependency>
- <groupId>com.github.seanyinx</groupId>
- <artifactId>unit-scaffolding</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
- <artifactId>saga-core</artifactId>
- <type>test-jar</type>
- <version>0.3.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
- <artifactId>saga-core</artifactId>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/ActorBasedSaga.java b/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/ActorBasedSaga.java
deleted file mode 100644
index 36fae1f..0000000
--- a/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/ActorBasedSaga.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.actors;
-
-import java.util.concurrent.CompletableFuture;
-
-import org.apache.servicecomb.saga.core.EventContext;
-import org.apache.servicecomb.saga.core.EventStore;
-import org.apache.servicecomb.saga.core.NoOpSagaRequest;
-import org.apache.servicecomb.saga.core.Saga;
-import org.apache.servicecomb.saga.core.SagaEvent;
-import org.apache.servicecomb.saga.core.SagaResponse;
-import org.apache.servicecomb.saga.core.actors.messages.TransactMessage;
-
-import akka.actor.ActorRef;
-
-public class ActorBasedSaga implements Saga {
- private final ActorRef root;
- private final ActorRef completionCallback;
- private final CompletableFuture<SagaResponse> future;
- private final EventStore sagaLog;
- private final EventContext sagaContext;
-
- ActorBasedSaga(ActorRef root, ActorRef completionCallback, CompletableFuture<SagaResponse> future, EventStore sagaLog,
- EventContext sagaContext) {
- this.root = root;
- this.completionCallback = completionCallback;
- this.future = future;
- this.sagaLog = sagaLog;
- this.sagaContext = sagaContext;
- }
-
- @Override
- public SagaResponse run() {
- root.tell(new TransactMessage(NoOpSagaRequest.SAGA_START_REQUEST, SagaResponse.EMPTY_RESPONSE), completionCallback);
-
- return future.join();
- }
-
- @Override
- public void play() {
- gatherEvents(sagaLog);
- }
-
- private void gatherEvents(Iterable<SagaEvent> events) {
- for (SagaEvent event : events) {
- event.gatherTo(sagaContext);
- }
- }
-}
diff --git a/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/ActorBasedSagaFactory.java b/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/ActorBasedSagaFactory.java
deleted file mode 100644
index 8ce22fa..0000000
--- a/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/ActorBasedSagaFactory.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.actors;
-
-import static akka.actor.ActorRef.noSender;
-
-import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-
-import org.apache.servicecomb.saga.core.EventStore;
-import org.apache.servicecomb.saga.core.NoOpSagaRequest;
-import org.apache.servicecomb.saga.core.SagaResponse;
-import org.apache.servicecomb.saga.core.application.SagaFactory;
-import org.apache.servicecomb.saga.core.PersistentStore;
-import org.apache.servicecomb.saga.core.SagaDefinition;
-import org.apache.servicecomb.saga.core.SagaTaskFactory;
-import org.apache.servicecomb.saga.core.application.interpreter.FromJsonFormat;
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import scala.concurrent.Await;
-import scala.concurrent.duration.Duration;
-
-public class ActorBasedSagaFactory implements SagaFactory {
- private final ActorSystem actorSystem = ActorSystem.create("saga");
- private final RequestActorBuilder actorBuilder;
- private final SagaTaskFactory sagaTaskFactory;
-
- public ActorBasedSagaFactory(int retryDelay,
- PersistentStore persistentStore,
- FromJsonFormat<Set<String>> childrenExtractor) {
-
- this.sagaTaskFactory = new SagaTaskFactory(retryDelay, persistentStore);
- this.actorBuilder = new RequestActorBuilder(actorSystem, childrenExtractor);
- }
-
- @Override
- public ActorBasedSaga createSaga(String requestJson, String sagaId, EventStore sagaLog, SagaDefinition definition) {
-
- CompletableFuture<SagaResponse> future = new CompletableFuture<>();
- ActorRef completionCallback = actorSystem.actorOf(CompletionCallbackActor.props(future));
- RequestActorContext context = actorBuilder.build(
- definition.requests(),
- sagaTaskFactory.sagaTasks(sagaId,
- requestJson,
- definition.policy(),
- sagaLog
- ),
- completionCallback);
-
- completionCallback.tell(context, noSender());
- return new ActorBasedSaga(
- context.actorOf(NoOpSagaRequest.SAGA_START_REQUEST.id()),
- completionCallback,
- future,
- sagaLog,
- new EventContextImpl(context));
- }
-
- @Override
- public boolean isTerminated() {
- return actorSystem.whenTerminated().isCompleted();
- }
-
- @Override
- public void terminate() throws Exception {
- Await.result(actorSystem.terminate(), Duration.Inf());
- }
-}
diff --git a/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/CompletionCallbackActor.java b/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/CompletionCallbackActor.java
deleted file mode 100644
index 7cee4d3..0000000
--- a/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/CompletionCallbackActor.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.actors;
-
-import java.util.concurrent.CompletableFuture;
-
-import org.apache.servicecomb.saga.core.NoOpSagaRequest;
-import org.apache.servicecomb.saga.core.SagaResponse;
-import org.apache.servicecomb.saga.core.actors.messages.AbortMessage;
-import org.apache.servicecomb.saga.core.actors.messages.CompensateMessage;
-import org.apache.servicecomb.saga.core.actors.messages.FailMessage;
-import org.apache.servicecomb.saga.core.actors.messages.TransactMessage;
-import akka.actor.AbstractLoggingActor;
-import akka.actor.Props;
-
-class CompletionCallbackActor extends AbstractLoggingActor {
- private final CompletableFuture<SagaResponse> future;
-
- private CompletionCallbackActor(CompletableFuture<SagaResponse> future) {
- this.future = future;
- }
-
- static Props props(CompletableFuture<SagaResponse> future) {
- return Props.create(CompletionCallbackActor.class, () -> new CompletionCallbackActor(future));
- }
-
- @Override
- public Receive createReceive() {
- return receiveBuilder()
- .match(RequestActorContext.class, this::ready)
- .build();
- }
-
- private void ready(RequestActorContext context) {
- getContext().become(receiveBuilder()
- .match(CompensateMessage.class, message -> end(context, message.response()))
- .match(TransactMessage.class, message -> end(context, message.response()))
- .match(AbortMessage.class, message -> onAbort(context, message))
- .match(FailMessage.class, message -> end(context, message.response()))
- .build());
- }
-
- private void onAbort(RequestActorContext context, AbortMessage message) {
- log().info("saga actor: received abort message of {}", message.response());
- context.actorOf(NoOpSagaRequest.SAGA_END_REQUEST.id()).tell(new CompensateMessage(message.response()), self());
- }
-
- private void end(RequestActorContext context, SagaResponse response) {
- log().info("saga actor: received response {}", response);
- future.complete(response);
- context.forAll(actor -> getContext().stop(actor));
- getContext().stop(self());
- }
-}
diff --git a/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/EventContextImpl.java b/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/EventContextImpl.java
deleted file mode 100644
index 21a2928..0000000
--- a/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/EventContextImpl.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.actors;
-
-import static akka.actor.ActorRef.noSender;
-
-import org.apache.servicecomb.saga.core.EventContext;
-import org.apache.servicecomb.saga.core.SagaRequest;
-import org.apache.servicecomb.saga.core.SagaResponse;
-import org.apache.servicecomb.saga.core.actors.messages.AbortRecoveryMessage;
-import org.apache.servicecomb.saga.core.actors.messages.CompensationRecoveryMessage;
-import org.apache.servicecomb.saga.core.actors.messages.TransactionRecoveryMessage;
-import org.apache.servicecomb.saga.core.actors.messages.Message;
-
-public class EventContextImpl implements EventContext {
- private final RequestActorContext context;
-
- EventContextImpl(RequestActorContext context) {
- this.context = context;
- }
-
- @Override
- public void beginTransaction(SagaRequest request) {
-
- }
-
- @Override
- public void endTransaction(SagaRequest request, SagaResponse response) {
- sendMessage(request, new TransactionRecoveryMessage(response));
- }
-
- @Override
- public void abortTransaction(SagaRequest request, SagaResponse response) {
- sendMessage(request, new AbortRecoveryMessage(response));
- }
-
- @Override
- public void compensateTransaction(SagaRequest request, SagaResponse response) {
- sendMessage(request, new CompensationRecoveryMessage());
- }
-
- private void sendMessage(SagaRequest request, Message message) {
- context.actorOf(request.id()).tell(message, noSender());
- }
-}
diff --git a/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/RequestActor.java b/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/RequestActor.java
deleted file mode 100644
index 055174e..0000000
--- a/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/RequestActor.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.actors;
-
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-
-import org.apache.servicecomb.saga.core.CompositeSagaResponse;
-import org.apache.servicecomb.saga.core.SagaRequest;
-import org.apache.servicecomb.saga.core.SagaResponse;
-import org.apache.servicecomb.saga.core.SagaStartFailedException;
-import org.apache.servicecomb.saga.core.SagaTask;
-import org.apache.servicecomb.saga.core.TransactionFailedException;
-import org.apache.servicecomb.saga.core.actors.messages.AbortMessage;
-import org.apache.servicecomb.saga.core.actors.messages.AbortRecoveryMessage;
-import org.apache.servicecomb.saga.core.actors.messages.CompensationRecoveryMessage;
-import org.apache.servicecomb.saga.core.actors.messages.FailMessage;
-import org.apache.servicecomb.saga.core.actors.messages.Message;
-import org.apache.servicecomb.saga.core.actors.messages.TransactMessage;
-import org.apache.servicecomb.saga.core.actors.messages.TransactionRecoveryMessage;
-import org.apache.servicecomb.saga.core.actors.messages.CompensateMessage;
-
-import akka.actor.AbstractLoggingActor;
-import akka.actor.ActorRef;
-import akka.actor.Props;
-import akka.japi.pf.ReceiveBuilder;
-
-public class RequestActor extends AbstractLoggingActor {
- private final RequestActorContext context;
- private final SagaTask task;
- private final SagaRequest request;
-
- private final List<SagaResponse> parentResponses;
- private final List<ActorRef> compensatedChildren;
-
- private final Receive transacted;
- private final Receive aborted;
-
- static Props props(
- RequestActorContext context,
- SagaTask task,
- SagaRequest request) {
- return Props.create(RequestActor.class, () -> new RequestActor(context, task, request));
- }
-
- private RequestActor(
- RequestActorContext context,
- SagaTask task,
- SagaRequest request) {
- this.context = context;
- this.task = task;
- this.request = request;
- this.parentResponses = new ArrayList<>(request.parents().length);
- this.compensatedChildren = new LinkedList<>();
-
- this.aborted = onReceive(ignored -> {
- }).build();
-
- this.transacted = onReceive(task::compensate)
- .match(CompensationRecoveryMessage.class, message -> getContext().become(aborted))
- .build();
- }
-
- @Override
- public Receive createReceive() {
- return receiveBuilder()
- .match(TransactMessage.class,
- message -> onTransaction(message, () -> task.commit(request, responseOf(parentResponses))))
- .match(TransactionRecoveryMessage.class, this::onTransactRecovery)
- .match(AbortRecoveryMessage.class, this::onAbortRecovery)
- .match(AbortMessage.class, this::onAbort)
- .build();
- }
-
- private void onAbort(AbortMessage message) {
- log().debug("{}: received abort message of {}", request.id(), message.response());
- sendToChildrenButSender(message);
- sendToParentsButSender(message);
-
- getContext().become(aborted);
- }
-
- private void sendToParentsButSender(AbortMessage message) {
- context.parentsOf(request)
- .stream()
- .filter(this::isNotSender)
- .forEach(actor -> actor.tell(message, self()));
- }
-
- private void sendToChildrenButSender(AbortMessage message) {
- context.childrenOf(request)
- .stream()
- .filter(this::isNotSender)
- .forEach(actor -> actor.tell(message, self()));
- }
-
- private boolean isNotSender(ActorRef actor) {
- return !actor.equals(sender());
- }
-
- private void onTransactRecovery(TransactionRecoveryMessage message) {
- getContext().become(receiveBuilder()
- .match(TransactMessage.class, m -> onTransaction(m, message::response))
- .match(CompensationRecoveryMessage.class, m -> getContext().become(aborted))
- .build()
- );
- }
-
- private void onAbortRecovery(AbortRecoveryMessage message) {
- getContext().become(
- receiveBuilder()
- .match(TransactMessage.class, m -> onAbort(new AbortMessage(message.response())))
- .build());
- }
-
- private void onTransaction(TransactMessage message, Supplier<SagaResponse> responseSupplier) {
- log().debug("{}: received transaction message of {}", request.id(), message.request());
- if (context.parentsOf(request).contains(sender())) {
- parentResponses.add(message.response());
- }
-
- if (parentResponses.size() == context.parentsOf(request).size()) {
- transact(responseSupplier);
- }
- }
-
- private void transact(Supplier<SagaResponse> responseSupplier) {
- try {
- if (isChosenChild(parentResponses)) {
- SagaResponse sagaResponse = responseSupplier.get();
- sendToChildren(new TransactMessage(request, sagaResponse));
- getContext().become(transacted);
- } else {
- sendToChildren(new TransactMessage(request, SagaResponse.NONE_RESPONSE));
- getContext().become(aborted);
- }
- } catch (SagaStartFailedException e) {
- sendToParents(new FailMessage(e));
- } catch (Exception e) {
- log().error("Failed to run operation {} with error {}", request.transaction(), e);
-
- Message abortMessage = new AbortMessage(new TransactionFailedException(e));
- sendToParents(abortMessage);
- sendToChildren(abortMessage);
- getContext().become(aborted);
- }
- }
-
- private void sendToParents(Message message) {
- context.parentsOf(request).forEach(actor -> actor.tell(message, self()));
- }
-
- private void sendToChildren(Message message) {
- context.childrenOf(request).forEach(actor -> actor.tell(message, self()));
- }
-
- private boolean isChosenChild(List<SagaResponse> parentResponses) {
- return request.parents().length == 0 || parentResponses.isEmpty() || parentResponses.stream()
- .map(context::chosenChildren)
- .anyMatch(chosenChildren -> chosenChildren.isEmpty() || chosenChildren.contains(request.id()));
- }
-
- private SagaResponse responseOf(List<SagaResponse> responseContexts) {
- if (responseContexts.isEmpty()) {
- return SagaResponse.EMPTY_RESPONSE;
- }
-
- if (responseContexts.size() == 1) {
- return responseContexts.get(0);
- }
- return new CompositeSagaResponse(responseContexts);
- }
-
- private ReceiveBuilder onReceive(Consumer<SagaRequest> requestConsumer) {
- return receiveBuilder()
- .match(CompensateMessage.class, message -> onCompensate(message, requestConsumer));
- }
-
- private void onCompensate(CompensateMessage message, Consumer<SagaRequest> requestConsumer) {
- log().debug("{}: received compensation message from {}", request.id(), sender());
- compensatedChildren.add(sender());
-
- if (compensatedChildren.size() == context.childrenOf(request).size()) {
- requestConsumer.accept(request);
- sendToParents(message);
- }
- }
-}
diff --git a/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/RequestActorBuilder.java b/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/RequestActorBuilder.java
deleted file mode 100644
index 5004b4e..0000000
--- a/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/RequestActorBuilder.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.actors;
-
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.servicecomb.saga.core.NoOpSagaRequest;
-import org.apache.servicecomb.saga.core.SagaRequest;
-import org.apache.servicecomb.saga.core.SagaTask;
-import org.apache.servicecomb.saga.core.application.interpreter.FromJsonFormat;
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.actor.Props;
-
-public class RequestActorBuilder {
- private final ActorSystem actorSystem;
- private final FromJsonFormat<Set<String>> childrenExtractor;
-
- RequestActorBuilder(
- ActorSystem actorSystem,
- FromJsonFormat<Set<String>> childrenExtractor) {
-
- this.actorSystem = actorSystem;
- this.childrenExtractor = childrenExtractor;
- }
-
- public RequestActorContext build(SagaRequest[] requests, Map<String, SagaTask> tasks, ActorRef sagaActor) {
- RequestActorContext context = new RequestActorContext(childrenExtractor);
-
- ActorRef rootActor = rootActor(context, tasks);
- ActorRef leafActor = leafActor(context, tasks);
-
- createRequestActors(requests, tasks, context);
-
- linkActorsById(rootActor, requests, context);
- addLeafToChildless(leafActor, requests, context);
-
- context.addParent(NoOpSagaRequest.SAGA_START_REQUEST.id(), sagaActor);
- context.addChild(NoOpSagaRequest.SAGA_END_REQUEST.id(), sagaActor);
- return context;
- }
-
- private void linkActorsById(ActorRef rootActor, SagaRequest[] requests, RequestActorContext context) {
- for (SagaRequest request : requests) {
- if (isOrphan(request)) {
- context.addParent(request.id(), rootActor);
- context.addChild(NoOpSagaRequest.SAGA_START_REQUEST.id(), context.actorOf(request.id()));
- } else {
- for (String parent : request.parents()) {
- context.addParent(request.id(), context.actorOf(parent));
- context.addChild(parent, context.actorOf(request.id()));
- }
- }
- }
- }
-
- private boolean isOrphan(SagaRequest request) {
- return request.parents().length == 0;
- }
-
- private void createRequestActors(SagaRequest[] requests, Map<String, SagaTask> tasks, RequestActorContext context) {
- for (SagaRequest request : requests) {
- Props props = RequestActor.props(context, tasks.get(request.task()), request);
- context.addActor(request.id(), actorSystem.actorOf(props));
- }
- }
-
- private void addLeafToChildless(ActorRef leafActor, SagaRequest[] requests, RequestActorContext context) {
- for (SagaRequest request : requests) {
- if (context.childrenOf(request).isEmpty()) {
- context.addParent(NoOpSagaRequest.SAGA_END_REQUEST.id(), context.actorOf(request.id()));
- context.addChild(request.id(), leafActor);
- }
- }
- }
-
- private ActorRef rootActor(RequestActorContext context, Map<String, SagaTask> tasks) {
- Props root = RequestActor.props(context, tasks.get(
- NoOpSagaRequest.SAGA_START_REQUEST.task()), NoOpSagaRequest.SAGA_START_REQUEST);
- ActorRef actor = actorSystem.actorOf(root);
- context.addActor(NoOpSagaRequest.SAGA_START_REQUEST.id(), actor);
- return actor;
- }
-
- private ActorRef leafActor(RequestActorContext context, Map<String, SagaTask> tasks) {
- Props leaf = RequestActor.props(context, tasks.get(
- NoOpSagaRequest.SAGA_END_REQUEST.task()), NoOpSagaRequest.SAGA_END_REQUEST);
- ActorRef actor = actorSystem.actorOf(leaf);
- context.addActor(NoOpSagaRequest.SAGA_END_REQUEST.id(), actor);
- return actor;
- }
-}
diff --git a/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/RequestActorContext.java b/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/RequestActorContext.java
deleted file mode 100644
index 2e3149d..0000000
--- a/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/RequestActorContext.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.actors;
-
-import static java.util.Collections.emptyList;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Consumer;
-
-import org.apache.servicecomb.saga.core.SagaRequest;
-import org.apache.servicecomb.saga.core.SagaResponse;
-import org.apache.servicecomb.saga.core.application.interpreter.FromJsonFormat;
-import akka.actor.ActorRef;
-
-class RequestActorContext {
- private final Map<String, ActorRef> actors;
- private final Map<String, List<ActorRef>> parents;
- private final Map<String, List<ActorRef>> children;
- private final FromJsonFormat<Set<String>> childrenExtractor;
-
- RequestActorContext(
- FromJsonFormat<Set<String>> childrenExtractor) {
- this.actors = new HashMap<>();
- this.children = new HashMap<>();
- this.parents = new HashMap<>();
- this.childrenExtractor = childrenExtractor;
- }
-
- void addActor(String id, ActorRef actorRef) {
- actors.put(id, actorRef);
- }
-
- void addChild(String requestId, ActorRef ref) {
- children.computeIfAbsent(requestId, k -> new ArrayList<>()).add(ref);
- }
-
- void addParent(String requestId, ActorRef ref) {
- parents.computeIfAbsent(requestId, k -> new ArrayList<>()).add(ref);
- }
-
- ActorRef actorOf(String id) {
- return actors.get(id);
- }
-
- Collection<ActorRef> parentsOf(SagaRequest request) {
- return parents.getOrDefault(request.id(), emptyList());
- }
-
- Collection<ActorRef> childrenOf(SagaRequest request) {
- return children.getOrDefault(request.id(), emptyList());
- }
-
- void forAll(Consumer<ActorRef> consumer) {
- actors.values()
- .stream()
- .forEach(consumer);
- }
-
- Set<String> chosenChildren(SagaResponse response) {
- return childrenExtractor.fromJson(response.body());
- }
-}
diff --git a/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/messages/AbortMessage.java b/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/messages/AbortMessage.java
deleted file mode 100644
index f23a079..0000000
--- a/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/messages/AbortMessage.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.actors.messages;
-
-import org.apache.servicecomb.saga.core.FailedSagaResponse;
-import org.apache.servicecomb.saga.core.SagaResponse;
-
-public class AbortMessage implements Message {
- private final SagaResponse response;
-
- public AbortMessage(Throwable e) {
- response = new FailedSagaResponse(e);
- }
-
- public AbortMessage(SagaResponse response) {
- this.response = response;
- }
-
- public SagaResponse response() {
- return response;
- }
-}
diff --git a/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/messages/AbortRecoveryMessage.java b/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/messages/AbortRecoveryMessage.java
deleted file mode 100644
index 951157d..0000000
--- a/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/messages/AbortRecoveryMessage.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.actors.messages;
-
-import org.apache.servicecomb.saga.core.SagaResponse;
-
-public class AbortRecoveryMessage implements Message {
-
- private final SagaResponse response;
-
- public AbortRecoveryMessage(SagaResponse response) {
- this.response = response;
- }
-
- public SagaResponse response() {
- return response;
- }
-}
diff --git a/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/messages/CompensateMessage.java b/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/messages/CompensateMessage.java
deleted file mode 100644
index 5fd0701..0000000
--- a/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/messages/CompensateMessage.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.actors.messages;
-
-import org.apache.servicecomb.saga.core.SagaResponse;
-
-public class CompensateMessage implements Message {
- private final SagaResponse response;
-
- public CompensateMessage(SagaResponse response) {
- this.response = response;
- }
-
- public SagaResponse response() {
- return response;
- }
-}
diff --git a/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/messages/CompensationRecoveryMessage.java b/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/messages/CompensationRecoveryMessage.java
deleted file mode 100644
index 421a092..0000000
--- a/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/messages/CompensationRecoveryMessage.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.actors.messages;
-
-public class CompensationRecoveryMessage implements Message {
-
-}
diff --git a/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/messages/FailMessage.java b/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/messages/FailMessage.java
deleted file mode 100644
index 7a80ecb..0000000
--- a/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/messages/FailMessage.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.actors.messages;
-
-import org.apache.servicecomb.saga.core.FailedSagaResponse;
-import org.apache.servicecomb.saga.core.SagaResponse;
-
-public class FailMessage implements Message {
- private final SagaResponse response;
-
- public FailMessage(Throwable e) {
- response = new FailedSagaResponse(e);
- }
-
- public SagaResponse response() {
- return response;
- }
-}
diff --git a/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/messages/Message.java b/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/messages/Message.java
deleted file mode 100644
index 3ed8187..0000000
--- a/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/messages/Message.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.actors.messages;
-
-public interface Message {
-}
diff --git a/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/messages/TransactMessage.java b/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/messages/TransactMessage.java
deleted file mode 100644
index e78be8d..0000000
--- a/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/messages/TransactMessage.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.actors.messages;
-
-
-import org.apache.servicecomb.saga.core.SagaRequest;
-import org.apache.servicecomb.saga.core.SagaResponse;
-
-public class TransactMessage implements Message {
- private final SagaRequest request;
- private final SagaResponse response;
-
- public TransactMessage(SagaRequest request, SagaResponse response) {
- this.request = request;
- this.response = response;
- }
-
- public SagaRequest request() {
- return request;
- }
-
- public SagaResponse response() {
- return response;
- }
-}
diff --git a/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/messages/TransactionRecoveryMessage.java b/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/messages/TransactionRecoveryMessage.java
deleted file mode 100644
index 26ba05b..0000000
--- a/saga-core-akka/src/main/java/org/apache/servicecomb/saga/core/actors/messages/TransactionRecoveryMessage.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.actors.messages;
-
-import org.apache.servicecomb.saga.core.SagaResponse;
-
-public class TransactionRecoveryMessage implements Message {
- private final SagaResponse response;
-
- public TransactionRecoveryMessage(SagaResponse response) {
- this.response = response;
- }
-
- public SagaResponse response() {
- return response;
- }
-}
diff --git a/saga-core-akka/src/test/java/org/apache/servicecomb/saga/core/actors/ActorBasedSagaExecutionComponentTest.java b/saga-core-akka/src/test/java/org/apache/servicecomb/saga/core/actors/ActorBasedSagaExecutionComponentTest.java
deleted file mode 100644
index a5633db..0000000
--- a/saga-core-akka/src/test/java/org/apache/servicecomb/saga/core/actors/ActorBasedSagaExecutionComponentTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.actors;
-
-import org.apache.servicecomb.saga.core.PersistentStore;
-import org.apache.servicecomb.saga.core.SagaExecutionComponentTestBase;
-import org.apache.servicecomb.saga.core.application.SagaFactory;
-
-
-public class ActorBasedSagaExecutionComponentTest extends SagaExecutionComponentTestBase {
-
- @Override
- protected SagaFactory sagaFactory(PersistentStore eventStore) {
- return new ActorBasedSagaFactory(500, eventStore, null);
- }
-}
diff --git a/saga-core-akka/src/test/java/org/apache/servicecomb/saga/core/actors/ActorBasedSagaIntegrationTest.java b/saga-core-akka/src/test/java/org/apache/servicecomb/saga/core/actors/ActorBasedSagaIntegrationTest.java
deleted file mode 100644
index de62cf2..0000000
--- a/saga-core-akka/src/test/java/org/apache/servicecomb/saga/core/actors/ActorBasedSagaIntegrationTest.java
+++ /dev/null
@@ -1,692 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.actors;
-
-import static org.apache.servicecomb.saga.core.Transaction.SAGA_END_TRANSACTION;
-import static org.apache.servicecomb.saga.core.Transaction.SAGA_START_TRANSACTION;
-import static java.util.Arrays.asList;
-import static java.util.Collections.emptySet;
-import static java.util.Collections.singletonList;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.hamcrest.CoreMatchers.anyOf;
-import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.CyclicBarrier;
-
-import org.apache.servicecomb.saga.core.BackwardRecovery;
-import org.apache.servicecomb.saga.core.Compensation;
-import org.apache.servicecomb.saga.core.EventEnvelope;
-import org.apache.servicecomb.saga.core.EventStore;
-import org.apache.servicecomb.saga.core.Fallback;
-import org.apache.servicecomb.saga.core.ForwardRecovery;
-import org.apache.servicecomb.saga.core.IdGenerator;
-import org.apache.servicecomb.saga.core.LongIdGenerator;
-import org.apache.servicecomb.saga.core.NoOpSagaRequest;
-import org.apache.servicecomb.saga.core.Operation;
-import org.apache.servicecomb.saga.core.PersistentStore;
-import org.apache.servicecomb.saga.core.Saga;
-import org.apache.servicecomb.saga.core.SagaDefinition;
-import org.apache.servicecomb.saga.core.SagaEndedEvent;
-import org.apache.servicecomb.saga.core.SagaEvent;
-import org.apache.servicecomb.saga.core.SagaEventMatcher;
-import org.apache.servicecomb.saga.core.SagaRequest;
-import org.apache.servicecomb.saga.core.SagaRequestImpl;
-import org.apache.servicecomb.saga.core.SagaResponse;
-import org.apache.servicecomb.saga.core.SagaStartedEvent;
-import org.apache.servicecomb.saga.core.SuccessfulSagaResponse;
-import org.apache.servicecomb.saga.core.Transaction;
-import org.apache.servicecomb.saga.core.TransactionAbortedEvent;
-import org.apache.servicecomb.saga.core.TransactionCompensatedEvent;
-import org.apache.servicecomb.saga.core.TransactionEndedEvent;
-import org.apache.servicecomb.saga.core.TransactionStartedEvent;
-import org.apache.servicecomb.saga.core.application.SagaFactory;
-import org.hamcrest.CoreMatchers;
-import org.hamcrest.collection.IsIterableContainingInOrder;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.mockito.stubbing.Answer;
-
-import com.seanyinx.github.unit.scaffolding.Randomness;
-
-import org.apache.servicecomb.saga.core.application.interpreter.FromJsonFormat;
-import org.apache.servicecomb.saga.infrastructure.EmbeddedEventStore;
-
-@SuppressWarnings("unchecked")
-public class ActorBasedSagaIntegrationTest {
- private static final String sagaId = Randomness.uniquify("sagaId");
-
- private final FromJsonFormat<Set<String>> childrenExtractor = mock(FromJsonFormat.class);
- private final IdGenerator<Long> idGenerator = new LongIdGenerator();
- private final EventStore eventStore = new EmbeddedEventStore();
-
- private final PersistentStore persistentStore = mock(PersistentStore.class);
- private final SagaDefinition sagaDefinition = mock(SagaDefinition.class);
-
- private final Transaction transaction1 = mock(Transaction.class, "transaction1");
- private final Transaction transaction2 = mock(Transaction.class, "transaction2");
- private final Transaction transaction3 = mock(Transaction.class, "transaction3");
- private final Transaction transaction4 = mock(Transaction.class, "transaction4");
-
- private final Compensation compensation1 = mock(Compensation.class, "compensation1");
- private final Compensation compensation2 = mock(Compensation.class, "compensation2");
- private final Compensation compensation3 = mock(Compensation.class, "compensation3");
- private final Compensation compensation4 = mock(Compensation.class, "compensation4");
-
- private final Fallback fallback1 = mock(Fallback.class, "fallback1");
-
- private final String requestJson = "{}";
- private final SagaRequest request1 = request("request1", "service1", transaction1, compensation1, fallback1);
- private final SagaRequest request2 = request("request2", "service2", transaction2, compensation2, request1.id());
- private final SagaRequest request3 = request("request3", "service3", transaction3, compensation3, request1.id());
- private final SagaRequest request4 = request("request4", "service4", transaction4, compensation4, request3.id());
-
- private final SagaResponse transactionResponse1 = new SuccessfulSagaResponse("transaction1");
- private final SagaResponse transactionResponse2 = new SuccessfulSagaResponse("transaction2");
- private final SagaResponse transactionResponse3 = new SuccessfulSagaResponse("transaction3");
- private final SagaResponse compensationResponse1 = new SuccessfulSagaResponse("compensation1");
- private final SagaResponse compensationResponse2 = new SuccessfulSagaResponse("compensation2");
- private final SagaResponse compensationResponse3 = new SuccessfulSagaResponse("compensation3");
-
- @SuppressWarnings("ThrowableInstanceNeverThrown")
- private final RuntimeException exception = new RuntimeException("oops");
-
- private Saga saga;
- private final SagaFactory sagaFactory = new ActorBasedSagaFactory(100, persistentStore, childrenExtractor);
-
- // root - node1 - node2 - leaf
- @Before
- public void setUp() throws Exception {
- when(sagaDefinition.policy()).thenReturn(new BackwardRecovery());
- when(sagaDefinition.requests()).thenReturn(new SagaRequest[]{request1, request2});
-
- when(childrenExtractor.fromJson(anyString())).thenReturn(emptySet());
- when(childrenExtractor.fromJson(SagaResponse.NONE_RESPONSE.body())).thenReturn(setOf("none"));
-
- when(transaction1.send(request1.serviceName(), SagaResponse.EMPTY_RESPONSE)).thenReturn(transactionResponse1);
- when(transaction2.send(request2.serviceName(), transactionResponse1)).thenReturn(transactionResponse2);
- when(transaction3.send(request3.serviceName(), transactionResponse1)).thenReturn(transactionResponse3);
-
- when(compensation1.send(request1.serviceName(), compensationResponse2)).thenReturn(compensationResponse1);
- when(compensation2.send(request2.serviceName(), compensationResponse3)).thenReturn(compensationResponse2);
- when(compensation3.send(request3.serviceName(), SagaResponse.EMPTY_RESPONSE)).thenReturn(compensationResponse3);
- }
-
- @After
- public void tearDown() throws Exception {
- sagaFactory.terminate();
- assertTrue(sagaFactory.isTerminated());
- }
-
- @Test
- public void transactionsAreRunSuccessfully() {
- saga = sagaFactory.createSaga(requestJson, sagaId, eventStore, sagaDefinition);
- saga.run();
-
- assertThat(eventStore, IsIterableContainingInOrder.contains(
- SagaEventMatcher.eventWith(sagaId, SAGA_START_TRANSACTION, SagaStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction1, TransactionStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction1, TransactionEndedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction2, TransactionStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction2, TransactionEndedEvent.class),
- SagaEventMatcher.eventWith(sagaId, SAGA_END_TRANSACTION, SagaEndedEvent.class)
- ));
-
- verify(transaction1).send(request1.serviceName(), SagaResponse.EMPTY_RESPONSE);
- verify(transaction2).send(request2.serviceName(), transactionResponse1);
-
- verify(compensation1, never()).send(request1.serviceName());
- verify(compensation2, never()).send(request2.serviceName());
- }
-
- // root - node1 - node2 - leaf
- // \_ node3 _/
- @Test
- public void compensateCommittedTransactionsOnFailure() {
- when(sagaDefinition.requests()).thenReturn(new SagaRequest[]{request1, request2, request3});
- saga = sagaFactory.createSaga(requestJson, sagaId, eventStore, sagaDefinition);
-
- // barrier to make sure the two transactions starts at the same time
- CyclicBarrier barrier = new CyclicBarrier(2);
- when(transaction2.send(request2.serviceName(), transactionResponse1))
- .thenAnswer(
- withAnswer(() -> {
- barrier.await();
- Thread.sleep(100);
- throw exception;
- }));
-
- when(transaction3.send(request3.serviceName(), transactionResponse1))
- .thenAnswer(
- withAnswer(() -> {
- barrier.await();
- return transactionResponse3;
- }));
-
- saga.run();
-
- assertThat(eventStore, IsIterableContainingInOrder.contains(
- SagaEventMatcher.eventWith(sagaId, SAGA_START_TRANSACTION, SagaStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction1, TransactionStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction1, TransactionEndedEvent.class),
- CoreMatchers.anyOf(SagaEventMatcher.eventWith(sagaId, transaction2, TransactionStartedEvent.class), SagaEventMatcher
- .eventWith(sagaId, transaction3, TransactionStartedEvent.class)),
- CoreMatchers.anyOf(SagaEventMatcher.eventWith(sagaId, transaction2, TransactionStartedEvent.class), SagaEventMatcher
- .eventWith(sagaId, transaction3, TransactionStartedEvent.class)),
- SagaEventMatcher.eventWith(sagaId, transaction3, TransactionEndedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction2, TransactionAbortedEvent.class),
- SagaEventMatcher.eventWith(sagaId, compensation3, TransactionCompensatedEvent.class),
- SagaEventMatcher.eventWith(sagaId, compensation1, TransactionCompensatedEvent.class),
- SagaEventMatcher.eventWith(sagaId, Compensation.SAGA_START_COMPENSATION, SagaEndedEvent.class)));
-
- verify(transaction1).send(request1.serviceName(), SagaResponse.EMPTY_RESPONSE);
- verify(transaction2).send(request2.serviceName(), transactionResponse1);
- verify(transaction3).send(request3.serviceName(), transactionResponse1);
-
- verify(compensation1).send(request1.serviceName());
- verify(compensation2, never()).send(request2.serviceName());
- verify(compensation3).send(request3.serviceName());
- }
-
- @Test
- public void skipIgnoredTransaction() throws Exception {
- when(sagaDefinition.requests()).thenReturn(new SagaRequest[]{request1, request2, request3});
- saga = sagaFactory.createSaga(requestJson, sagaId, eventStore, sagaDefinition);
-
- when(childrenExtractor.fromJson(transactionResponse1.body())).thenReturn(setOf(request3.id()));
-
- saga.run();
-
- assertThat(eventStore, IsIterableContainingInOrder.contains(
- SagaEventMatcher.eventWith(sagaId, SAGA_START_TRANSACTION, SagaStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction1, TransactionStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction1, TransactionEndedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction3, TransactionStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction3, TransactionEndedEvent.class),
- SagaEventMatcher.eventWith(sagaId, SAGA_END_TRANSACTION, SagaEndedEvent.class)
- ));
-
- verify(transaction1).send(request1.serviceName(), SagaResponse.EMPTY_RESPONSE);
- verify(transaction3).send(request3.serviceName(), transactionResponse1);
- verify(transaction2, never()).send(anyString(), any(SagaResponse.class));
-
- verify(compensation1, never()).send(request1.serviceName());
- verify(compensation2, never()).send(request2.serviceName());
- verify(compensation3, never()).send(request3.serviceName());
- }
-
- @Test
- public void skipAllIgnoredTransactions() throws Exception {
- when(sagaDefinition.requests()).thenReturn(new SagaRequest[]{request1, request2, request3, request4});
- saga = sagaFactory.createSaga(requestJson, sagaId, eventStore, sagaDefinition);
-
- when(childrenExtractor.fromJson(transactionResponse1.body())).thenReturn(setOf("none"));
-
- saga.run();
-
- assertThat(eventStore, IsIterableContainingInOrder.contains(
- SagaEventMatcher.eventWith(sagaId, SAGA_START_TRANSACTION, SagaStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction1, TransactionStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction1, TransactionEndedEvent.class),
- SagaEventMatcher.eventWith(sagaId, SAGA_END_TRANSACTION, SagaEndedEvent.class)
- ));
-
- verify(transaction1).send(request1.serviceName(), SagaResponse.EMPTY_RESPONSE);
- verify(transaction2, never()).send(anyString(), any(SagaResponse.class));
- verify(transaction3, never()).send(anyString(), any(SagaResponse.class));
- verify(transaction4, never()).send(anyString(), any(SagaResponse.class));
-
- verify(compensation1, never()).send(request1.serviceName());
- verify(compensation2, never()).send(request2.serviceName());
- verify(compensation3, never()).send(request3.serviceName());
- verify(compensation4, never()).send(request4.serviceName());
- }
-
- @Test
- public void doNotCompensateIgnoredTransactions() throws Exception {
- when(sagaDefinition.requests()).thenReturn(new SagaRequest[]{request1, request2, request3, request4});
- saga = sagaFactory.createSaga(requestJson, sagaId, eventStore, sagaDefinition);
-
- when(childrenExtractor.fromJson(transactionResponse1.body())).thenReturn(setOf(request3.id()));
-
- when(transaction4.send(request4.serviceName(), transactionResponse3)).thenThrow(exception);
-
- saga.run();
-
- assertThat(eventStore, IsIterableContainingInOrder.contains(
- SagaEventMatcher.eventWith(sagaId, SAGA_START_TRANSACTION, SagaStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction1, TransactionStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction1, TransactionEndedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction3, TransactionStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction3, TransactionEndedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction4, TransactionStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction4, TransactionAbortedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction3, TransactionCompensatedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction1, TransactionCompensatedEvent.class),
- SagaEventMatcher.eventWith(sagaId, Compensation.SAGA_START_COMPENSATION, SagaEndedEvent.class)
- ));
-
- verify(transaction1).send(request1.serviceName(), SagaResponse.EMPTY_RESPONSE);
- verify(transaction3).send(request3.serviceName(), transactionResponse1);
- verify(transaction4).send(request4.serviceName(), transactionResponse3);
- verify(transaction2, never()).send(anyString(), any(SagaResponse.class));
-
- verify(compensation1).send(request1.serviceName());
- verify(compensation3).send(request3.serviceName());
- verify(compensation2, never()).send(request2.serviceName());
- verify(compensation4, never()).send(request4.serviceName());
- }
-
- // TODO: 2017/10/31 actor will hang and its parent and children will be blocked without its response, timeout must be applied
- @Ignore
- // root - node1 - node2 - leaf
- // \_ node3 _/
- @Test
- public void redoHangingTransactionsOnFailure() throws InterruptedException {
- when(sagaDefinition.requests()).thenReturn(new SagaRequest[]{request1, request2, request3});
- saga = sagaFactory.createSaga(requestJson, sagaId, eventStore, sagaDefinition);
-
- // barrier to make sure the two transactions starts at the same time
- CyclicBarrier barrier = new CyclicBarrier(2);
- when(transaction3.send(request3.serviceName(), transactionResponse1))
- .thenAnswer(withAnswer(() -> {
- barrier.await();
- throw exception;
- }));
-
- CountDownLatch latch = new CountDownLatch(1);
-
- when(transaction2.send(request2.serviceName(), transactionResponse1))
- .thenAnswer(withAnswer(() -> {
- barrier.await();
- latch.await(1, SECONDS);
- return transactionResponse2;
- })).thenReturn(transactionResponse2);
-
- saga.run();
-
- // the ordering of events may not be consistence due to concurrent processing of requests
- assertThat(eventStore, IsIterableContainingInOrder.contains(
- SagaEventMatcher.eventWith(sagaId, SAGA_START_TRANSACTION, SagaStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction1, TransactionStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction1, TransactionEndedEvent.class),
- CoreMatchers.anyOf(
- SagaEventMatcher.eventWith(sagaId, transaction2, TransactionStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction3, TransactionStartedEvent.class)),
- CoreMatchers.anyOf(
- SagaEventMatcher.eventWith(sagaId, transaction3, TransactionStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction2, TransactionStartedEvent.class)),
- SagaEventMatcher.eventWith(sagaId, transaction3, TransactionAbortedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction2, TransactionStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction2, TransactionEndedEvent.class),
- SagaEventMatcher.eventWith(sagaId, compensation2, TransactionCompensatedEvent.class),
- SagaEventMatcher.eventWith(sagaId, compensation1, TransactionCompensatedEvent.class),
- SagaEventMatcher.eventWith(sagaId, Compensation.SAGA_START_COMPENSATION, SagaEndedEvent.class)));
-
- verify(transaction1).send(request1.serviceName(), SagaResponse.EMPTY_RESPONSE);
- verify(transaction2, times(2)).send(request2.serviceName(), transactionResponse1);
- verify(transaction3).send(request3.serviceName(), transactionResponse1);
-
- verify(compensation1).send(request1.serviceName());
- verify(compensation2).send(request2.serviceName());
- verify(compensation3, never()).send(request3.serviceName());
-
- latch.countDown();
- }
-
- @Test
- public void retriesFailedTransactionTillSuccess() {
- when(sagaDefinition.policy()).thenReturn(new ForwardRecovery());
- saga = sagaFactory.createSaga(requestJson, sagaId, eventStore, sagaDefinition);
-
- when(transaction2.send(request2.serviceName(), transactionResponse1))
- .thenThrow(exception).thenThrow(exception).thenReturn(transactionResponse2);
- when(transaction2.retries()).thenReturn(-1);
-
- saga.run();
-
- assertThat(eventStore, IsIterableContainingInOrder.contains(
- SagaEventMatcher.eventWith(sagaId, SAGA_START_TRANSACTION, SagaStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction1, TransactionStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction1, TransactionEndedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction2, TransactionStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction2, TransactionEndedEvent.class),
- SagaEventMatcher.eventWith(sagaId, SAGA_END_TRANSACTION, SagaEndedEvent.class)
- ));
-
- verify(transaction1).send(request1.serviceName(), SagaResponse.EMPTY_RESPONSE);
- verify(transaction2, times(3)).send(request2.serviceName(), transactionResponse1);
-
- verify(compensation1, never()).send(anyString(), any(SagaResponse.class));
- verify(compensation2, never()).send(anyString(), any(SagaResponse.class));
- }
-
- @Test
- public void fallbackWhenCompensationFailed() {
- int retries = 3;
- saga = sagaFactory.createSaga(requestJson, sagaId, eventStore, sagaDefinition);
-
- when(transaction2.send(request2.serviceName(), transactionResponse1)).thenThrow(exception);
- when(compensation1.send(request1.serviceName())).thenThrow(exception);
- when(compensation1.retries()).thenReturn(retries);
-
- saga.run();
-
- verify(transaction1).send(request1.serviceName(), SagaResponse.EMPTY_RESPONSE);
- verify(transaction2).send(request2.serviceName(), transactionResponse1);
-
- verify(compensation1, times(retries + 1)).send(request1.serviceName());
- verify(compensation2, never()).send(request2.serviceName());
-
- verify(fallback1).send(request1.serviceName());
- }
-
- @Test
- public void restoresSagaToTransactionStateByPlayingAllEvents() {
- when(sagaDefinition.requests()).thenReturn(new SagaRequest[]{request1, request2, request3});
- saga = sagaFactory.createSaga(requestJson, sagaId, eventStore, sagaDefinition);
-
- Iterable<EventEnvelope> events = asList(
- envelope(new SagaStartedEvent(sagaId, requestJson, NoOpSagaRequest.SAGA_START_REQUEST)),
- envelope(new TransactionStartedEvent(sagaId, request1)),
- envelope(new TransactionEndedEvent(sagaId, request1, transactionResponse1)),
- envelope(new TransactionStartedEvent(sagaId, request2)),
- envelope(new TransactionEndedEvent(sagaId, request2, transactionResponse2))
- );
-
- eventStore.populate(events);
- saga.play();
-
- saga.run();
- assertThat(eventStore, IsIterableContainingInOrder.contains(
- SagaEventMatcher.eventWith(sagaId, SAGA_START_TRANSACTION, SagaStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction1, TransactionStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction1, TransactionEndedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction2, TransactionStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction2, TransactionEndedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction3, TransactionStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction3, TransactionEndedEvent.class),
- SagaEventMatcher.eventWith(sagaId, SAGA_END_TRANSACTION, SagaEndedEvent.class)
- ));
-
- verify(transaction1, never()).send(anyString(), any(SagaResponse.class));
- verify(transaction2, never()).send(anyString(), any(SagaResponse.class));
- verify(transaction3).send(request3.serviceName(), transactionResponse1);
-
- verify(compensation1, never()).send(request1.serviceName());
- verify(compensation2, never()).send(request2.serviceName());
- verify(compensation3, never()).send(request3.serviceName());
- }
-
- @Test
- public void restoresPartialTransactionByPlayingAllEvents() {
- when(sagaDefinition.requests()).thenReturn(new SagaRequest[]{request1, request2, request3});
- saga = sagaFactory.createSaga(requestJson, sagaId, eventStore, sagaDefinition);
-
- Iterable<EventEnvelope> events = asList(
- envelope(new SagaStartedEvent(sagaId, requestJson, NoOpSagaRequest.SAGA_START_REQUEST)),
- envelope(new TransactionStartedEvent(sagaId, request1)),
- envelope(new TransactionEndedEvent(sagaId, request1, transactionResponse1)),
- envelope(new TransactionStartedEvent(sagaId, request2)),
- envelope(new TransactionEndedEvent(sagaId, request2, transactionResponse2)),
- envelope(new TransactionStartedEvent(sagaId, request3))
- );
-
- eventStore.populate(events);
- saga.play();
-
- saga.run();
- assertThat(eventStore, IsIterableContainingInOrder.contains(
- SagaEventMatcher.eventWith(sagaId, SAGA_START_TRANSACTION, SagaStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction1, TransactionStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction1, TransactionEndedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction2, TransactionStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction2, TransactionEndedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction3, TransactionStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction3, TransactionStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction3, TransactionEndedEvent.class),
- SagaEventMatcher.eventWith(sagaId, SAGA_END_TRANSACTION, SagaEndedEvent.class)
- ));
-
- verify(transaction1, never()).send(anyString(), any(SagaResponse.class));
- verify(transaction2, never()).send(anyString(), any(SagaResponse.class));
- verify(transaction3).send(request3.serviceName(), transactionResponse1);
-
- verify(compensation1, never()).send(request1.serviceName());
- verify(compensation2, never()).send(request2.serviceName());
- verify(compensation3, never()).send(request3.serviceName());
- }
-
- @Test
- public void restoresToCompensationFromAbortedTransactionByPlayingAllEvents() {
- when(sagaDefinition.requests()).thenReturn(new SagaRequest[]{request1, request2, request3});
- saga = sagaFactory.createSaga(requestJson, sagaId, eventStore, sagaDefinition);
-
- Iterable<EventEnvelope> events = asList(
- envelope(new SagaStartedEvent(sagaId, requestJson, NoOpSagaRequest.SAGA_START_REQUEST)),
- envelope(new TransactionStartedEvent(sagaId, request1)),
- envelope(new TransactionEndedEvent(sagaId, request1)),
- envelope(new TransactionStartedEvent(sagaId, request2)),
- envelope(new TransactionEndedEvent(sagaId, request2)),
- envelope(new TransactionStartedEvent(sagaId, request3)),
- envelope(new TransactionAbortedEvent(sagaId, request3, exception))
- );
-
- eventStore.populate(events);
- saga.play();
-
- saga.run();
- assertThat(eventStore, IsIterableContainingInOrder.contains(
- SagaEventMatcher.eventWith(sagaId, SAGA_START_TRANSACTION, SagaStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction1, TransactionStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction1, TransactionEndedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction2, TransactionStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction2, TransactionEndedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction3, TransactionStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction3, TransactionAbortedEvent.class),
- SagaEventMatcher.eventWith(sagaId, compensation2, TransactionCompensatedEvent.class),
- SagaEventMatcher.eventWith(sagaId, compensation1, TransactionCompensatedEvent.class),
- SagaEventMatcher.eventWith(sagaId, Compensation.SAGA_START_COMPENSATION, SagaEndedEvent.class)
- ));
-
- verify(transaction1, never()).send(anyString(), any(SagaResponse.class));
- verify(transaction2, never()).send(anyString(), any(SagaResponse.class));
- verify(transaction3, never()).send(anyString(), any(SagaResponse.class));
-
- verify(compensation1).send(request1.serviceName());
- verify(compensation2).send(request2.serviceName());
- verify(compensation3, never()).send(request3.serviceName());
- }
-
- @Test
- public void restoresSagaToCompensationStateByPlayingAllEvents() {
- when(sagaDefinition.requests()).thenReturn(new SagaRequest[]{request1, request2, request3});
- saga = sagaFactory.createSaga(requestJson, sagaId, eventStore, sagaDefinition);
-
- Iterable<EventEnvelope> events = asList(
- envelope(new SagaStartedEvent(sagaId, requestJson, NoOpSagaRequest.SAGA_START_REQUEST)),
- envelope(new TransactionStartedEvent(sagaId, request1)),
- envelope(new TransactionEndedEvent(sagaId, request1)),
- envelope(new TransactionStartedEvent(sagaId, request2)),
- envelope(new TransactionEndedEvent(sagaId, request2)),
- envelope(new TransactionStartedEvent(sagaId, request3)),
- envelope(new TransactionAbortedEvent(sagaId, request3, exception)),
- envelope(new TransactionCompensatedEvent(sagaId, request2))
- );
-
- eventStore.populate(events);
- saga.play();
-
- saga.run();
- assertThat(eventStore, IsIterableContainingInOrder.contains(
- SagaEventMatcher.eventWith(sagaId, SAGA_START_TRANSACTION, SagaStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction1, TransactionStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction1, TransactionEndedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction2, TransactionStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction2, TransactionEndedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction3, TransactionStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction3, TransactionAbortedEvent.class),
- SagaEventMatcher.eventWith(sagaId, compensation2, TransactionCompensatedEvent.class),
- SagaEventMatcher.eventWith(sagaId, compensation1, TransactionCompensatedEvent.class),
- SagaEventMatcher.eventWith(sagaId, Compensation.SAGA_START_COMPENSATION, SagaEndedEvent.class)
- ));
-
- verify(transaction1, never()).send(anyString(), any(SagaResponse.class));
- verify(transaction2, never()).send(anyString(), any(SagaResponse.class));
- verify(transaction3, never()).send(anyString(), any(SagaResponse.class));
-
- verify(compensation1).send(request1.serviceName());
- verify(compensation2, never()).send(request2.serviceName());
- verify(compensation3, never()).send(request3.serviceName());
- }
-
- @Test
- public void restoresPartialCompensationByPlayingAllEvents() {
- when(sagaDefinition.requests()).thenReturn(new SagaRequest[]{request1, request2, request3});
- saga = sagaFactory.createSaga(requestJson, sagaId, eventStore, sagaDefinition);
-
- Iterable<EventEnvelope> events = asList(
- envelope(new SagaStartedEvent(sagaId, requestJson, NoOpSagaRequest.SAGA_START_REQUEST)),
- envelope(new TransactionStartedEvent(sagaId, request1)),
- envelope(new TransactionEndedEvent(sagaId, request1)),
- envelope(new TransactionStartedEvent(sagaId, request2)),
- envelope(new TransactionEndedEvent(sagaId, request2)),
- envelope(new TransactionStartedEvent(sagaId, request3)),
- envelope(new TransactionAbortedEvent(sagaId, request3, exception)),
- envelope(new TransactionCompensatedEvent(sagaId, request2))
- );
-
- eventStore.populate(events);
- saga.play();
-
- saga.run();
- assertThat(eventStore, IsIterableContainingInOrder.contains(
- SagaEventMatcher.eventWith(sagaId, SAGA_START_TRANSACTION, SagaStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction1, TransactionStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction1, TransactionEndedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction2, TransactionStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction2, TransactionEndedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction3, TransactionStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction3, TransactionAbortedEvent.class),
- SagaEventMatcher.eventWith(sagaId, compensation2, TransactionCompensatedEvent.class),
- SagaEventMatcher.eventWith(sagaId, compensation1, TransactionCompensatedEvent.class),
- SagaEventMatcher.eventWith(sagaId, Compensation.SAGA_START_COMPENSATION, SagaEndedEvent.class)
- ));
-
- verify(transaction1, never()).send(anyString(), any(SagaResponse.class));
- verify(transaction2, never()).send(anyString(), any(SagaResponse.class));
- verify(transaction3, never()).send(anyString(), any(SagaResponse.class));
-
- verify(compensation1).send(request1.serviceName());
- verify(compensation2, never()).send(request2.serviceName());
- verify(compensation3, never()).send(request3.serviceName());
- }
-
- @Test
- public void restoresSagaToEndStateByPlayingAllEvents() {
- saga = sagaFactory.createSaga(requestJson, sagaId, eventStore, sagaDefinition);
- Iterable<EventEnvelope> events = asList(
- envelope(new SagaStartedEvent(sagaId, requestJson, NoOpSagaRequest.SAGA_START_REQUEST)),
- envelope(new TransactionStartedEvent(sagaId, request1)),
- envelope(new TransactionEndedEvent(sagaId, request1)),
- envelope(new TransactionStartedEvent(sagaId, request2)),
- envelope(new TransactionEndedEvent(sagaId, request2))
- );
-
- eventStore.populate(events);
- saga.play();
-
- saga.run();
- assertThat(eventStore, IsIterableContainingInOrder.contains(
- SagaEventMatcher.eventWith(sagaId, SAGA_START_TRANSACTION, SagaStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction1, TransactionStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction1, TransactionEndedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction2, TransactionStartedEvent.class),
- SagaEventMatcher.eventWith(sagaId, transaction2, TransactionEndedEvent.class),
- SagaEventMatcher.eventWith(sagaId, SAGA_END_TRANSACTION, SagaEndedEvent.class)
- ));
-
- verify(transaction1, never()).send(anyString(), any(SagaResponse.class));
- verify(transaction2, never()).send(anyString(), any(SagaResponse.class));
-
- verify(compensation1, never()).send(request1.serviceName());
- verify(compensation2, never()).send(request2.serviceName());
- }
-
- @Test
- public void failFastIfSagaLogIsDown() throws Exception {
- EventStore sagaLog = mock(EventStore.class);
- saga = sagaFactory.createSaga(requestJson, sagaId, sagaLog, sagaDefinition);
-
- doThrow(RuntimeException.class).when(sagaLog).offer(any(SagaStartedEvent.class));
-
- saga.run();
-
- verify(sagaLog).offer(any(SagaStartedEvent.class));
- verify(transaction1, never()).send(anyString(), any(SagaResponse.class));
- verify(transaction2, never()).send(anyString(), any(SagaResponse.class));
-
- verify(compensation1, never()).send(request1.serviceName());
- verify(compensation2, never()).send(request2.serviceName());
- }
-
- private Answer<SagaResponse> withAnswer(Callable<SagaResponse> callable) {
- return invocationOnMock -> callable.call();
- }
-
- private EventEnvelope envelope(SagaEvent event) {
- return new EventEnvelope(idGenerator.nextId(), event);
- }
-
- private SagaRequest request(String requestId,
- String serviceName,
- Transaction transaction,
- Compensation compensation,
- String... parentIds) {
-
- return new SagaRequestImpl(requestId, serviceName, Operation.TYPE_REST, transaction, compensation, parentIds);
- }
-
- private SagaRequest request(String requestId,
- String serviceName,
- Transaction transaction,
- Compensation compensation,
- Fallback fallback) {
-
- return new SagaRequestImpl(requestId, serviceName, Operation.TYPE_REST, transaction, compensation, fallback);
- }
-
- private HashSet<String> setOf(String requestId) {
- return new HashSet<>(singletonList(requestId));
- }
-}
diff --git a/saga-core-akka/src/test/java/org/apache/servicecomb/saga/core/actors/CompletionCallbackActorTest.java b/saga-core-akka/src/test/java/org/apache/servicecomb/saga/core/actors/CompletionCallbackActorTest.java
deleted file mode 100644
index 7057de4..0000000
--- a/saga-core-akka/src/test/java/org/apache/servicecomb/saga/core/actors/CompletionCallbackActorTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.actors;
-
-import static akka.actor.ActorRef.noSender;
-import static akka.actor.Props.empty;
-import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
-import static java.time.temporal.ChronoUnit.SECONDS;
-import static org.awaitility.Awaitility.await;
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsInstanceOf.instanceOf;
-import static org.junit.Assert.assertThat;
-
-import java.time.Duration;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.servicecomb.saga.core.FailedSagaResponse;
-import org.apache.servicecomb.saga.core.NoOpSagaRequest;
-import org.apache.servicecomb.saga.core.SagaResponse;
-import org.apache.servicecomb.saga.core.actors.messages.AbortMessage;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-
-import org.apache.servicecomb.saga.core.actors.messages.CompensateMessage;
-import org.apache.servicecomb.saga.core.actors.messages.FailMessage;
-import org.apache.servicecomb.saga.core.actors.messages.TransactMessage;
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.testkit.javadsl.TestKit;
-
-public class CompletionCallbackActorTest {
- private static final ActorSystem actorSystem = ActorSystem.create();
-
- private final SagaResponse response = Mockito.mock(SagaResponse.class);
- private final RequestActorContext context = new RequestActorContext(null);
-
- private final ActorRef actor1 = someActor();
- private final ActorRef actor2 = someActor();
-
- @Before
- public void setUp() throws Exception {
- context.addActor(uniquify("requestId"), actor1);
- context.addActor(uniquify("requestId"), actor2);
- }
-
- @AfterClass
- public static void tearDown() throws Exception {
- TestKit.shutdownActorSystem(actorSystem);
- }
-
- @Test
- public void killAllOnTransactionComplete() throws Exception {
- new TestKit(actorSystem) {{
- CompletableFuture<SagaResponse> future = new CompletableFuture<>();
-
- ActorRef actor = actorSystem.actorOf(CompletionCallbackActor.props(future));
-
- actor.tell(context, noSender());
- actor.tell(new TransactMessage(null, response), noSender());
-
- await().atMost(2, TimeUnit.SECONDS)
- .until(() -> actor1.isTerminated() && actor2.isTerminated() && actor.isTerminated());
-
- assertThat(future.get(), is(response));
- }};
- }
-
- @Test
- public void killAllOnCompensationComplete() throws Exception {
- new TestKit(actorSystem) {{
- CompletableFuture<SagaResponse> future = new CompletableFuture<>();
-
- ActorRef actor = actorSystem.actorOf(CompletionCallbackActor.props(future));
-
- actor.tell(context, noSender());
- actor.tell(new CompensateMessage(response), noSender());
-
- await().atMost(2, TimeUnit.SECONDS)
- .until(() -> actor1.isTerminated() && actor2.isTerminated() && actor.isTerminated());
-
- assertThat(future.get(), is(response));
- }};
- }
-
- @Test
- public void killAllOnFailure() throws Exception {
- new TestKit(actorSystem) {{
- CompletableFuture<SagaResponse> future = new CompletableFuture<>();
-
- ActorRef actor = actorSystem.actorOf(CompletionCallbackActor.props(future));
-
- actor.tell(context, noSender());
- actor.tell(new FailMessage(new RuntimeException("oops")), noSender());
-
- await().atMost(2, TimeUnit.SECONDS)
- .until(() -> actor1.isTerminated() && actor2.isTerminated() && actor.isTerminated());
-
- assertThat(future.get(), is(instanceOf(FailedSagaResponse.class)));
- }};
- }
-
- @Test
- public void tellLeafToCompensateOnAbort() throws Exception {
- new TestKit(actorSystem) {{
- context.addActor(NoOpSagaRequest.SAGA_END_REQUEST.id(), getRef());
- CompletableFuture<SagaResponse> future = new CompletableFuture<>();
-
- ActorRef actor = actorSystem.actorOf(CompletionCallbackActor.props(future));
-
- actor.tell(context, noSender());
- AbortMessage message = new AbortMessage(new RuntimeException("oops"));
- actor.tell(message, noSender());
-
- CompensateMessage compensateMessage = (CompensateMessage) receiveOne(Duration.of(2, SECONDS));
- assertThat(compensateMessage.response(), is(message.response()));
- }};
- }
-
- private ActorRef someActor() {
- return actorSystem.actorOf(empty());
- }
-}
diff --git a/saga-core-akka/src/test/java/org/apache/servicecomb/saga/core/actors/EventContextImplTest.java b/saga-core-akka/src/test/java/org/apache/servicecomb/saga/core/actors/EventContextImplTest.java
deleted file mode 100644
index ae11d90..0000000
--- a/saga-core-akka/src/test/java/org/apache/servicecomb/saga/core/actors/EventContextImplTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.actors;
-
-import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
-import static java.time.temporal.ChronoUnit.SECONDS;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.when;
-
-import java.time.Duration;
-
-import org.apache.servicecomb.saga.core.SagaRequest;
-import org.apache.servicecomb.saga.core.SagaResponse;
-import org.apache.servicecomb.saga.core.actors.messages.AbortRecoveryMessage;
-import org.apache.servicecomb.saga.core.actors.messages.CompensationRecoveryMessage;
-import org.apache.servicecomb.saga.core.actors.messages.TransactionRecoveryMessage;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-import org.scalatest.junit.JUnitSuite;
-
-import akka.actor.ActorSystem;
-import akka.testkit.javadsl.TestKit;
-
-public class EventContextImplTest extends JUnitSuite {
- private static final ActorSystem actorSystem = ActorSystem.create();
-
- private final SagaRequest request = Mockito.mock(SagaRequest.class);
- private final SagaResponse response = Mockito.mock(SagaResponse.class);
-
- private final RequestActorContext context = new RequestActorContext(null);
- private final EventContextImpl eventContext = new EventContextImpl(context);
- private final String requestId = uniquify("requestId");
-
- @Before
- public void setUp() throws Exception {
- when(request.id()).thenReturn(requestId);
- }
-
- @AfterClass
- public static void tearDown() throws Exception {
- TestKit.shutdownActorSystem(actorSystem);
- }
-
- @Test
- public void sendTransactionRecoveryMessageToActor_OnTransactionEnd() throws Exception {
- new TestKit(actorSystem) {{
- context.addActor(requestId, getRef());
-
- eventContext.endTransaction(request, response);
-
- TransactionRecoveryMessage message = (TransactionRecoveryMessage) receiveOne(Duration.of(2, SECONDS));
- assertThat(message.response(), is(response));
- }};
- }
-
- @Test
- public void sendCompensationRecoveryMessageToActor_OnCompensationEnd() throws Exception {
- new TestKit(actorSystem) {{
- context.addActor(requestId, getRef());
-
- eventContext.compensateTransaction(request, response);
-
- expectMsgClass(CompensationRecoveryMessage.class);
- }};
- }
-
- @Test
- public void sendAbortMessageToActor_OnAbort() throws Exception {
- new TestKit(actorSystem) {{
- context.addActor(requestId, getRef());
-
- eventContext.abortTransaction(request, response);
-
- AbortRecoveryMessage message = ((AbortRecoveryMessage) receiveOne(Duration.of(2, SECONDS)));
- assertThat(message.response(), is(response));
- }};
- }
-}
diff --git a/saga-core-akka/src/test/java/org/apache/servicecomb/saga/core/actors/RequestActorBuilderTest.java b/saga-core-akka/src/test/java/org/apache/servicecomb/saga/core/actors/RequestActorBuilderTest.java
deleted file mode 100644
index f799517..0000000
--- a/saga-core-akka/src/test/java/org/apache/servicecomb/saga/core/actors/RequestActorBuilderTest.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.actors;
-
-import static java.time.temporal.ChronoUnit.SECONDS;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.core.IsInstanceOf.instanceOf;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.time.Duration;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.apache.servicecomb.saga.core.CompositeSagaResponse;
-import org.apache.servicecomb.saga.core.NoOpSagaRequest;
-import org.apache.servicecomb.saga.core.SagaRequest;
-import org.apache.servicecomb.saga.core.SagaResponse;
-import org.apache.servicecomb.saga.core.SagaTask;
-import org.hamcrest.Matchers;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mockito;
-import org.scalatest.junit.JUnitSuite;
-
-import com.seanyinx.github.unit.scaffolding.Randomness;
-
-import org.apache.servicecomb.saga.core.actors.messages.CompensateMessage;
-import org.apache.servicecomb.saga.core.actors.messages.TransactMessage;
-import org.apache.servicecomb.saga.core.application.interpreter.FromJsonFormat;
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.testkit.javadsl.TestKit;
-
-@SuppressWarnings("unchecked")
-public class RequestActorBuilderTest extends JUnitSuite {
- private static final ActorSystem actorSystem = ActorSystem.create();
-
- private final String requestId1 = Randomness.uniquify("requestId1");
- private final String requestId2 = Randomness.uniquify("requestId2");
- private final String requestId3 = Randomness.uniquify("requestId3");
- private final String taskId = "some task";
-
- private final SagaRequest request1 = Mockito.mock(SagaRequest.class);
- private final SagaRequest request2 = Mockito.mock(SagaRequest.class);
- private final SagaRequest request3 = Mockito.mock(SagaRequest.class);
-
- private final SagaResponse response1 = Mockito.mock(SagaResponse.class);
- private final SagaResponse response2 = Mockito.mock(SagaResponse.class);
- private final SagaResponse response3 = Mockito.mock(SagaResponse.class);
-
- private final SagaRequest[] requests = {request1, request2, request3};
-
- private final SagaTask task = Mockito.mock(SagaTask.class);
- private final Map<String, SagaTask> tasks = new HashMap<>();
-
- private final FromJsonFormat<Set<String>> childrenExtractor = Mockito.mock(FromJsonFormat.class);
- private final RequestActorBuilder actorBuilder = new RequestActorBuilder(actorSystem, childrenExtractor);
-
- @Before
- public void setUp() throws Exception {
- tasks.put(SagaTask.SAGA_START_TASK, task);
- tasks.put(SagaTask.SAGA_END_TASK, task);
- tasks.put(taskId, task);
-
- when(request1.id()).thenReturn(requestId1);
- when(request2.id()).thenReturn(requestId2);
- when(request3.id()).thenReturn(requestId3);
-
- when(request1.task()).thenReturn(taskId);
- when(request2.task()).thenReturn(taskId);
- when(request3.task()).thenReturn(taskId);
-
- when(request1.parents()).thenReturn(new String[0]);
- when(request2.parents()).thenReturn(new String[] {requestId1});
- when(request3.parents()).thenReturn(new String[] {requestId1});
-
- when(task.commit(NoOpSagaRequest.SAGA_START_REQUEST, SagaResponse.EMPTY_RESPONSE)).thenReturn(
- SagaResponse.EMPTY_RESPONSE);
- when(task.commit(request1, SagaResponse.EMPTY_RESPONSE)).thenReturn(response1);
- when(task.commit(request2, response1)).thenReturn(response2);
- when(task.commit(request3, response1)).thenReturn(response3);
-
- when(childrenExtractor.fromJson(anyString())).thenReturn(Collections.emptySet());
- }
-
- @AfterClass
- public static void tearDown() throws Exception {
- TestKit.shutdownActorSystem(actorSystem);
- }
-
- @Test
- public void createOneActorPerRequest() throws Exception {
- new TestKit(actorSystem) {{
- ArgumentCaptor<SagaResponse> argumentCaptor = ArgumentCaptor.forClass(SagaResponse.class);
- when(task.commit(eq(NoOpSagaRequest.SAGA_END_REQUEST), argumentCaptor.capture())).thenReturn(
- SagaResponse.EMPTY_RESPONSE);
-
- ActorRef root = actorBuilder.build(requests, tasks, getRef()).actorOf(NoOpSagaRequest.SAGA_START_REQUEST.id());
-
- root.tell(new TransactMessage(NoOpSagaRequest.SAGA_START_REQUEST, SagaResponse.EMPTY_RESPONSE), getRef());
-
- List<SagaResponse> responses = receiveN(1, Duration.of(2, SECONDS)).stream()
- .map(o -> ((TransactMessage) o).response())
- .collect(Collectors.toList());
-
- assertThat(responses, Matchers.containsInAnyOrder(SagaResponse.EMPTY_RESPONSE));
-
- verify(task).commit(NoOpSagaRequest.SAGA_START_REQUEST, SagaResponse.EMPTY_RESPONSE);
- verify(task).commit(request1, SagaResponse.EMPTY_RESPONSE);
- verify(task).commit(request2, response1);
- verify(task).commit(request3, response1);
- verify(task).commit(eq(NoOpSagaRequest.SAGA_END_REQUEST), any(SagaResponse.class));
-
- SagaResponse response = argumentCaptor.getValue();
- assertThat(response, instanceOf(CompositeSagaResponse.class));
- assertThat(((CompositeSagaResponse) response).responses(),
- containsInAnyOrder(response2, response3));
- }};
- }
-
- @Test
- public void compensateAllCompletedTransactions() throws Exception {
- new TestKit(actorSystem) {{
- ArgumentCaptor<SagaResponse> argumentCaptor = ArgumentCaptor.forClass(SagaResponse.class);
- when(task.commit(eq(NoOpSagaRequest.SAGA_END_REQUEST), argumentCaptor.capture())).thenReturn(
- SagaResponse.EMPTY_RESPONSE);
-
- ActorRef root = actorBuilder.build(requests, tasks, getRef()).actorOf(NoOpSagaRequest.SAGA_START_REQUEST.id());
-
- root.tell(new TransactMessage(NoOpSagaRequest.SAGA_START_REQUEST, SagaResponse.EMPTY_RESPONSE), getRef());
-
- List<SagaResponse> responses = receiveN(1, Duration.of(2, SECONDS)).stream()
- .map(o -> ((TransactMessage) o).response())
- .collect(Collectors.toList());
-
- assertThat(responses, Matchers.containsInAnyOrder(SagaResponse.EMPTY_RESPONSE));
-
- CompensateMessage message = new CompensateMessage(response1);
- getLastSender().tell(message, getRef());
- expectMsg(message);
-
- verify(task).compensate(NoOpSagaRequest.SAGA_START_REQUEST);
- verify(task).compensate(request1);
- verify(task).compensate(request2);
- verify(task).compensate(request3);
- verify(task).compensate(NoOpSagaRequest.SAGA_END_REQUEST);
- }};
- }
-}
diff --git a/saga-core-akka/src/test/java/org/apache/servicecomb/saga/core/actors/RequestActorTest.java b/saga-core-akka/src/test/java/org/apache/servicecomb/saga/core/actors/RequestActorTest.java
deleted file mode 100644
index a9d755f..0000000
--- a/saga-core-akka/src/test/java/org/apache/servicecomb/saga/core/actors/RequestActorTest.java
+++ /dev/null
@@ -1,406 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.actors;
-
-import static akka.actor.ActorRef.noSender;
-import static akka.actor.Props.empty;
-import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
-import static java.time.temporal.ChronoUnit.MILLIS;
-import static java.time.temporal.ChronoUnit.SECONDS;
-import static java.util.Collections.emptySet;
-import static java.util.Collections.singleton;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.core.IsInstanceOf.instanceOf;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.time.Duration;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.apache.servicecomb.saga.core.CompositeSagaResponse;
-import org.apache.servicecomb.saga.core.FailedSagaResponse;
-import org.apache.servicecomb.saga.core.Operation;
-import org.apache.servicecomb.saga.core.SagaRequest;
-import org.apache.servicecomb.saga.core.SagaResponse;
-import org.apache.servicecomb.saga.core.SagaStartFailedException;
-import org.apache.servicecomb.saga.core.SagaTask;
-import org.apache.servicecomb.saga.core.TransactionFailedException;
-import org.apache.servicecomb.saga.core.actors.messages.AbortMessage;
-import org.apache.servicecomb.saga.core.actors.messages.CompensationRecoveryMessage;
-import org.apache.servicecomb.saga.core.actors.messages.TransactMessage;
-import org.apache.servicecomb.saga.core.actors.messages.TransactionRecoveryMessage;
-import org.hamcrest.Matchers;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mockito;
-import org.scalatest.junit.JUnitSuite;
-
-import org.apache.servicecomb.saga.core.actors.messages.CompensateMessage;
-import org.apache.servicecomb.saga.core.actors.messages.FailMessage;
-import org.apache.servicecomb.saga.core.application.interpreter.FromJsonFormat;
-
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.testkit.javadsl.TestKit;
-
-@SuppressWarnings("unchecked")
-public class RequestActorTest extends JUnitSuite {
-
- public static final Duration TWO_SECONDS = Duration.of(2, SECONDS);
-
- private final String parentRequestId1 = uniquify("parentRequestId1");
- private final String parentRequestId2 = uniquify("parentRequestId2");
- private final String requestId = uniquify("requestId");
-
- private final SagaTask task = Mockito.mock(SagaTask.class);
- private final SagaRequest request = Mockito.mock(SagaRequest.class, "request");
- private final SagaRequest request1 = Mockito.mock(SagaRequest.class, "request1");
- private final SagaRequest request2 = Mockito.mock(SagaRequest.class, "request2");
- private final SagaResponse response = Mockito.mock(SagaResponse.class);
- private final FromJsonFormat<Set<String>> childrenExtractor = mock(FromJsonFormat.class);
-
- private final RequestActorContext context = new RequestActorContext(childrenExtractor);
-
- private final TransactionFailedException exception = new TransactionFailedException("oops");
- private static final ActorSystem actorSystem = ActorSystem.create();
- private final CompensateMessage compensateMessage = new CompensateMessage(new FailedSagaResponse(exception));
-
- @Before
- public void setUp() throws Exception {
- when(childrenExtractor.fromJson(anyString())).thenReturn(emptySet());
- when(request.id()).thenReturn(requestId);
-
- when(request1.id()).thenReturn(parentRequestId1);
- when(request2.id()).thenReturn(parentRequestId2);
- }
-
- @AfterClass
- public static void tearDown() throws Exception {
- TestKit.shutdownActorSystem(actorSystem);
- }
-
- @Test
- public void tellNodeResponseToAllChildren() throws Exception {
- new TestKit(actorSystem) {{
- addChildren(getRef());
-
- ActorRef parent = someActor();
- context.addParent(requestId, parent);
-
- when(request.parents()).thenReturn(new String[] {parentRequestId1});
- when(task.commit(request, Operation.SUCCESSFUL_SAGA_RESPONSE)).thenReturn(response);
-
- ActorRef actorRef = actorSystem.actorOf(RequestActor.props(context, task, request));
-
- actorRef.tell(new TransactMessage(request1, Operation.SUCCESSFUL_SAGA_RESPONSE), parent);
-
- List<SagaResponse> responses = receiveN(2, TWO_SECONDS).stream()
- .map(o -> ((TransactMessage) o).response())
- .collect(Collectors.toList());
-
- assertThat(responses, containsInAnyOrder(response, response));
-
- verify(task).commit(request, Operation.SUCCESSFUL_SAGA_RESPONSE);
- }};
- }
-
- @Test
- public void executeTransaction_OnlyWhenAllParentsResponsesAreReceived() throws Exception {
- new TestKit(actorSystem) {{
- addChildren(getRef());
-
- ActorRef parent1 = someActor();
- context.addParent(requestId, parent1);
-
- ActorRef parent2 = someActor();
- context.addParent(requestId, parent2);
-
- ArgumentCaptor<SagaResponse> argumentCaptor = ArgumentCaptor.forClass(SagaResponse.class);
-
- when(request.parents()).thenReturn(new String[] {parentRequestId1, parentRequestId2});
- when(task.commit(eq(request), argumentCaptor.capture())).thenReturn(response);
-
- ActorRef actorRef = actorSystem.actorOf(RequestActor.props(context, task, request));
-
- actorRef.tell(new TransactMessage(request1, Operation.SUCCESSFUL_SAGA_RESPONSE), parent1);
- expectNoMessage(Duration.of(500, MILLIS));
-
- actorRef.tell(new TransactMessage(request2, SagaResponse.EMPTY_RESPONSE), parent2);
-
- List<SagaResponse> responses = receiveN(2, TWO_SECONDS).stream()
- .map(o -> ((TransactMessage) o).response())
- .collect(Collectors.toList());
-
- assertThat(responses, containsInAnyOrder(response, response));
-
- SagaResponse response = argumentCaptor.getValue();
- assertThat(response, instanceOf(CompositeSagaResponse.class));
- assertThat(((CompositeSagaResponse) response).responses(),
- Matchers.containsInAnyOrder(SagaResponse.EMPTY_RESPONSE, Operation.SUCCESSFUL_SAGA_RESPONSE));
- }};
- }
-
- @Test
- public void tellAllRelativesToAbortOnError() throws Exception {
- new TestKit(actorSystem) {{
- context.addChild(requestId, getRef());
- context.addActor(requestId, getRef());
-
- context.addParent(requestId, getRef());
-
- when(request.parents()).thenReturn(new String[] {parentRequestId1});
- when(task.commit(request, Operation.SUCCESSFUL_SAGA_RESPONSE)).thenThrow(exception);
-
- ActorRef actorRef = actorSystem.actorOf(RequestActor.props(context, task, request));
-
- actorRef.tell(new TransactMessage(request1, Operation.SUCCESSFUL_SAGA_RESPONSE), getRef());
-
- List<SagaResponse> responses = receiveN(2, TWO_SECONDS).stream()
- .map(o -> ((AbortMessage) o).response())
- .collect(Collectors.toList());
-
- assertThat(responses, containsInAnyOrder(instanceOf(FailedSagaResponse.class), instanceOf(FailedSagaResponse.class)));
- }};
- }
-
- @Test
- public void tellAllRelativesExceptSenderToAbortOnAbort() throws Exception {
- new TestKit(actorSystem) {{
- context.addChild(requestId, getRef());
- context.addActor(requestId, getRef());
-
- context.addParent(requestId, getRef());
-
- when(request.parents()).thenReturn(new String[] {parentRequestId1});
-
- ActorRef actorRef = actorSystem.actorOf(RequestActor.props(context, task, request));
-
- actorRef.tell(new AbortMessage(exception), someActor());
-
- List<SagaResponse> responses = receiveN(2, TWO_SECONDS).stream()
- .map(o -> ((AbortMessage) o).response())
- .collect(Collectors.toList());
-
- assertThat(responses, containsInAnyOrder(instanceOf(FailedSagaResponse.class), instanceOf(FailedSagaResponse.class)));
-
- actorRef.tell(new AbortMessage(exception), someActor());
- expectNoMessage(Duration.of(500, MILLIS));
- }};
- }
-
- @Test
- public void compensateIfTransactionIsCompleted() throws Exception {
- new TestKit(actorSystem) {{
- addChildren(someActor());
- context.addParent(requestId, getRef());
-
- when(request.parents()).thenReturn(new String[] {parentRequestId1});
- when(task.commit(request, Operation.SUCCESSFUL_SAGA_RESPONSE)).thenReturn(response);
-
- ActorRef actorRef = actorSystem.actorOf(RequestActor.props(context, task, request));
-
- actorRef.tell(new TransactMessage(request1, Operation.SUCCESSFUL_SAGA_RESPONSE), getRef());
- actorRef.tell(new AbortMessage(exception), noSender());
- actorRef.tell(compensateMessage, getRef());
- actorRef.tell(compensateMessage, getRef());
-
- expectMsg(TWO_SECONDS, compensateMessage);
- verify(task).compensate(request);
-
- // no duplicate compensation
- reset(task);
- actorRef.tell(compensateMessage, getRef());
- actorRef.tell(compensateMessage, getRef());
- expectNoMessage(Duration.of(200, MILLIS));
- verify(task, never()).compensate(request);
- }};
- }
-
- @Test
- public void doNotCompensateIfTransactionIsNotCompleted() throws Exception {
- new TestKit(actorSystem) {{
- addChildren(someActor());
- context.addParent(requestId, getRef());
-
- when(request.parents()).thenReturn(new String[] {parentRequestId1});
-
- ActorRef actorRef = actorSystem.actorOf(RequestActor.props(context, task, request));
-
- actorRef.tell(new AbortMessage(exception), noSender());
- actorRef.tell(compensateMessage, getRef());
- actorRef.tell(compensateMessage, getRef());
-
- List<Object> responses = receiveN(2, TWO_SECONDS);
- assertThat(responses, contains(instanceOf(AbortMessage.class), instanceOf(CompensateMessage.class)));
- verify(task, never()).compensate(request);
-
- // no duplicate compensation
- reset(task);
- actorRef.tell(compensateMessage, getRef());
- actorRef.tell(compensateMessage, getRef());
- expectNoMessage(Duration.of(200, MILLIS));
- verify(task, never()).compensate(request);
- }};
- }
-
- @Test
- public void skipIfActorIsNotChosenByAnyParent() throws Exception {
- when(childrenExtractor.fromJson(Operation.SUCCESSFUL_SAGA_RESPONSE.body())).thenReturn(singleton("none"));
-
- new TestKit(actorSystem) {{
- addChildren(getRef());
- context.addParent(requestId, getRef());
-
- when(request.parents()).thenReturn(new String[] {parentRequestId1});
-
- ActorRef actorRef = actorSystem.actorOf(RequestActor.props(context, task, request));
-
- actorRef.tell(new TransactMessage(request1, Operation.SUCCESSFUL_SAGA_RESPONSE), getRef());
-
- List<SagaResponse> responses = receiveN(2, TWO_SECONDS).stream()
- .map(o -> ((TransactMessage) o).response())
- .collect(Collectors.toList());
-
- assertThat(responses, Matchers.containsInAnyOrder(SagaResponse.NONE_RESPONSE, SagaResponse.NONE_RESPONSE));
- verify(task, never()).commit(request, Operation.SUCCESSFUL_SAGA_RESPONSE);
-
- // skip compensation for ignored actor
- actorRef.tell(compensateMessage, getRef());
- actorRef.tell(compensateMessage, getRef());
-
- expectMsg(TWO_SECONDS, compensateMessage);
- verify(task, never()).compensate(request);
- }};
- }
-
- @Test
- public void transactIfChosenByAnyParent() throws Exception {
- when(childrenExtractor.fromJson(Operation.SUCCESSFUL_SAGA_RESPONSE.body())).thenReturn(singleton(requestId));
-
- new TestKit(actorSystem) {{
- addChildren(getRef());
-
- ActorRef parent1 = someActor();
- context.addParent(requestId, parent1);
-
- ActorRef parent2 = someActor();
- context.addParent(requestId, parent2);
-
- when(request.parents()).thenReturn(new String[] {parentRequestId1, parentRequestId2});
- when(task.commit(eq(request), any(CompositeSagaResponse.class))).thenReturn(response);
-
- ActorRef actorRef = actorSystem.actorOf(RequestActor.props(context, task, request));
-
- actorRef.tell(new TransactMessage(request1, Operation.SUCCESSFUL_SAGA_RESPONSE), parent1);
- actorRef.tell(new TransactMessage(request2, Operation.SUCCESSFUL_SAGA_RESPONSE), parent2);
-
- List<SagaResponse> responses = receiveN(2, TWO_SECONDS).stream()
- .map(o -> ((TransactMessage) o).response())
- .collect(Collectors.toList());
-
- assertThat(responses, containsInAnyOrder(response, response));
- }};
- }
-
- @Test
- public void tellTransactionResponseToChildrenOnRecovery() throws Exception {
- new TestKit(actorSystem) {{
- context.addChild(requestId, getRef());
-
- ActorRef parent = someActor();
- context.addParent(requestId, parent);
-
- when(request.parents()).thenReturn(new String[] {parentRequestId1});
-
- ActorRef actorRef = actorSystem.actorOf(RequestActor.props(context, task, request));
-
- actorRef.tell(new TransactionRecoveryMessage(response), noSender());
- actorRef.tell(new TransactMessage(request1, Operation.SUCCESSFUL_SAGA_RESPONSE), parent);
-
- List<SagaResponse> responses = receiveN(1, TWO_SECONDS).stream()
- .map(o -> ((TransactMessage) o).response())
- .collect(Collectors.toList());
-
- assertThat(responses, containsInAnyOrder(response));
-
- verify(task, never()).commit(request, Operation.SUCCESSFUL_SAGA_RESPONSE);
- }};
- }
-
- @Test
- public void tellCompensationToParentsOnRecovery() throws Exception {
- new TestKit(actorSystem) {{
- context.addChild(requestId, someActor());
- context.addParent(requestId, getRef());
-
- when(request.parents()).thenReturn(new String[] {parentRequestId1});
-
- ActorRef actorRef = actorSystem.actorOf(RequestActor.props(context, task, request));
-
- actorRef.tell(new AbortMessage(exception), someActor());
- actorRef.tell(new CompensationRecoveryMessage(), someActor());
- actorRef.tell(compensateMessage, someActor());
-
- List<Object> responses = receiveN(2, TWO_SECONDS);
- assertThat(responses, contains(instanceOf(AbortMessage.class), instanceOf(CompensateMessage.class)));
-
- verify(task, never()).compensate(request);
- }};
- }
-
- @Test
- public void abortOnPersistenceFailure() throws Exception {
- new TestKit(actorSystem) {{
- context.addChild(requestId, noSender());
- context.addParent(requestId, getRef());
-
- when(request.parents()).thenReturn(new String[] {parentRequestId1});
-
- SagaStartFailedException oops = new SagaStartFailedException("oops", exception);
- when(task.commit(request, SagaResponse.EMPTY_RESPONSE)).thenThrow(oops);
-
- ActorRef actorRef = actorSystem.actorOf(RequestActor.props(context, task, request));
-
- actorRef.tell(new TransactMessage(request, SagaResponse.EMPTY_RESPONSE), getRef());
-
- expectMsgClass(FailMessage.class);
- }};
- }
-
- private ActorRef someActor() {
- return actorSystem.actorOf(empty());
- }
-
- private void addChildren(ActorRef ref) {
- context.addChild(requestId, ref);
- context.addChild(requestId, ref);
- context.addActor(requestId, ref);
- }
-}
diff --git a/saga-core-akka/src/test/resources/application.conf b/saga-core-akka/src/test/resources/application.conf
deleted file mode 100644
index 0629dd6..0000000
--- a/saga-core-akka/src/test/resources/application.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-akka {
- loggers = ["akka.event.slf4j.Slf4jLogger"]
- loglevel = "DEBUG"
- logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
-}
diff --git a/saga-core-akka/src/test/resources/log4j2.xml b/saga-core-akka/src/test/resources/log4j2.xml
deleted file mode 100644
index cae04cb..0000000
--- a/saga-core-akka/src/test/resources/log4j2.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<Configuration status="WARN">
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
- </Console>
- </Appenders>
- <Loggers>
- <AsyncRoot level="info">
- <AppenderRef ref="Console"/>
- </AsyncRoot>
- </Loggers>
-</Configuration>
diff --git a/saga-core/pom.xml b/saga-core/pom.xml
deleted file mode 100644
index e460b1a..0000000
--- a/saga-core/pom.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<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</artifactId>
- <groupId>org.apache.servicecomb.saga</groupId>
- <version>0.3.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>saga-core</artifactId>
- <name>Saga::Core</name>
-
- <dependencies>
- <dependency>
- <groupId>com.lmax</groupId>
- <artifactId>disruptor</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </dependency>
- <dependency>
- <groupId>io.kamon</groupId>
- <artifactId>kamon-annotation_2.12</artifactId>
- </dependency>
-
- <!-- test dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <!-- need to use this version of running the test -->
- <version>1.10.19</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
- <dependency>
- <groupId>org.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- </dependency>
- <dependency>
- <groupId>com.github.seanyinx</groupId>
- <artifactId>unit-scaffolding</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <encoding>UTF-8</encoding>
- <source>1.7</source>
- <target>1.7</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/BackwardRecovery.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/BackwardRecovery.java
deleted file mode 100644
index 799dbbf..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/BackwardRecovery.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import java.lang.invoke.MethodHandles;
-import kamon.annotation.EnableKamon;
-import kamon.annotation.Segment;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-@EnableKamon
-public class BackwardRecovery implements RecoveryPolicy {
-
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
- @Segment(name = "backwardPolicy", category = "application", library = "kamon")
- @Override
- public SagaResponse apply(SagaTask task, SagaRequest request, SagaResponse parentResponse) {
- try {
- return request.transaction().send(request.serviceName(), parentResponse);
- } catch (Exception e) {
- log.error("Applying {} policy due to failure in transaction {} of service {}",
- description(),
- request.transaction(),
- request.serviceName(),
- e
- );
-
- task.abort(request, e);
- throw e;
- }
- }
-
- @Override
- public String description() {
- return getClass().getSimpleName();
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/Compensation.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/Compensation.java
deleted file mode 100644
index 758ebd9..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/Compensation.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-public interface Compensation extends Operation {
-
- Compensation SAGA_START_COMPENSATION = new Compensation() {
- @Override
- public SagaResponse send(String address) {
- return SUCCESSFUL_SAGA_RESPONSE;
- }
-
- @Override
- public SagaResponse send(String address, SagaResponse response) {
- return send(address);
- }
-
- @Override
- public int retries() {
- return DEFAULT_RETRIES;
- }
- };
-
- Compensation SAGA_END_COMPENSATION = new Compensation() {
- @Override
- public SagaResponse send(String address) {
- return SUCCESSFUL_SAGA_RESPONSE;
- }
-
- @Override
- public SagaResponse send(String address, SagaResponse response) {
- return send(address);
- }
-
- @Override
- public int retries() {
- return DEFAULT_RETRIES;
- }
- };
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/CompensationTaskConsumer.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/CompensationTaskConsumer.java
deleted file mode 100644
index 736c34d..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/CompensationTaskConsumer.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.apache.servicecomb.saga.core.dag.Node;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-class CompensationTaskConsumer implements TaskConsumer {
-
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
- private final Map<String, SagaTask> tasks;
- private final SagaContext sagaContext;
-
- CompensationTaskConsumer(Map<String, SagaTask> tasks, SagaContext sagaContext) {
- this.tasks = tasks;
- this.sagaContext = sagaContext;
- }
-
- @Override
- public void consume(Collection<Node<SagaRequest>> nodes) {
- for (Node<SagaRequest> node : nodes) {
- SagaRequest request = node.value();
-
- if (sagaContext.isTransactionCompleted(request)) {
- log.info("Starting request {} id={}", request.serviceName(), request.id());
- tasks.get(request.task()).compensate(request);
- log.info("Completed request {} id={}", request.serviceName(), request.id());
- }
- }
- }
-
- @Override
- public boolean replay(Collection<Node<SagaRequest>> nodes) {
-
- for (Iterator<Node<SagaRequest>> iterator = nodes.iterator(); iterator.hasNext(); ) {
- SagaRequest request = iterator.next().value();
- if (sagaContext.isCompensationCompleted(request)) {
- log.info("Skipped completed compensation id={} operation={} while replay", request.id(), request.transaction());
- iterator.remove();
- } else if (!sagaContext.isTransactionCompleted(request)) {
- // this transaction never started
- log.info("Skipped pending transaction id={} operation={} while replay", request.id(), request.transaction());
- iterator.remove();
- }
- }
- return !nodes.isEmpty();
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/CompositeSagaLog.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/CompositeSagaLog.java
deleted file mode 100644
index 017129a..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/CompositeSagaLog.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import kamon.annotation.EnableKamon;
-import kamon.annotation.Segment;
-
-@EnableKamon
-class CompositeSagaLog implements SagaLog {
-
- private final SagaLog embedded;
- private final PersistentLog persistent;
-
- CompositeSagaLog(SagaLog embedded, PersistentLog persistent) {
- this.embedded = embedded;
- this.persistent = persistent;
- }
-
- @Segment(name = "compositeSagaLog", category = "application", library = "kamon")
- @Override
- public void offer(SagaEvent sagaEvent) {
- persistent.offer(sagaEvent);
- embedded.offer(sagaEvent);
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/CompositeSagaResponse.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/CompositeSagaResponse.java
deleted file mode 100644
index 84753b9..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/CompositeSagaResponse.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import java.util.Collection;
-
-public class CompositeSagaResponse implements SagaResponse {
- private final Collection<SagaResponse> responses;
-
- public CompositeSagaResponse(Collection<SagaResponse> responses) {
- this.responses = responses;
- }
-
- @Override
- public boolean succeeded() {
- if (responses.size() > 0) {
- boolean result = true;
- for (SagaResponse response : responses) {
- result = result && response.succeeded();
- }
- return result;
- } else {
- return false;
- }
- }
-
- @Override
- public String body() {
- StringBuffer result = new StringBuffer();
- if (responses.size() == 0) {
- result.append("{}");
- } else {
- result.append("[");
- for (SagaResponse response : responses) {
- result.append(response.body());
- result.append(", ");
- }
- result.delete(result.length()-2, result.length());
- result.append("]");
- }
- return result.toString();
- }
-
-
- public Collection<SagaResponse> responses() {
- return responses;
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/Descriptive.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/Descriptive.java
deleted file mode 100644
index e8b4f4e..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/Descriptive.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-interface Descriptive {
-
- String description();
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/EventContext.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/EventContext.java
deleted file mode 100644
index 79b0c3e..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/EventContext.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-public interface EventContext {
- void beginTransaction(SagaRequest request);
-
- void endTransaction(SagaRequest request, SagaResponse response);
-
- void abortTransaction(SagaRequest request, SagaResponse response);
-
- void compensateTransaction(SagaRequest request, SagaResponse response);
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/EventEnvelope.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/EventEnvelope.java
deleted file mode 100644
index 9283b33..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/EventEnvelope.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-public class EventEnvelope {
-
- public final long id;
- public final long timestamp;
- public final SagaEvent event;
-
- public EventEnvelope(long id, SagaEvent event) {
- this.id = id;
- this.event = event;
- this.timestamp = System.currentTimeMillis();
- }
-
- // TODO: 8/21/2017 this class seems to be useless to saga
- public EventEnvelope(long id, long timestamp, SagaEvent event) {
- this.id = id;
- this.timestamp = timestamp;
- this.event = event;
- }
-
- @Override
- public String toString() {
- return "EventEnvelope{" +
- "id=" + id +
- ", timestamp=" + timestamp +
- ", event={" + event +
- "}}";
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/EventStore.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/EventStore.java
deleted file mode 100644
index 7b7e6e2..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/EventStore.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-public interface EventStore extends SagaLog, Iterable<SagaEvent> {
-
- void populate(Iterable<EventEnvelope> events);
-
- long size();
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/FailedSagaResponse.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/FailedSagaResponse.java
deleted file mode 100644
index 15d1701..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/FailedSagaResponse.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-public class FailedSagaResponse implements SagaResponse {
-
- private final String body;
-
- public FailedSagaResponse(String body) {
- this.body = body;
- }
-
- public FailedSagaResponse(Throwable e) {
- this.body = stackTrace(e);
- }
-
- @Override
- public boolean succeeded() {
- return false;
- }
-
- @Override
- public String body() {
- return body;
- }
-
- private String stackTrace(Throwable e) {
- StringWriter writer = new StringWriter();
- e.printStackTrace(new PrintWriter(writer));
- return writer.toString();
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/Fallback.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/Fallback.java
deleted file mode 100644
index 7215a6b..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/Fallback.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-public interface Fallback extends Operation {
-
- Fallback NOP_FALLBACK = new Fallback() {
- @Override
- public String type() {
- return TYPE_NOP;
- }
-
- @Override
- public SagaResponse send(String address) {
- return SUCCESSFUL_SAGA_RESPONSE;
- }
-
- @Override
- public SagaResponse send(String address, SagaResponse response) {
- return send(address);
- }
-
- @Override
- public int retries() {
- return 0;
- }
- };
-
- String type();
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/FallbackPolicy.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/FallbackPolicy.java
deleted file mode 100644
index 48ad67d..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/FallbackPolicy.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import java.lang.invoke.MethodHandles;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class FallbackPolicy {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
- private final int retryDelay;
-
- public FallbackPolicy(int retryDelay) {
- this.retryDelay = retryDelay;
- }
-
- public SagaResponse apply(String address, Compensation compensation, Fallback fallback) {
- for (int i = 0; isRetryable(i, compensation) && !isInterrupted(); i++) {
- try {
- return compensation.send(address);
- } catch (Exception e) {
- log.error("Failed to send compensation to {}", address, e);
- sleep(retryDelay);
- }
- }
-
- log.warn("Falling back after {} failures sending compensation to {}", compensation.retries(), address);
- return fallback.send(address);
- }
-
- private boolean isRetryable(int i, Compensation compensation) {
- return compensation.retries() < 0 || i <= compensation.retries();
- }
-
- private boolean isInterrupted() {
- return Thread.currentThread().isInterrupted();
- }
-
- private void sleep(int delay) {
- try {
- Thread.sleep(delay);
- } catch (InterruptedException ignored) {
- Thread.currentThread().interrupt();
- }
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/ForwardRecovery.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/ForwardRecovery.java
deleted file mode 100644
index 8c10cc0..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/ForwardRecovery.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import java.lang.invoke.MethodHandles;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ForwardRecovery implements RecoveryPolicy {
-
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
- @Override
- public SagaResponse apply(SagaTask task, SagaRequest request, SagaResponse parentResponse) {
- try {
- for(int i = 0; isRetryable(i, request.transaction()); i++) {
- try {
- return request.transaction().send(request.serviceName(), parentResponse);
- } catch (Exception e) {
- log.error("Applying {} policy due to failure in transaction {} of service {}",
- description(),
- request.transaction(),
- request.serviceName(),
- e
- );
- Thread.sleep(request.failRetryDelayMilliseconds());
- }
- }
- } catch (InterruptedException ignored) {
- log.warn("Applying {} interrupted in transaction {} of service {}",
- description(),
- request.transaction(),
- request.serviceName(),
- ignored);
- throw new TransactionFailedException(ignored);
- }
- throw new TransactionAbortedException(
- String.format(
- "Too many failures in transaction %s of service %s, abort the transaction!",
- request.transaction(),
- request.serviceName()));
- }
-
- private boolean isRetryable(int i, Transaction transaction) {
- return transaction.retries() <= 0 || i <= transaction.retries();
- }
-
- @Override
- public String description() {
- return getClass().getSimpleName();
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/GraphBasedSaga.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/GraphBasedSaga.java
deleted file mode 100644
index d57dbe9..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/GraphBasedSaga.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Map;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorCompletionService;
-import java.util.concurrent.Executors;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.apache.servicecomb.saga.core.dag.ByLevelTraveller;
-import org.apache.servicecomb.saga.core.dag.FromLeafTraversalDirection;
-import org.apache.servicecomb.saga.core.dag.FromRootTraversalDirection;
-import org.apache.servicecomb.saga.core.dag.SingleLeafDirectedAcyclicGraph;
-import org.apache.servicecomb.saga.core.dag.TraversalDirection;
-import kamon.annotation.EnableKamon;
-import kamon.annotation.Segment;
-
-@EnableKamon
-public class GraphBasedSaga implements Saga {
-
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
- private final EventStore eventStore;
- private final Map<String, SagaTask> tasks;
-
- private final TaskRunner transactionTaskRunner;
- private final TaskRunner compensationTaskRunner;
- private final SagaContext sagaContext;
- private volatile SagaState currentTaskRunner;
-
- GraphBasedSaga(EventStore eventStore,
- Map<String, SagaTask> tasks,
- SagaContext sagaContext,
- SingleLeafDirectedAcyclicGraph<SagaRequest> sagaTaskGraph) {
-
- this(eventStore, Executors.newFixedThreadPool(5), tasks, sagaContext, sagaTaskGraph);
- }
-
- public GraphBasedSaga(EventStore eventStore,
- Executor executor,
- Map<String, SagaTask> tasks,
- SagaContext sagaContext,
- SingleLeafDirectedAcyclicGraph<SagaRequest> sagaTaskGraph) {
-
- this.eventStore = eventStore;
- this.tasks = tasks;
-
- this.transactionTaskRunner = new TaskRunner(
- traveller(sagaTaskGraph, new FromRootTraversalDirection<SagaRequest>()),
- new TransactionTaskConsumer(
- tasks,
- sagaContext,
- new ExecutorCompletionService<Operation>(executor)));
-
- this.sagaContext = sagaContext;
- this.compensationTaskRunner = new TaskRunner(
- traveller(sagaTaskGraph, new FromLeafTraversalDirection<SagaRequest>()),
- new CompensationTaskConsumer(tasks, sagaContext));
-
- currentTaskRunner = transactionTaskRunner;
- }
-
- @Override
- @Segment(name = "runSaga", category = "application", library = "kamon")
- public SagaResponse run() {
- SagaResponse response = SagaResponse.EMPTY_RESPONSE;
- log.info("Starting Saga");
- do {
- try {
- currentTaskRunner.run();
- } catch (TransactionFailedException e) {
- response = new FailedSagaResponse(e);
- log.error("Failed to run operation", e);
- currentTaskRunner = compensationTaskRunner;
-
- sagaContext.handleHangingTransactions(new TransactionConsumer<SagaRequest>() {
- @Override
- public void accept(SagaRequest request) {
- tasks.get(request.task()).commit(request, sagaContext.responseOf(request.parents()));
- tasks.get(request.task()).compensate(request);
- }
- });
- } catch (TransactionAbortedException e) {
- response = new FailedSagaResponse(e);
- log.error("Transaction aborted ", e);
- break;
- }
- } while (currentTaskRunner.hasNext());
- log.info("Completed Saga");
- return response;
- }
-
- @Override
- public void play() {
- log.info("Start playing events");
- gatherEvents(eventStore);
-
- transactionTaskRunner.replay();
-
- if (sagaContext.isCompensationStarted()) {
- currentTaskRunner = compensationTaskRunner;
- compensationTaskRunner.replay();
- }
-
- log.info("Completed playing events");
- }
-
- private void gatherEvents(Iterable<SagaEvent> events) {
- for (SagaEvent event : events) {
- event.gatherTo(sagaContext);
- }
- }
-
- private ByLevelTraveller<SagaRequest> traveller(
- SingleLeafDirectedAcyclicGraph<SagaRequest> sagaTaskGraph,
- TraversalDirection<SagaRequest> traversalDirection) {
-
- return new ByLevelTraveller<>(sagaTaskGraph, traversalDirection);
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/IdGenerator.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/IdGenerator.java
deleted file mode 100644
index 2add260..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/IdGenerator.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import java.io.Serializable;
-
-public interface IdGenerator<T extends Serializable> {
-
- T nextId();
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/LoggingRecoveryPolicy.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/LoggingRecoveryPolicy.java
deleted file mode 100644
index 593aa91..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/LoggingRecoveryPolicy.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import java.lang.invoke.MethodHandles;
-import kamon.annotation.EnableKamon;
-import kamon.annotation.Segment;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-
-@EnableKamon
-public class LoggingRecoveryPolicy implements RecoveryPolicy {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
- private final RecoveryPolicy recoveryPolicy;
-
- public LoggingRecoveryPolicy(RecoveryPolicy recoveryPolicy) {
- this.recoveryPolicy = recoveryPolicy;
- }
-
- @Segment(name = "loggingPolicy", category = "application", library = "kamon")
- @Override
- public SagaResponse apply(SagaTask task, SagaRequest request, SagaResponse parentResponse) {
- log.info("Starting request id={} for service {}", request.id(), request.serviceName());
- SagaResponse response = recoveryPolicy.apply(task, request, parentResponse);
- log.info("Completed request id={} for service {}", request.id(), request.serviceName());
- return response;
- }
-
- @Override
- public String description() {
- return getClass().getSimpleName();
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/LongIdGenerator.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/LongIdGenerator.java
deleted file mode 100644
index 6b16075..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/LongIdGenerator.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import java.util.concurrent.atomic.AtomicLong;
-
-public class LongIdGenerator implements IdGenerator<Long> {
-
- private final AtomicLong atomicLong = new AtomicLong();
-
- @Override
- public Long nextId() {
- return atomicLong.incrementAndGet();
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/NoOpSagaRequest.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/NoOpSagaRequest.java
deleted file mode 100644
index 93bbda9..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/NoOpSagaRequest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import static org.apache.servicecomb.saga.core.Compensation.SAGA_END_COMPENSATION;
-import static org.apache.servicecomb.saga.core.Compensation.SAGA_START_COMPENSATION;
-import static org.apache.servicecomb.saga.core.Fallback.NOP_FALLBACK;
-import static org.apache.servicecomb.saga.core.Operation.TYPE_NOP;
-import static org.apache.servicecomb.saga.core.SagaTask.SAGA_END_TASK;
-import static org.apache.servicecomb.saga.core.SagaTask.SAGA_START_TASK;
-import static org.apache.servicecomb.saga.core.Transaction.SAGA_END_TRANSACTION;
-import static org.apache.servicecomb.saga.core.Transaction.SAGA_START_TRANSACTION;
-
-import java.util.Arrays;
-
-public class NoOpSagaRequest implements SagaRequest {
-
- public static final SagaRequest SAGA_START_REQUEST = new NoOpSagaRequest(
- "saga-start",
- SAGA_START_TRANSACTION,
- SAGA_START_COMPENSATION,
- SAGA_START_TASK);
-
- public static final SagaRequest SAGA_END_REQUEST = new NoOpSagaRequest(
- "saga-end",
- SAGA_END_TRANSACTION,
- SAGA_END_COMPENSATION,
- SAGA_END_TASK);
-
- private final String id;
- private final Transaction transaction;
- private final Compensation compensation;
- private final String task;
- private final String[] parents = {};
-
- private NoOpSagaRequest(String id, Transaction transaction, Compensation compensation, String task) {
- this.id = id;
- this.transaction = transaction;
- this.compensation = compensation;
- this.task = task;
- }
-
- @Override
- public Transaction transaction() {
- return transaction;
- }
-
- @Override
- public Compensation compensation() {
- return compensation;
- }
-
- @Override
- public Fallback fallback() {
- return NOP_FALLBACK;
- }
-
- @Override
- public String serviceName() {
- return "Saga";
- }
-
- @Override
- public String id() {
- return id;
- }
-
- @Override
- public String type() {
- return TYPE_NOP;
- }
-
- @Override
- public String task() {
- return task;
- }
-
- @Override
- public String[] parents() {
- return parents;
- }
-
- @Override
- public int failRetryDelayMilliseconds() {
- return 50;
- }
-
- @Override
- public String toString() {
- return "NoOpSagaRequest{" +
- "id='" + id + '\'' +
- ", transaction=" + transaction +
- ", compensation=" + compensation +
- ", task='" + task + '\'' +
- ", parents=" + Arrays.toString(parents) +
- '}';
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/Operation.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/Operation.java
deleted file mode 100644
index c693dd2..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/Operation.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-public interface Operation {
-
- int DEFAULT_RETRIES = 3;
- String TYPE_NOP = "NOP";
- String TYPE_REST = "rest";
- String TYPE_SQL = "sql";
- SagaResponse SUCCESSFUL_SAGA_RESPONSE = new SuccessfulSagaResponse("success");
-
- SagaResponse send(String address);
-
- SagaResponse send(String address, SagaResponse response);
-
- int retries();
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/PersistentLog.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/PersistentLog.java
deleted file mode 100644
index 26ec4bc..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/PersistentLog.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-public interface PersistentLog {
- void offer(SagaEvent sagaEvent);
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/PersistentStore.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/PersistentStore.java
deleted file mode 100644
index a7620b3..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/PersistentStore.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import java.util.List;
-import java.util.Map;
-
-public interface PersistentStore extends PersistentLog {
-
- Map<String, List<EventEnvelope>> findPendingSagaEvents();
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/RecoveryPolicy.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/RecoveryPolicy.java
deleted file mode 100644
index c67d640..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/RecoveryPolicy.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-public interface RecoveryPolicy extends Descriptive {
-
- String SAGA_FORWARD_RECOVERY_POLICY = "ForwardRecovery";
- String SAGA_BACKWARD_RECOVERY_POLICY = "BackwardRecovery";
-
- SagaResponse apply(SagaTask task, SagaRequest request, SagaResponse parentResponse);
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/RequestProcessTask.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/RequestProcessTask.java
deleted file mode 100644
index e19c7bf..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/RequestProcessTask.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import kamon.annotation.EnableKamon;
-import kamon.annotation.Segment;
-
-@EnableKamon
-public class RequestProcessTask implements SagaTask {
-
- private final String sagaId;
- private final SagaLog sagaLog;
- private final RecoveryPolicy recoveryPolicy;
- private final FallbackPolicy fallbackPolicy;
-
- public RequestProcessTask(
- String sagaId,
- SagaLog sagaLog,
- RecoveryPolicy recoveryPolicy,
- FallbackPolicy fallbackPolicy) {
-
- this.sagaId = sagaId;
- this.sagaLog = sagaLog;
- this.recoveryPolicy = recoveryPolicy;
- this.fallbackPolicy = fallbackPolicy;
- }
-
- @Segment(name = "commit", category = "application", library = "kamon")
- @Override
- public SagaResponse commit(SagaRequest request, SagaResponse parentResponse) {
- sagaLog.offer(new TransactionStartedEvent(sagaId, request));
-
- SagaResponse response = recoveryPolicy.apply(this, request, parentResponse);
-
- sagaLog.offer(new TransactionEndedEvent(sagaId, request, response));
- return response;
- }
-
- @Segment(name = "compensate", category = "application", library = "kamon")
- @Override
- public void compensate(SagaRequest request) {
- Compensation compensation = request.compensation();
- SagaResponse response = fallbackPolicy.apply(request.serviceName(), compensation, request.fallback());
-
- sagaLog.offer(new TransactionCompensatedEvent(sagaId, request, response));
- }
-
- @Override
- public void abort(SagaRequest request, Exception e) {
- sagaLog.offer(new TransactionAbortedEvent(sagaId, request, e));
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/RestOperation.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/RestOperation.java
deleted file mode 100644
index d961b2e..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/RestOperation.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import org.apache.servicecomb.saga.core.application.interpreter.RestRequestChecker;
-import java.util.Map;
-
-public class RestOperation implements Operation {
-
- private final String path;
- private final String method;
- private final int retries;
- private final Map<String, Map<String, String>> params;
-
- public RestOperation(String path, String method, Map<String, Map<String, String>> params) {
- this(path, method, DEFAULT_RETRIES, params);
- }
-
- public RestOperation(String path, String method, int retries, Map<String, Map<String, String>> params) {
- RestRequestChecker.checkParameters(method, params);
-
- this.path = path;
- this.method = method;
- this.retries = retries;
- this.params = params == null? java.util.Collections.<String, Map<String, String>>emptyMap() : params;
- }
-
- public String path() {
- return path;
- }
-
- public String method() {
- return method;
- }
-
- public Map<String, Map<String, String>> params() {
- return params;
- }
-
- @Override
- public String toString() {
- return "Operation{" +
- "path='" + path + '\'' +
- ", method='" + method + '\'' +
- ", params=" + params +
- '}';
- }
-
- @Override
- public SagaResponse send(String address) {
- return SUCCESSFUL_SAGA_RESPONSE;
- }
-
- @Override
- public SagaResponse send(String address, SagaResponse response) {
- return send(address);
- }
-
- @Override
- public int retries() {
- return this.retries;
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SQLOperation.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/SQLOperation.java
deleted file mode 100644
index 5e1ad83..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SQLOperation.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import java.util.Collections;
-import java.util.List;
-
-public class SQLOperation implements Operation {
-
- private final String sql;
- private final int retries;
- private final List<List<String>> params;
-
- public SQLOperation(String sql, int retries, List<List<String>> params) {
- this.sql = sql;
- this.retries = retries;
- this.params = params == null ? Collections.<List<String>>emptyList() : params;
- }
-
- public String sql() {
- return sql;
- }
-
- public List<List<String>> params() {
- return params;
- }
-
- @Override
- public String toString() {
- return "SQLOperation{" +
- "sql='" + sql + '\'' +
- ", params=" + params +
- '}';
- }
-
- @Override
- public SagaResponse send(String datasource) {
- return SUCCESSFUL_SAGA_RESPONSE;
- }
-
- @Override
- public SagaResponse send(String datasource, SagaResponse response) {
- return send(datasource);
- }
-
- @Override
- public int retries() {
- return this.retries;
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/Saga.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/Saga.java
deleted file mode 100644
index 44f62ea..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/Saga.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import kamon.annotation.Segment;
-
-public interface Saga {
- @Segment(name = "runSaga", category = "application", library = "kamon")
- SagaResponse run();
-
- void play();
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaContext.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaContext.java
deleted file mode 100644
index 2f76031..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaContext.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-public interface SagaContext extends EventContext {
- boolean isCompensationStarted();
-
- boolean isTransactionCompleted(SagaRequest request);
-
- boolean isCompensationCompleted(SagaRequest request);
-
- void handleHangingTransactions(TransactionConsumer<SagaRequest> consumer);
-
- SagaResponse responseOf(String requestId);
-
- boolean isChosenChild(SagaRequest request);
-
- SagaResponse responseOf(String[] parentRequestIds);
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaContextImpl.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaContextImpl.java
deleted file mode 100644
index bc4253c..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaContextImpl.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentSkipListSet;
-
-
-import org.apache.servicecomb.saga.core.application.interpreter.FromJsonFormat;
-
-public class SagaContextImpl implements SagaContext {
-
- private final Map<String, SagaResponse> completedTransactions;
- private final Map<String, SagaResponse> completedCompensations;
- private final Set<String> abortedTransactions;
- private final Map<String, SagaRequest> hangingTransactions;
- private final FromJsonFormat<Set<String>> childrenExtractor;
-
- public SagaContextImpl(FromJsonFormat<Set<String>> childrenExtractor) {
- this.childrenExtractor = childrenExtractor;
- this.completedTransactions = new ConcurrentHashMap<>();
- this.completedCompensations = new HashMap<>();
- this.abortedTransactions = new ConcurrentSkipListSet<>();
- this.hangingTransactions = new ConcurrentHashMap<>();
- }
-
- @Override
- public boolean isCompensationStarted() {
- return !abortedTransactions.isEmpty() || !completedCompensations.isEmpty();
- }
-
- @Override
- public boolean isTransactionCompleted(SagaRequest request) {
- return completedTransactions.containsKey(request.id());
- }
-
- @Override
- public boolean isCompensationCompleted(SagaRequest request) {
- return completedCompensations.containsKey(request.id());
- }
-
- @Override
- public void beginTransaction(SagaRequest request) {
- hangingTransactions.put(request.id(), request);
- }
-
- @Override
- public void endTransaction(SagaRequest request, SagaResponse response) {
- completedTransactions.put(request.id(), response);
- hangingTransactions.remove(request.id());
- }
-
- @Override
- public void abortTransaction(SagaRequest request, SagaResponse response) {
- completedTransactions.remove(request.id());
- abortedTransactions.add(request.id());
- hangingTransactions.remove(request.id());
- }
-
- @Override
- public void compensateTransaction(SagaRequest request, SagaResponse response) {
- completedCompensations.put(request.id(), response);
- completedTransactions.remove(request.id());
- }
-
- @Override
- public void handleHangingTransactions(TransactionConsumer<SagaRequest> consumer) {
- for (Iterator<SagaRequest> iterator = hangingTransactions.values().iterator(); iterator.hasNext(); ) {
- consumer.accept(iterator.next());
- }
- }
-
- @Override
- public SagaResponse responseOf(String requestId) {
- SagaResponse response = completedTransactions.get(requestId);
- if (response == null) {
- response = SagaResponse.NONE_RESPONSE;
- }
- return response;
- }
-
- private List<SagaResponse> responsesOf(String[] parentRequestIds) {
- List<SagaResponse> result = new ArrayList<>();
- for(String parentRequestId: parentRequestIds) {
- result.add(responseOf(parentRequestId));
- }
- return result;
- }
-
- @Override
- public SagaResponse responseOf(String[] parentRequestIds) {
- List<SagaResponse> responses = responsesOf(parentRequestIds);
-
- if (responses.isEmpty()) {
- return SagaResponse.EMPTY_RESPONSE;
- }
-
- if (responses.size() == 1) {
- return responses.get(0);
- }
-
- return new CompositeSagaResponse(responses);
- }
-
- @Override
- public boolean isChosenChild(SagaRequest request) {
- Set<String> chosenChildren = chosenChildrenOf(request.parents());
- return chosenChildren.isEmpty() || chosenChildren.contains(request.id());
- }
-
- private Set<String> chosenChildrenOf(String[] parentRequestIds) {
- Set<String> result = new HashSet<>();
- for(String parentRequestId: parentRequestIds) {
- SagaResponse response = responseOf(parentRequestId);
- Set<String> jsons = childrenExtractor.fromJson(response.body());
- for (String json : jsons) {
- result.add(json);
- }
- }
- return result;
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaDefinition.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaDefinition.java
deleted file mode 100644
index 406c8df..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaDefinition.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-public interface SagaDefinition {
-
- RecoveryPolicy policy();
-
- SagaRequest[] requests();
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaEndTask.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaEndTask.java
deleted file mode 100644
index 69daba7..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaEndTask.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import kamon.annotation.EnableKamon;
-import kamon.annotation.Segment;
-
-@EnableKamon
-public class SagaEndTask implements SagaTask {
-
- private final String sagaId;
- private final SagaLog sagaLog;
-
- public SagaEndTask(String sagaId, SagaLog sagaLog) {
- this.sagaId = sagaId;
- this.sagaLog = sagaLog;
- }
-
- @Segment(name = "endTaskCommit", category = "application", library = "kamon")
- @Override
- public SagaResponse commit(SagaRequest request, SagaResponse parentResponse) {
- sagaLog.offer(new SagaEndedEvent(sagaId, request));
- return SagaResponse.EMPTY_RESPONSE;
- }
-
- @Override
- public void compensate(SagaRequest request) {
- }
-
- @Override
- public void abort(SagaRequest request, Exception e) {
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaEndedEvent.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaEndedEvent.java
deleted file mode 100644
index c6f4f9f..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaEndedEvent.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-public class SagaEndedEvent extends SagaEvent {
-
- public SagaEndedEvent(String sagaId, SagaRequest sagaTask) {
- super(sagaId, sagaTask);
- }
-
- @Override
- public void gatherTo(EventContext sagaContext) {
- sagaContext.endTransaction(payload(), SagaResponse.EMPTY_RESPONSE);
- }
-
- @Override
- public String toString() {
- return "SagaEndedEvent{id="
- + payload().id()
- + ", sagaId=" + sagaId
- + "}";
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaEvent.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaEvent.java
deleted file mode 100644
index ffe31d0..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaEvent.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-public abstract class SagaEvent implements Descriptive {
-
- public final String sagaId;
- private final SagaRequest payload;
-
- public SagaEvent(String sagaId, SagaRequest payload) {
- this.sagaId = sagaId;
- this.payload = payload;
- }
-
- public SagaRequest payload() {
- return payload;
- }
-
- public abstract void gatherTo(EventContext sagaContext);
-
- public String json(ToJsonFormat toJsonFormat) {
- return "{}";
- }
-
- @Override
- public String description() {
- return getClass().getSimpleName();
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaException.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaException.java
deleted file mode 100644
index 49ce989..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaException.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-public class SagaException extends RuntimeException {
-
- public SagaException(String cause, Throwable e) {
- super(cause, e);
- }
-
- public SagaException(String cause) {
- super(cause);
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaLog.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaLog.java
deleted file mode 100644
index 2e07b9f..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaLog.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-public interface SagaLog extends PersistentLog {
-
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaRequest.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaRequest.java
deleted file mode 100644
index 4578e42..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaRequest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-public interface SagaRequest {
-
- String PARAM_FORM = "form";
- String PARAM_JSON = "json";
- String PARAM_JSON_BODY = "body";
- String PARAM_QUERY = "query";
-
- Transaction transaction();
-
- Compensation compensation();
-
- Fallback fallback();
-
- String serviceName();
-
- String id();
-
- String type();
-
- String task();
-
- String[] parents();
-
- int failRetryDelayMilliseconds();
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaRequestImpl.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaRequestImpl.java
deleted file mode 100644
index cbb7a23..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaRequestImpl.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import static org.apache.servicecomb.saga.core.Fallback.NOP_FALLBACK;
-
-import java.util.Arrays;
-
-public class SagaRequestImpl implements SagaRequest {
-
- private final String id;
- private final String serviceName;
- private final String type;
- private final Transaction transaction;
- private final Compensation compensation;
- private final String[] parents;
- private final Fallback fallback;
- private final int failRetryDelayMilliseconds;
-
- public SagaRequestImpl(
- String id,
- String serviceName,
- String type,
- Transaction transaction,
- Compensation compensation,
- Fallback fallback,
- String[] parents,
- int failRetryDelayMilliseconds) {
-
- this.id = id;
- this.serviceName = serviceName;
- this.type = type;
- this.transaction = transaction;
- this.compensation = compensation;
- this.fallback = fallback;
- this.failRetryDelayMilliseconds = failRetryDelayMilliseconds <= 0 ? 50 : failRetryDelayMilliseconds;
- // TODO: 2017/10/21 set parent to root when null
- this.parents = parents == null ? new String[0] : parents;
- }
-
- public SagaRequestImpl(
- String id,
- String serviceName,
- String type,
- Transaction transaction,
- Compensation compensation,
- Fallback fallback,
- String[] parents) {
- this(id, serviceName, type, transaction, compensation, fallback, parents, 0);
- }
-
- public SagaRequestImpl(
- String id,
- String serviceName,
- String type,
- Transaction transaction,
- Compensation compensation,
- Fallback fallback) {
- this(id, serviceName, type, transaction, compensation, fallback, new String[0]);
- }
-
- public SagaRequestImpl(
- String id,
- String serviceName,
- String type,
- Transaction transaction,
- Compensation compensation) {
- this(id, serviceName, type, transaction, compensation, NOP_FALLBACK, new String[0]);
- }
-
- public SagaRequestImpl(
- String id,
- String serviceName,
- String type,
- Transaction transaction,
- Compensation compensation,
- String[] parents) {
- this(id, serviceName, type, transaction, compensation, NOP_FALLBACK, parents);
- }
-
- @Override
- public Transaction transaction() {
- return transaction;
- }
-
- @Override
- public Compensation compensation() {
- return compensation;
- }
-
- @Override
- public Fallback fallback() {
- return fallback;
- }
-
- @Override
- public String serviceName() {
- return serviceName;
- }
-
- @Override
- public String id() {
- return id;
- }
-
- @Override
- public String type() {
- return type;
- }
-
- @Override
- public String task() {
- return SagaTask.SAGA_REQUEST_TASK;
- }
-
- @Override
- public String[] parents() {
- return parents;
- }
-
- @Override
- public int failRetryDelayMilliseconds() {
- return failRetryDelayMilliseconds;
- }
-
- @Override
- public String toString() {
- return "SagaRequest{" +
- "id='" + id + '\'' +
- ", serviceName='" + serviceName + '\'' +
- ", type='" + type + '\'' +
- ", transaction=" + transaction +
- ", compensation=" + compensation +
- ", fallback=" + fallback +
- ", parents=" + Arrays.toString(parents) +
- '}';
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaResponse.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaResponse.java
deleted file mode 100644
index ecdfe4a..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaResponse.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-public interface SagaResponse {
-
- SagaResponse EMPTY_RESPONSE = new SagaResponse() {
- @Override
- public boolean succeeded() {
- return true;
- }
-
- @Override
- public String body() {
- return "{}";
- }
-
- @Override
- public String toString() {
- return "EMPTY_RESPONSE{body={}}";
- }
- };
-
- SagaResponse NONE_RESPONSE = new SagaResponse() {
- @Override
- public boolean succeeded() {
- return false;
- }
-
- @Override
- public String body() {
- return "{\n"
- + " \"sagaChildren\": [\"none\"]\n"
- + "}";
- }
-
- @Override
- public String toString() {
- return "NONE_RESPONSE{body={\"sagaChildren\": [\"none\"]\n}}";
- }
- };
-
- boolean succeeded();
-
- String body();
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaStartFailedException.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaStartFailedException.java
deleted file mode 100644
index 0de35da..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaStartFailedException.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-public class SagaStartFailedException extends RuntimeException {
-
- public SagaStartFailedException(String cause, Throwable e) {
- super(cause, e);
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaStartTask.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaStartTask.java
deleted file mode 100644
index d8a6bd1..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaStartTask.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import kamon.annotation.EnableKamon;
-import kamon.annotation.Segment;
-
-@EnableKamon
-public class SagaStartTask implements SagaTask {
-
- private final String sagaId;
- private final String requestJson;
- private final SagaLog sagaLog;
-
- public SagaStartTask(String sagaId, String requestJson, SagaLog sagaLog) {
- this.sagaId = sagaId;
- this.requestJson = requestJson;
- this.sagaLog = sagaLog;
- }
-
- @Segment(name = "startTaskCommit", category = "application", library = "kamon")
- @Override
- public SagaResponse commit(SagaRequest request, SagaResponse parentResponse) {
- try {
- sagaLog.offer(new SagaStartedEvent(sagaId, requestJson, request));
- } catch (Exception e) {
- throw new SagaStartFailedException("Failed to persist SagaStartedEvent for " + requestJson, e);
- }
- return SagaResponse.EMPTY_RESPONSE;
- }
-
- @Override
- public void compensate(SagaRequest request) {
- sagaLog.offer(new SagaEndedEvent(sagaId, request));
- }
-
- @Override
- public void abort(SagaRequest request, Exception e) {
-
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaStartedEvent.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaStartedEvent.java
deleted file mode 100644
index 0d82fee..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaStartedEvent.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-public class SagaStartedEvent extends SagaEvent {
-
- private final String requestJson;
-
- public SagaStartedEvent(String sagaId, String requestJson, SagaRequest request) {
- super(sagaId, request);
- this.requestJson = requestJson;
- }
-
- @Override
- public void gatherTo(EventContext sagaContext) {
- sagaContext.endTransaction(payload(), SagaResponse.EMPTY_RESPONSE);
- }
-
- @Override
- public String json(ToJsonFormat toJsonFormat) {
- return requestJson;
- }
-
- @Override
- public String toString() {
- return "SagaStartedEvent{id="
- + payload().id()
- + ", sagaId=" + sagaId
- + "}";
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaState.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaState.java
deleted file mode 100644
index eae3678..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaState.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-interface SagaState {
-
- boolean hasNext();
-
- void run();
-
- void replay();
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaTask.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaTask.java
deleted file mode 100644
index 73efcc0..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaTask.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-public interface SagaTask {
-
- String SAGA_START_TASK = "SagaStart";
- String SAGA_REQUEST_TASK = "SagaRequest";
- String SAGA_END_TASK = "SagaEnd";
-
- SagaResponse commit(SagaRequest request, SagaResponse parentResponse);
-
- void compensate(SagaRequest request);
-
- void abort(SagaRequest request, Exception e);
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaTaskFactory.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaTaskFactory.java
deleted file mode 100644
index b6d9585..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SagaTaskFactory.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import java.lang.invoke.MethodHandles;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class SagaTaskFactory {
- private final FallbackPolicy fallbackPolicy;
- private final RetrySagaLog retrySagaLog;
- private final PersistentStore persistentStore;
-
- public SagaTaskFactory(int retryDelay, PersistentStore persistentStore) {
- this.persistentStore = persistentStore;
-
- fallbackPolicy = new FallbackPolicy(retryDelay);
- retrySagaLog = new RetrySagaLog(persistentStore, retryDelay);
- }
-
- public Map<String, SagaTask> sagaTasks(final String sagaId,
- final String requestJson,
- final RecoveryPolicy recoveryPolicy,
- final EventStore sagaLog) {
-
- final SagaLog compositeSagaLog = compositeSagaLog(sagaLog, persistentStore);
-
- return new HashMap<String, SagaTask>() {{
- put(SagaTask.SAGA_START_TASK, new SagaStartTask(sagaId, requestJson, compositeSagaLog));
-
- SagaLog retrySagaLog = compositeSagaLog(sagaLog, SagaTaskFactory.this.retrySagaLog);
- put(SagaTask.SAGA_REQUEST_TASK,
- new RequestProcessTask(sagaId, retrySagaLog, new LoggingRecoveryPolicy(recoveryPolicy), fallbackPolicy));
- put(SagaTask.SAGA_END_TASK, new SagaEndTask(sagaId, retrySagaLog));
- }};
- }
-
- private CompositeSagaLog compositeSagaLog(SagaLog sagaLog, PersistentLog persistentLog) {
- return new CompositeSagaLog(sagaLog, persistentLog);
- }
-
- static class RetrySagaLog implements PersistentLog {
-
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
- private final PersistentStore persistentStore;
- private final int retryDelay;
-
- RetrySagaLog(PersistentStore persistentStore, int retryDelay) {
- this.persistentStore = persistentStore;
- this.retryDelay = retryDelay;
- }
-
- @Override
- public void offer(SagaEvent sagaEvent) {
- boolean success = false;
- do {
- try {
- persistentStore.offer(sagaEvent);
- success = true;
- log.info("Persisted saga event {} successfully", sagaEvent);
- } catch (Exception e) {
- log.error("Failed to persist saga event {}", sagaEvent, e);
- sleep(retryDelay);
- }
- } while (!success && !isInterrupted());
- }
-
- private boolean isInterrupted() {
- return Thread.currentThread().isInterrupted();
- }
-
- private void sleep(int delay) {
- try {
- Thread.sleep(delay);
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- }
- }
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SuccessfulSagaResponse.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/SuccessfulSagaResponse.java
deleted file mode 100644
index d69bdcd..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/SuccessfulSagaResponse.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-public class SuccessfulSagaResponse implements SagaResponse {
- private final String body;
-
- public SuccessfulSagaResponse(String body) {
- this.body = body;
- }
-
- @Override
- public boolean succeeded() {
- return true;
- }
-
- @Override
- public String body() {
- return body;
- }
-
- @Override
- public String toString() {
- return "SuccessfulSagaResponse{" +
- "body='" + body + '\'' +
- '}';
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/TaskConsumer.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/TaskConsumer.java
deleted file mode 100644
index 5ae7494..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/TaskConsumer.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import java.util.Collection;
-
-import org.apache.servicecomb.saga.core.dag.Node;
-
-interface TaskConsumer {
-
- void consume(Collection<Node<SagaRequest>> nodes);
-
- boolean replay(Collection<Node<SagaRequest>> nodes);
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/TaskRunner.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/TaskRunner.java
deleted file mode 100644
index c078001..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/TaskRunner.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import org.apache.servicecomb.saga.core.dag.Node;
-import org.apache.servicecomb.saga.core.dag.Traveller;
-
-import java.util.Collection;
-
-import kamon.annotation.EnableKamon;
-import kamon.annotation.Segment;
-
-@EnableKamon
-class TaskRunner implements SagaState {
-
- private final Traveller<SagaRequest> traveller;
- private final TaskConsumer taskConsumer;
-
- TaskRunner(Traveller<SagaRequest> traveller, TaskConsumer taskConsumer) {
- this.traveller = traveller;
- this.taskConsumer = taskConsumer;
- }
-
- @Override
- public boolean hasNext() {
- return traveller.hasNext();
- }
-
- @Segment(name = "runTask", category = "application", library = "kamon")
- @Override
- public void run() {
- Collection<Node<SagaRequest>> nodes = traveller.nodes();
-
- // finish pending tasks from saga log at startup
- if (!nodes.isEmpty()) {
- taskConsumer.consume(nodes);
- nodes.clear();
- }
-
- while (traveller.hasNext()) {
- traveller.next();
- taskConsumer.consume(nodes);
- nodes.clear();
- }
- }
-
- @Override
- public void replay() {
- boolean played = false;
- Collection<Node<SagaRequest>> nodes = traveller.nodes();
-
- while (traveller.hasNext() && !played) {
- traveller.next();
- played = taskConsumer.replay(nodes);
- }
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/ToJsonFormat.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/ToJsonFormat.java
deleted file mode 100644
index cd6c449..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/ToJsonFormat.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-public interface ToJsonFormat {
-
- String toJson(SagaRequest request);
-
- String toJson(SagaRequest request, SagaResponse response);
-
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/Transaction.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/Transaction.java
deleted file mode 100644
index a6d4c54..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/Transaction.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-public interface Transaction extends Operation {
-
- Transaction SAGA_START_TRANSACTION = new Transaction() {
- @Override
- public int retries() {
- return INFINITE_RETRY;
- }
-
- @Override
- public SagaResponse send(String address) {
- return SUCCESSFUL_SAGA_RESPONSE;
- }
-
- @Override
- public SagaResponse send(String address, SagaResponse response) {
- return send(address);
- }
- };
-
- Transaction SAGA_END_TRANSACTION = new Transaction() {
- @Override
- public int retries() {
- return INFINITE_RETRY;
- }
-
- @Override
- public SagaResponse send(String address) {
- return SUCCESSFUL_SAGA_RESPONSE;
- }
-
- @Override
- public SagaResponse send(String address, SagaResponse response) {
- return send(address);
- }
- };
-
- int INFINITE_RETRY = -1;
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/TransactionAbortedEvent.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/TransactionAbortedEvent.java
deleted file mode 100644
index b117c94..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/TransactionAbortedEvent.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-public class TransactionAbortedEvent extends SagaEvent {
-
- private final SagaResponse response;
-
- public TransactionAbortedEvent(String sagaId, SagaRequest payload, Exception exception) {
- super(sagaId, payload);
- this.response = new FailedSagaResponse(exception);
- }
-
- public TransactionAbortedEvent(String sagaId, SagaRequest payload, SagaResponse response) {
- super(sagaId, payload);
- this.response = response;
- }
-
- @Override
- public void gatherTo(EventContext sagaContext) {
- // remove from completed operations in order not to compensate it
- sagaContext.abortTransaction(payload(), response);
- }
-
- @Override
- public String json(ToJsonFormat toJsonFormat) {
- return toJsonFormat.toJson(payload(), response);
- }
-
- @Override
- public String toString() {
- return "TransactionAbortedEvent{id="
- + payload().id()
- + ", operation="
- + payload().compensation()
- + "}";
- }
-
- public SagaResponse response() {
- return response;
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/TransactionAbortedException.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/TransactionAbortedException.java
deleted file mode 100644
index 02cbf98..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/TransactionAbortedException.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-public class TransactionAbortedException extends RuntimeException{
- public TransactionAbortedException(Throwable throwable) {
- super(throwable);
- }
-
- public TransactionAbortedException(String cause) {
- super(cause);
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/TransactionCompensatedEvent.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/TransactionCompensatedEvent.java
deleted file mode 100644
index d6ab298..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/TransactionCompensatedEvent.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-public class TransactionCompensatedEvent extends SagaEvent {
-
- private final SagaResponse response;
-
- public TransactionCompensatedEvent(String sagaId, SagaRequest request) {
- this(sagaId, request, SagaResponse.EMPTY_RESPONSE);
- }
-
- public TransactionCompensatedEvent(String sagaId, SagaRequest request, SagaResponse response) {
- super(sagaId, request);
- this.response = response;
- }
-
- @Override
- public void gatherTo(EventContext sagaContext) {
- sagaContext.compensateTransaction(payload(), response);
- }
-
- @Override
- public String json(ToJsonFormat toJsonFormat) {
- return toJsonFormat.toJson(payload(), response);
- }
-
- @Override
- public String toString() {
- return "TransactionCompensatedEvent{id="
- + payload().id()
- + ", sagaId=" + sagaId
- + ", operation="
- + payload().compensation()
- + "}";
- }
-
- public SagaResponse response() {
- return response;
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/TransactionConsumer.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/TransactionConsumer.java
deleted file mode 100644
index b5bb098..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/TransactionConsumer.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.apache.servicecomb.saga.core;
-
-public interface TransactionConsumer<T> {
- void accept(T request);
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/TransactionEndedEvent.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/TransactionEndedEvent.java
deleted file mode 100644
index 603c542..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/TransactionEndedEvent.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-public class TransactionEndedEvent extends SagaEvent {
-
- private final SagaResponse response;
-
- public TransactionEndedEvent(String sagaId, SagaRequest request) {
- this(sagaId, request, SagaResponse.EMPTY_RESPONSE);
- }
-
- public TransactionEndedEvent(String sagaId, SagaRequest request, SagaResponse response) {
- super(sagaId, request);
- this.response = response;
- }
-
- @Override
- public void gatherTo(EventContext sagaContext) {
- sagaContext.endTransaction(payload(), response);
- }
-
- @Override
- public String toString() {
- return "TransactionEndedEvent{id="
- + payload().id()
- + ", sagaId=" + sagaId
- + ", operation="
- + payload().transaction()
- + "}";
- }
-
- @Override
- public String json(ToJsonFormat toJsonFormat) {
- return toJsonFormat.toJson(payload(), response);
- }
-
- public SagaResponse response() {
- return response;
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/TransactionFailedException.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/TransactionFailedException.java
deleted file mode 100644
index b55e01a..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/TransactionFailedException.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-public class TransactionFailedException extends RuntimeException {
-
- public TransactionFailedException(Throwable throwable) {
- super(throwable);
- }
-
- public TransactionFailedException(String cause) {
- super(cause);
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/TransactionStartedEvent.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/TransactionStartedEvent.java
deleted file mode 100644
index cc35589..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/TransactionStartedEvent.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-public class TransactionStartedEvent extends SagaEvent {
-
- public TransactionStartedEvent(String sagaId, SagaRequest transaction) {
- super(sagaId, transaction);
- }
-
- @Override
- public void gatherTo(EventContext sagaContext) {
- sagaContext.beginTransaction(payload());
- }
-
- @Override
- public String toString() {
- return "TransactionStartedEvent{id="
- + payload().id()
- + ", sagaId=" + sagaId
- + ", operation="
- + payload().transaction()
- + "}";
- }
-
- @Override
- public String json(ToJsonFormat toJsonFormat) {
- return toJsonFormat.toJson(payload());
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/TransactionTaskConsumer.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/TransactionTaskConsumer.java
deleted file mode 100644
index ac470a0..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/TransactionTaskConsumer.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import org.apache.servicecomb.saga.core.dag.Node;
-import java.lang.invoke.MethodHandles;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CompletionService;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-
-import kamon.annotation.EnableKamon;
-import kamon.annotation.Segment;
-import kamon.annotation.Trace;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@EnableKamon
-class TransactionTaskConsumer implements TaskConsumer {
-
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
- private final Map<String, SagaTask> tasks;
- private final SagaContext sagaContext;
- private final CompletionService<Operation> executorService;
-
- TransactionTaskConsumer(
- Map<String, SagaTask> tasks,
- SagaContext sagaContext,
- CompletionService<Operation> executorService) {
-
- this.tasks = tasks;
- this.sagaContext = sagaContext;
- this.executorService = executorService;
- }
-
- @Segment(name = "consumeTask", category = "application", library = "kamon")
- @Override
- public void consume(Collection<Node<SagaRequest>> nodes) {
- List<Future<Operation>> futures = new ArrayList<>(nodes.size());
- for (Node<SagaRequest> node : nodes) {
- SagaRequest request = node.value();
- if (sagaContext.isChosenChild(request)) {
- futures.add(futureOf(request));
- }
- }
-
- for (int i = 0; i < futures.size(); i++) {
- try {
- executorService.take().get();
- } catch (ExecutionException e) {
- if (e.getCause() instanceof SagaStartFailedException) {
- throw ((SagaStartFailedException) e.getCause());
- }
- if (e.getCause() instanceof TransactionAbortedException) {
- throw ((TransactionAbortedException) e.getCause());
- }
- throw new TransactionFailedException(e.getCause());
- } catch (InterruptedException e) {
- // TODO: 7/29/2017 what shall we do when system is shutting down?
- throw new TransactionFailedException(e);
- }
- }
- }
-
- @Override
- public boolean replay(Collection<Node<SagaRequest>> nodes) {
- for (Iterator<Node<SagaRequest>> iterator = nodes.iterator(); iterator.hasNext(); ) {
- SagaRequest request = iterator.next().value();
- if (sagaContext.isTransactionCompleted(request)) {
- log.info("Skipped completed transaction id={} operation={} while replay", request.id(), request.transaction());
- iterator.remove();
- }
- }
- return !nodes.isEmpty();
- }
-
- @Segment(name = "submitCallable", category = "application", library = "kamon")
- private Future<Operation> futureOf(SagaRequest request) {
- return executorService.submit(new OperationCallable(tasks, request, sagaContext.responseOf(request.parents())));
- }
-
- @EnableKamon
- private static class OperationCallable implements Callable<Operation> {
-
- private final SagaRequest request;
- private final Map<String, SagaTask> tasks;
- private final SagaResponse parentResponse;
-
- private OperationCallable(
- Map<String, SagaTask> tasks,
- SagaRequest request,
- SagaResponse parentResponse) {
- this.request = request;
- this.tasks = tasks;
- this.parentResponse = parentResponse;
- }
-
- @Trace("runTransactionCallable")
- @Override
- public Operation call() throws Exception {
- tasks.get(request.task()).commit(request, parentResponse);
- return request.transaction();
- }
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/Transport.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/Transport.java
deleted file mode 100644
index 5679e0a..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/Transport.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-public interface Transport {
-
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/TransportFailedException.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/TransportFailedException.java
deleted file mode 100644
index e01a9d5..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/TransportFailedException.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-public class TransportFailedException extends RuntimeException {
- public TransportFailedException(String cause) {
- super(cause);
- }
-
- public TransportFailedException(String cause, Throwable e) {
- super(cause, e);
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/application/SagaExecutionComponent.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/application/SagaExecutionComponent.java
deleted file mode 100644
index 7a600d7..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/application/SagaExecutionComponent.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.application;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.UUID;
-
-import org.apache.servicecomb.saga.core.EventEnvelope;
-import org.apache.servicecomb.saga.core.EventStore;
-import org.apache.servicecomb.saga.core.Saga;
-import org.apache.servicecomb.saga.core.SagaResponse;
-import org.apache.servicecomb.saga.core.ToJsonFormat;
-import org.apache.servicecomb.saga.core.PersistentStore;
-import org.apache.servicecomb.saga.core.SagaDefinition;
-import org.apache.servicecomb.saga.core.SagaEvent;
-import org.apache.servicecomb.saga.core.application.interpreter.FromJsonFormat;
-import org.apache.servicecomb.saga.infrastructure.EmbeddedEventStore;
-import kamon.annotation.EnableKamon;
-import kamon.annotation.Segment;
-
-@EnableKamon
-public class SagaExecutionComponent {
-
- private final PersistentStore persistentStore;
- private final FromJsonFormat<SagaDefinition> fromJsonFormat;
- private final ToJsonFormat toJsonFormat;
- private final SagaFactory sagaFactory;
-
- public SagaExecutionComponent(
- PersistentStore persistentStore,
- FromJsonFormat<SagaDefinition> fromJsonFormat,
- ToJsonFormat toJsonFormat,
- SagaFactory sagaFactory) {
- this.persistentStore = persistentStore;
- this.fromJsonFormat = fromJsonFormat;
- this.toJsonFormat = toJsonFormat;
- this.sagaFactory = sagaFactory;
- }
-
- @Segment(name = "runSagaExecutionComponent", category = "application", library = "kamon")
- public SagaResponse run(String requestJson) {
- String sagaId = UUID.randomUUID().toString();
- EventStore sagaLog = new EmbeddedEventStore();
- SagaDefinition definition = fromJsonFormat.fromJson(requestJson);
- Saga saga = sagaFactory.createSaga(requestJson, sagaId, sagaLog, definition);
- return saga.run();
- }
-
- public void reanimate() {
- Map<String, List<EventEnvelope>> pendingSagaEvents = persistentStore.findPendingSagaEvents();
-
- for (Entry<String, List<EventEnvelope>> entry : pendingSagaEvents.entrySet()) {
- EventStore eventStore = new EmbeddedEventStore();
- eventStore.populate(entry.getValue());
- SagaEvent event = entry.getValue().iterator().next().event;
-
- String requestJson = event.json(toJsonFormat);
- SagaDefinition definition = fromJsonFormat.fromJson(requestJson);
-
- Saga saga = sagaFactory.createSaga(requestJson, event.sagaId, eventStore, definition);
-
- saga.play();
- saga.run();
- }
- }
-
- public void terminate() throws Exception {
- sagaFactory.terminate();
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/application/SagaFactory.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/application/SagaFactory.java
deleted file mode 100644
index b60b5e7..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/application/SagaFactory.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.application;
-
-import org.apache.servicecomb.saga.core.EventStore;
-import org.apache.servicecomb.saga.core.Saga;
-import org.apache.servicecomb.saga.core.SagaDefinition;
-
-public interface SagaFactory {
- Saga createSaga(String requestJson, String sagaId, EventStore sagaLog, SagaDefinition definition);
-
- boolean isTerminated();
-
- void terminate() throws Exception;
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/application/interpreter/FromJsonFormat.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/application/interpreter/FromJsonFormat.java
deleted file mode 100644
index ccfb408..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/application/interpreter/FromJsonFormat.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.application.interpreter;
-
-public interface FromJsonFormat<T> {
-
- T fromJson(String requestJson);
-
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/application/interpreter/RestRequestChecker.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/application/interpreter/RestRequestChecker.java
deleted file mode 100644
index 7a65e48..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/application/interpreter/RestRequestChecker.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.application.interpreter;
-
-import static java.util.Arrays.asList;
-
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-public class RestRequestChecker {
-
- private static final Set<String> validMethods = new HashSet<>(asList(
- "GET",
- "POST",
- "PUT",
- "DELETE"
- ));
-
- private RestRequestChecker() {
- }
-
- public static void checkParameters(String method, Map<String, Map<String, String>> params) {
- if (method == null || !validMethods.contains(method.toUpperCase())) {
- throw new IllegalArgumentException("Unsupported method " + method);
- }
-
- if (isDeleteOrGet(method) && hasBody(params)) {
- throw new IllegalArgumentException("GET & DELETE request cannot enclose a body");
- }
- }
-
- private static boolean isDeleteOrGet(String method) {
- return "GET".equalsIgnoreCase(method) || "DELETE".equalsIgnoreCase(method);
- }
-
- private static boolean hasBody(Map<String, Map<String, String>> params) {
- return params != null && (params.containsKey("form") || params.containsKey("json"));
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/ByLevelTraveller.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/ByLevelTraveller.java
deleted file mode 100644
index 2489117..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/ByLevelTraveller.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.dag;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.Queue;
-import java.util.Set;
-import kamon.annotation.EnableKamon;
-import kamon.annotation.Segment;
-
-@EnableKamon
-public class ByLevelTraveller<T> implements Traveller<T> {
-
- private final Collection<Node<T>> nodes;
- private final Collection<Node<T>> nodesBuffer;
-
- private final Queue<Node<T>> nodesWithoutParent = new LinkedList<>();
- private final Map<Long, Set<Node<T>>> nodeParents = new HashMap<>();
- private final TraversalDirection<T> traversalDirection;
-
-
- public ByLevelTraveller(SingleLeafDirectedAcyclicGraph<T> dag, TraversalDirection<T> traversalDirection) {
- this.nodes = new LinkedHashSet<>();
- this.nodesBuffer = new LinkedList<>();
- this.traversalDirection = traversalDirection;
-
- nodesWithoutParent.offer(traversalDirection.root(dag));
- }
-
- @Segment(name = "travelNext", category = "application", library = "kamon")
- @Override
- public void next() {
- nodes.addAll(nodesBuffer);
- nodesBuffer.clear();
- boolean buffered = false;
-
- while (!nodesWithoutParent.isEmpty() && !buffered) {
- Node<T> node = nodesWithoutParent.poll();
- nodes.add(node);
-
- for (Node<T> child : traversalDirection.children(node)) {
- // This is not thread safe
- if (nodeParents.get(child.id()) == null) {
- nodeParents.put(child.id(), new HashSet<>(traversalDirection.parents(child)));
- }
- nodeParents.get(child.id()).remove(node);
-
- if (nodeParents.get(child.id()).isEmpty()) {
- nodesWithoutParent.offer(child);
- nodesBuffer.add(child);
- buffered = true;
- }
- }
- }
- }
-
- @Override
- public boolean hasNext() {
- return !nodesWithoutParent.isEmpty();
- }
-
- @Override
- public Collection<Node<T>> nodes() {
- return nodes;
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/FromLeafTraversalDirection.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/FromLeafTraversalDirection.java
deleted file mode 100644
index d97c40f..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/FromLeafTraversalDirection.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.dag;
-
-import java.util.Set;
-
-public class FromLeafTraversalDirection<T> implements TraversalDirection<T> {
-
- @Override
- public Node<T> root(SingleLeafDirectedAcyclicGraph<T> dag) {
- return dag.leaf();
- }
-
- @Override
- public Set<Node<T>> parents(Node<T> node) {
- return node.children();
- }
-
- @Override
- public Set<Node<T>> children(Node<T> node) {
- return node.parents();
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/FromRootTraversalDirection.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/FromRootTraversalDirection.java
deleted file mode 100644
index 8c664ac..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/FromRootTraversalDirection.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.dag;
-
-import java.util.Set;
-
-public class FromRootTraversalDirection<T> implements TraversalDirection<T> {
-
- @Override
- public Node<T> root(SingleLeafDirectedAcyclicGraph<T> dag) {
- return dag.root();
- }
-
- @Override
- public Set<Node<T>> parents(Node<T> node) {
- return node.parents();
- }
-
- @Override
- public Set<Node<T>> children(Node<T> node) {
- return node.children();
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/GraphBasedSagaFactory.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/GraphBasedSagaFactory.java
deleted file mode 100644
index 55c71c1..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/GraphBasedSagaFactory.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.dag;
-
-import java.util.Set;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.apache.servicecomb.saga.core.EventStore;
-import org.apache.servicecomb.saga.core.GraphBasedSaga;
-import org.apache.servicecomb.saga.core.Saga;
-import org.apache.servicecomb.saga.core.SagaContext;
-import org.apache.servicecomb.saga.core.SagaContextImpl;
-import org.apache.servicecomb.saga.core.SagaRequest;
-import org.apache.servicecomb.saga.core.application.SagaFactory;
-import org.apache.servicecomb.saga.infrastructure.ContextAwareEventStore;
-import org.apache.servicecomb.saga.core.PersistentStore;
-import org.apache.servicecomb.saga.core.SagaDefinition;
-import org.apache.servicecomb.saga.core.SagaTaskFactory;
-import org.apache.servicecomb.saga.core.application.interpreter.FromJsonFormat;
-
-public class GraphBasedSagaFactory implements SagaFactory {
- private final AtomicBoolean isRunning = new AtomicBoolean(true);
- private final FromJsonFormat<Set<String>> childrenExtractor;
- private final Executor executorService;
- private final GraphBuilder graphBuilder;
- private final SagaTaskFactory sagaTaskFactory;
-
- public GraphBasedSagaFactory(int retryDelay,
- PersistentStore persistentStore,
- FromJsonFormat<Set<String>> childrenExtractor,
- ExecutorService executorService) {
-
- this.childrenExtractor = childrenExtractor;
- this.executorService = executorService;
- this.sagaTaskFactory = new SagaTaskFactory(retryDelay, persistentStore);
- this.graphBuilder = new GraphBuilder(new GraphCycleDetectorImpl<SagaRequest>());
- }
-
- @Override
- public Saga createSaga(String requestJson, String sagaId, EventStore sagaLog, SagaDefinition definition) {
- SagaContext sagaContext = new SagaContextImpl(childrenExtractor);
-
- return new GraphBasedSaga(
- sagaLog,
- executorService,
- sagaTaskFactory.sagaTasks(sagaId,
- requestJson,
- definition.policy(),
- new ContextAwareEventStore(sagaLog, sagaContext)
- ),
- sagaContext,
- graphBuilder.build(definition.requests()));
- }
-
- @Override
- public boolean isTerminated() {
- return !isRunning.get();
- }
-
- @Override
- public void terminate() throws Exception {
- isRunning.compareAndSet(true, false);
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/GraphBuilder.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/GraphBuilder.java
deleted file mode 100644
index c5cd850..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/GraphBuilder.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.dag;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.servicecomb.saga.core.NoOpSagaRequest;
-import org.apache.servicecomb.saga.core.SagaException;
-import org.apache.servicecomb.saga.core.SagaRequest;
-
-import kamon.annotation.EnableKamon;
-import kamon.annotation.Segment;
-
-@EnableKamon
-public class GraphBuilder {
-
- private final GraphCycleDetector<SagaRequest> detector;
-
- public GraphBuilder(GraphCycleDetector<SagaRequest> detector) {
- this.detector = detector;
- }
-
- @Segment(name = "buildGraph", category = "application", library = "kamon")
- public SingleLeafDirectedAcyclicGraph<SagaRequest> build(SagaRequest[] sagaRequests) {
- Map<String, Node<SagaRequest>> requestNodes = requestsToNodes(sagaRequests);
-
- SingleLeafDirectedAcyclicGraph<SagaRequest> graph = linkNodesToGraph(sagaRequests, requestNodes);
- detectCycle(graph);
- return graph;
- }
-
- private SingleLeafDirectedAcyclicGraph<SagaRequest> linkNodesToGraph(
- SagaRequest[] sagaRequests,
- Map<String, Node<SagaRequest>> requestNodes) {
-
- Node<SagaRequest> root = rootNode(0);
- Node<SagaRequest> leaf = leafNode(sagaRequests.length + 1);
-
- for (SagaRequest sagaRequest : sagaRequests) {
- if (isOrphan(sagaRequest)) {
- root.addChild(requestNodes.get(sagaRequest.id()));
- } else {
- for (String parent : sagaRequest.parents()) {
- requestNodes.get(parent).addChild(requestNodes.get(sagaRequest.id()));
- }
- }
- }
-
- for(Node<SagaRequest> node : requestNodes.values()) {
- if (node.children().isEmpty()) {
- node.addChild(leaf);
- }
- }
- return new SingleLeafDirectedAcyclicGraph<>(root, leaf);
- }
-
- private Node<SagaRequest> rootNode(int id) {
- return new Node<>(
- id,
- NoOpSagaRequest.SAGA_START_REQUEST);
- }
-
- private Node<SagaRequest> leafNode(int id) {
- return new Node<>(
- id,
- NoOpSagaRequest.SAGA_END_REQUEST);
- }
-
- private boolean isOrphan(SagaRequest sagaRequest) {
- return sagaRequest.parents().length == 0;
- }
-
- private Map<String, Node<SagaRequest>> requestsToNodes(SagaRequest[] sagaRequests) {
- long index = 1;
- Map<String, Node<SagaRequest>> requestMap = new HashMap<>();
- for (SagaRequest sagaRequest : sagaRequests) {
- if (requestMap.containsKey(sagaRequest.id())) {
- // TODO: 8/20/2017 add random id if user didn't provide one
- throw new SagaException("Failed to interpret requests with duplicate request id: " + sagaRequest.id());
- }
- requestMap.put(sagaRequest.id(), new Node<>(index++, sagaRequest));
- }
- return requestMap;
- }
-
- private void detectCycle(SingleLeafDirectedAcyclicGraph<SagaRequest> graph) {
- Set<Node<SagaRequest>> jointNodes = detector.cycleJoints(graph);
-
- if (!jointNodes.isEmpty()) {
- throw new SagaException("Cycle detected in the request graph at nodes " + jointNodes);
- }
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/GraphCycleDetector.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/GraphCycleDetector.java
deleted file mode 100644
index 9b12bc8..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/GraphCycleDetector.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.dag;
-
-import java.util.Set;
-
-public interface GraphCycleDetector<T> {
-
- Set<Node<T>> cycleJoints(SingleLeafDirectedAcyclicGraph<T> graph);
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/GraphCycleDetectorImpl.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/GraphCycleDetectorImpl.java
deleted file mode 100644
index f2869b3..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/GraphCycleDetectorImpl.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.dag;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Queue;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-/**
- * Cycle detection is based on topological sort with Kahn's algorithm.
- *
- * @see <a href="https://en.wikipedia.org/wiki/Topological_sorting">Topological Sorting</a>
- */
-public class GraphCycleDetectorImpl<T> implements GraphCycleDetector<T> {
-
- @Override
- public Set<Node<T>> cycleJoints(SingleLeafDirectedAcyclicGraph<T> graph) {
- Queue<Node<T>> orphanNodes = new LinkedList<>();
- Map<Node<T>, Set<Node<T>>> nodeParents = new HashMap<>();
-
- orphanNodes.add(graph.root());
-
- traverse(orphanNodes, nodeParents);
-
- return unvisitedNodes(nodeParents);
- }
-
- // This method is not thread safe
- private void traverse(Queue<Node<T>> orphanNodes, Map<Node<T>, Set<Node<T>>> nodeParents) {
- while (!orphanNodes.isEmpty()) {
- Node<T> node = orphanNodes.poll();
-
- for(Node<T> child : node.children()) {
- Set<Node<T>> parent = nodeParents.get(child);
- if (parent == null) {
- parent = new HashSet<>(child.parents());
- nodeParents.put(child, parent);
- }
- parent.remove(node);
- if (nodeParents.get(child).isEmpty()) {
- orphanNodes.add(child);
- }
- }
- }
- }
-
- private Set<Node<T>> unvisitedNodes(Map<Node<T>, Set<Node<T>>> nodeParents) {
- Set<Node<T>> result = new HashSet<>();
- for (Map.Entry<Node<T>, Set<Node<T>>> entry : nodeParents.entrySet()) {
- if (!entry.getValue().isEmpty()) {
- result.add(entry.getKey());
- }
- }
- return result;
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/Node.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/Node.java
deleted file mode 100644
index 3e5bcad..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/Node.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.dag;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-public class Node<T> {
- private final long id;
- private final T value;
- private final Set<Node<T>> children = new HashSet<>();
- private final Set<Node<T>> parents = new HashSet<>();
-
- public Node(long id, T value) {
- this.id = id;
- this.value = value;
- }
-
- long id() {
- return id;
- }
-
- public T value() {
- return value;
- }
-
- Set<Node<T>> parents() {
- return parents;
- }
-
- public Set<Node<T>> children() {
- return children;
- }
-
- public void addChild(Node<T> node) {
- children.add(node);
- node.parents.add(this);
- }
-
- public void addChildren(Collection<Node<T>> nodes) {
- children.addAll(nodes);
- for (Node<T> node : nodes) {
- node.parents.add(this);
- }
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- Node<?> node = (Node<?>) o;
- return id == node.id;
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(id);
- }
-
- @Override
- public String toString() {
- return "Node{" +
- "id=" + id +
- ", value=" + value +
- '}';
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/SingleLeafDirectedAcyclicGraph.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/SingleLeafDirectedAcyclicGraph.java
deleted file mode 100644
index cf0d19b..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/SingleLeafDirectedAcyclicGraph.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.dag;
-
-public class SingleLeafDirectedAcyclicGraph<T> {
-
- private final Node<T> root;
- private final Node<T> leaf;
-
- public SingleLeafDirectedAcyclicGraph(Node<T> root, Node<T> leaf) {
-
- this.root = root;
- this.leaf = leaf;
- }
-
- public Node<T> root() {
- return root;
- }
-
- Node<T> leaf() {
- return leaf;
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/Traveller.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/Traveller.java
deleted file mode 100644
index e44848b..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/Traveller.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.dag;
-
-import java.util.Collection;
-
-public interface Traveller<T> {
-
- void next();
-
- boolean hasNext();
-
- Collection<Node<T>> nodes();
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/TraversalDirection.java b/saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/TraversalDirection.java
deleted file mode 100644
index 22f7343..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/core/dag/TraversalDirection.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.dag;
-
-import java.util.Set;
-
-public interface TraversalDirection<T> {
-
- Node<T> root(SingleLeafDirectedAcyclicGraph<T> dag);
-
- Set<Node<T>> parents(Node<T> node);
-
- Set<Node<T>> children(Node<T> node);
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/infrastructure/ContextAwareEventStore.java b/saga-core/src/main/java/org/apache/servicecomb/saga/infrastructure/ContextAwareEventStore.java
deleted file mode 100644
index 40fa71d..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/infrastructure/ContextAwareEventStore.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.infrastructure;
-
-import java.util.Iterator;
-
-import org.apache.servicecomb.saga.core.EventEnvelope;
-import org.apache.servicecomb.saga.core.EventStore;
-import org.apache.servicecomb.saga.core.SagaContext;
-import org.apache.servicecomb.saga.core.SagaEvent;
-
-public class ContextAwareEventStore implements EventStore {
- private final EventStore eventStore;
- private final SagaContext sagaContext;
-
- public ContextAwareEventStore(EventStore eventStore, SagaContext sagaContext) {
- this.eventStore = eventStore;
- this.sagaContext = sagaContext;
- }
-
- @Override
- public void offer(SagaEvent sagaEvent) {
- sagaEvent.gatherTo(sagaContext);
- eventStore.offer(sagaEvent);
- }
-
- @Override
- public void populate(Iterable<EventEnvelope> events) {
- eventStore.populate(events);
- }
-
- @Override
- public long size() {
- return eventStore.size();
- }
-
- @Override
- public Iterator<SagaEvent> iterator() {
- return eventStore.iterator();
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/infrastructure/EmbeddedEventStore.java b/saga-core/src/main/java/org/apache/servicecomb/saga/infrastructure/EmbeddedEventStore.java
deleted file mode 100644
index d342264..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/infrastructure/EmbeddedEventStore.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.infrastructure;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Iterator;
-import java.util.Queue;
-import java.util.concurrent.LinkedBlockingQueue;
-
-import org.apache.servicecomb.saga.core.EventEnvelope;
-import org.apache.servicecomb.saga.core.EventStore;
-import org.apache.servicecomb.saga.core.SagaEvent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class EmbeddedEventStore implements EventStore {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
- private final Queue<SagaEvent> events = new LinkedBlockingQueue<>();
-
- @Override
- public void offer(SagaEvent sagaEvent) {
- events.offer(sagaEvent);
- log.info("Added event {}", sagaEvent);
- }
-
- @Override
- public void populate(Iterable<EventEnvelope> events) {
- for (EventEnvelope event : events) {
- this.events.offer(event.event);
- log.info("Populated event {}", event);
- }
- }
-
- @Override
- public long size() {
- return events.size();
- }
-
- @Override
- public Iterator<SagaEvent> iterator() {
- return events.iterator();
- }
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/transports/RestTransport.java b/saga-core/src/main/java/org/apache/servicecomb/saga/transports/RestTransport.java
deleted file mode 100644
index 3d5bda3..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/transports/RestTransport.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.transports;
-
-import org.apache.servicecomb.saga.core.SagaResponse;
-import org.apache.servicecomb.saga.core.Transport;
-import java.util.Map;
-
-public interface RestTransport extends Transport {
-
- SagaResponse with(String address, String path, String method, Map<String, Map<String, String>> params);
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/transports/SQLTransport.java b/saga-core/src/main/java/org/apache/servicecomb/saga/transports/SQLTransport.java
deleted file mode 100644
index 9438f65..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/transports/SQLTransport.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.transports;
-
-import java.util.List;
-
-import org.apache.servicecomb.saga.core.SagaResponse;
-import org.apache.servicecomb.saga.core.Transport;
-
-public interface SQLTransport extends Transport {
-
- SagaResponse with(String datasource, String sql, List<List<String>> params);
-
-}
diff --git a/saga-core/src/main/java/org/apache/servicecomb/saga/transports/TransportFactory.java b/saga-core/src/main/java/org/apache/servicecomb/saga/transports/TransportFactory.java
deleted file mode 100644
index 053149f..0000000
--- a/saga-core/src/main/java/org/apache/servicecomb/saga/transports/TransportFactory.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.transports;
-
-import org.apache.servicecomb.saga.core.Transport;
-
-public interface TransportFactory<T extends Transport> {
-
- T getTransport();
-}
diff --git a/saga-core/src/test/java/org/apache/servicecomb/saga/core/BackwardRecoveryTest.java b/saga-core/src/test/java/org/apache/servicecomb/saga/core/BackwardRecoveryTest.java
deleted file mode 100644
index 4f03992..0000000
--- a/saga-core/src/test/java/org/apache/servicecomb/saga/core/BackwardRecoveryTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import static com.seanyinx.github.unit.scaffolding.AssertUtils.expectFailing;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import org.junit.Before;
-import org.junit.Test;
-
-public class BackwardRecoveryTest {
-
- private final String serviceName = "aaa";
- private final Transaction transaction = mock(Transaction.class);
- private final SagaTask sagaTask = mock(SagaTask.class);
- private final SagaRequest sagaRequest = mock(SagaRequest.class);
- private final SagaResponse parentResponse = mock(SagaResponse.class);
- private final BackwardRecovery backwardRecovery = new BackwardRecovery();
- private final RuntimeException exception = new RuntimeException("oops");
-
- @Before
- public void setUp() throws Exception {
- when(sagaRequest.serviceName()).thenReturn(serviceName);
- when(sagaRequest.transaction()).thenReturn(transaction);
- }
-
- @Test
- public void blowsUpWhenTaskIsNotCommitted() {
- doThrow(exception).when(transaction).send(serviceName, parentResponse);
-
- try {
- backwardRecovery.apply(sagaTask, sagaRequest, parentResponse);
- expectFailing(RuntimeException.class);
- } catch (RuntimeException ignored) {
- }
-
- verify(sagaTask).abort(sagaRequest, exception);
- }
-}
diff --git a/saga-core/src/test/java/org/apache/servicecomb/saga/core/CompensationImpl.java b/saga-core/src/test/java/org/apache/servicecomb/saga/core/CompensationImpl.java
deleted file mode 100644
index 0077802..0000000
--- a/saga-core/src/test/java/org/apache/servicecomb/saga/core/CompensationImpl.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import java.util.Map;
-
-public class CompensationImpl extends RestOperation implements Compensation {
-
- public CompensationImpl(String path, String method, Map<String, Map<String, String>> params) {
- super(path, method, params);
- }
-
- @Override
- public int retries() {
- return DEFAULT_RETRIES;
- }
-}
diff --git a/saga-core/src/test/java/org/apache/servicecomb/saga/core/CompositeSagaLogTest.java b/saga-core/src/test/java/org/apache/servicecomb/saga/core/CompositeSagaLogTest.java
deleted file mode 100644
index c7dea51..0000000
--- a/saga-core/src/test/java/org/apache/servicecomb/saga/core/CompositeSagaLogTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import static com.seanyinx.github.unit.scaffolding.AssertUtils.expectFailing;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-
-import org.junit.Test;
-
-public class CompositeSagaLogTest {
-
- private final SagaRequest request = mock(SagaRequest.class);
- private final DummyEvent sagaEvent = new DummyEvent(request);
- private final SagaLog embedded = mock(SagaLog.class);
- private final SagaLog persistent = mock(SagaLog.class);
-
- private final SagaLog compositeSagaLog = new CompositeSagaLog(embedded, persistent);
-
- @Test
- public void addsLogsToEmbeddedOnlyAfterPersisted() {
- doThrow(RuntimeException.class).when(persistent).offer(sagaEvent);
-
- try {
- compositeSagaLog.offer(sagaEvent);
- expectFailing(RuntimeException.class);
- } catch (RuntimeException ignored) {
- }
-
- verify(embedded, never()).offer(sagaEvent);
- }
-}
diff --git a/saga-core/src/test/java/org/apache/servicecomb/saga/core/CompositeSagaResponseTest.java b/saga-core/src/test/java/org/apache/servicecomb/saga/core/CompositeSagaResponseTest.java
deleted file mode 100644
index 449340c..0000000
--- a/saga-core/src/test/java/org/apache/servicecomb/saga/core/CompositeSagaResponseTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import static java.util.Arrays.asList;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.when;
-
-import java.util.ArrayList;
-
-import org.junit.Test;
-import org.mockito.Mockito;
-
-public class CompositeSagaResponseTest {
-
- private final SagaResponse response1 = Mockito.mock(SagaResponse.class);
- private final SagaResponse response2 = Mockito.mock(SagaResponse.class);
-
- private final SagaResponse compositeSagaResponse = new CompositeSagaResponse(asList(response1, response2));
- private final SagaResponse emptySagaResponse = new CompositeSagaResponse(new ArrayList<SagaResponse>());
-
- @Test
- public void succeededOnlyWhenAllAreSuccessful() throws Exception {
- when(response1.succeeded()).thenReturn(true);
- when(response2.succeeded()).thenReturn(true);
-
- assertThat(compositeSagaResponse.succeeded(), is(true));
- }
-
- @Test
- public void failedWhenAnyIsNotSuccessful() throws Exception {
- when(response1.succeeded()).thenReturn(true);
- when(response2.succeeded()).thenReturn(false);
-
- assertThat(compositeSagaResponse.succeeded(), is(false));
- }
-
- @Test
- public void bodyCombinesAllResponseBodies() throws Exception {
- when(response1.body()).thenReturn("{\n"
- + " \"status\": 500,\n"
- + " \"body\" : \"oops\"\n"
- + "}\n");
-
- when(response2.body()).thenReturn("{\n"
- + " \"status\": 200,\n"
- + " \"body\" : \"blah\"\n"
- + "}\n");
-
- assertThat(compositeSagaResponse.body(), is("[{\n"
- + " \"status\": 500,\n"
- + " \"body\" : \"oops\"\n"
- + "}\n"
- + ", {\n"
- + " \"status\": 200,\n"
- + " \"body\" : \"blah\"\n"
- + "}\n"
- + "]"));
- }
-
- @Test
- public void EmptyCompositeSagaResponse() {
- assertThat(emptySagaResponse.body(), is("{}"));
- }
-}
diff --git a/saga-core/src/test/java/org/apache/servicecomb/saga/core/DummyEvent.java b/saga-core/src/test/java/org/apache/servicecomb/saga/core/DummyEvent.java
deleted file mode 100644
index c775afe..0000000
--- a/saga-core/src/test/java/org/apache/servicecomb/saga/core/DummyEvent.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-public class DummyEvent extends SagaEvent {
-
- DummyEvent(SagaRequest payload) {
- super("0", payload);
- }
-
- @Override
- public void gatherTo(EventContext sagaContext) {
-
- }
-
-}
diff --git a/saga-core/src/test/java/org/apache/servicecomb/saga/core/FallbackPolicyTest.java b/saga-core/src/test/java/org/apache/servicecomb/saga/core/FallbackPolicyTest.java
deleted file mode 100644
index a2d1f32..0000000
--- a/saga-core/src/test/java/org/apache/servicecomb/saga/core/FallbackPolicyTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-
-public class FallbackPolicyTest {
-
- private final int numberOfRetries = 3;
- private final String address = uniquify("address");
-
- private final SagaResponse success = Mockito.mock(SagaResponse.class);
- private final SagaResponse failure = Mockito.mock(SagaResponse.class);
- private final Fallback fallback = Mockito.mock(Fallback.class);
- private final Compensation compensation = Mockito.mock(Compensation.class);
- private final FallbackPolicy fallbackPolicy = new FallbackPolicy(100);
-
- @SuppressWarnings("ThrowableInstanceNeverThrown")
- private final RuntimeException exception = new RuntimeException("oops");
-
- @Before
- public void setUp() throws Exception {
- when(compensation.retries()).thenReturn(numberOfRetries);
- when(fallback.send(address)).thenReturn(failure);
- }
-
- @Test
- public void retriesTransportForSpecifiedTimes() {
- when(compensation.send(address))
- .thenThrow(exception)
- .thenThrow(exception)
- .thenReturn(success);
-
- SagaResponse response = fallbackPolicy.apply(address, compensation, fallback);
-
- assertThat(response, is(success));
- verify(compensation, times(3)).send(address);
- }
-
- @Test
- public void fallbackIfTransportFailedWithRetry() {
- when(compensation.send(address)).thenThrow(exception);
-
- SagaResponse response = fallbackPolicy.apply(address, compensation, fallback);
- assertThat(response, is(failure));
-
- verify(compensation, times(numberOfRetries + 1)).send(address);
- verify(fallback).send(address);
- }
-
- @Test
- public void retryUntilSuccessIfNumberOfRetriesIsNegative() throws InterruptedException {
- reset(compensation);
- when(compensation.retries()).thenReturn(-1);
- when(compensation.send(address))
- .thenThrow(exception, exception, exception, exception, exception)
- .thenReturn(success);
-
- SagaResponse response = fallbackPolicy.apply(address, compensation, fallback);
-
- assertThat(response, is(success));
- verify(fallback, never()).send(anyString());
- }
-}
diff --git a/saga-core/src/test/java/org/apache/servicecomb/saga/core/ForwardRecoveryTest.java b/saga-core/src/test/java/org/apache/servicecomb/saga/core/ForwardRecoveryTest.java
deleted file mode 100644
index 1d21914..0000000
--- a/saga-core/src/test/java/org/apache/servicecomb/saga/core/ForwardRecoveryTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import static com.seanyinx.github.unit.scaffolding.AssertUtils.expectFailing;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import org.junit.Before;
-import org.junit.Test;
-
-public class ForwardRecoveryTest {
-
- private final SagaTask sagaTask = mock(SagaTask.class);
-
- private final Transaction transaction = mock(Transaction.class);
-
- private final SagaRequest sagaRequest = mock(SagaRequest.class);
- private final SagaResponse parentResponse = mock(SagaResponse.class);
-
- private final ForwardRecovery forwardRecovery = new ForwardRecovery();
-
- private final String serviceName = "aaa";
-
- private final int numberOfRetries = 3;
-
- @Before
- public void setUp() {
- when(sagaRequest.serviceName()).thenReturn(serviceName);
- when(sagaRequest.transaction()).thenReturn(transaction);
- when(sagaRequest.failRetryDelayMilliseconds()).thenReturn(300);
- when(transaction.retries()).thenReturn(numberOfRetries);
- when(transaction.toString()).thenReturn(serviceName);
- }
-
- @Test
- public void blowsUpWhenTaskIsNotCommittedWithFailRetryDelaySeconds() throws Exception {
- doThrow(Exception.class).when(transaction).send(serviceName, parentResponse);
-
- Thread t = new Thread(new Runnable() {
- @Override
- public void run() {
- forwardRecovery.apply(sagaTask, sagaRequest, parentResponse);
- }
- });
- t.start();
- Thread.sleep(400);
- t.interrupt();
-
- verify(transaction, times(2)).send(serviceName, parentResponse);
- }
-
- @Test
- public void retriesTransportForSpecifiedTimes() {
- doThrow(Exception.class).when(transaction).send(serviceName, parentResponse);
-
- try {
- forwardRecovery.apply(sagaTask, sagaRequest, parentResponse);
- expectFailing(TransactionFailedException.class);
- } catch (TransactionAbortedException e) {
- assertThat(e.getMessage(), is("Too many failures in transaction aaa of service aaa, abort the transaction!"));
- }
-
- verify(transaction, times(4)).send(serviceName, parentResponse);
- }
-}
diff --git a/saga-core/src/test/java/org/apache/servicecomb/saga/core/LongIdGeneratorTest.java b/saga-core/src/test/java/org/apache/servicecomb/saga/core/LongIdGeneratorTest.java
deleted file mode 100644
index 775866b..0000000
--- a/saga-core/src/test/java/org/apache/servicecomb/saga/core/LongIdGeneratorTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-
-import org.junit.Test;
-
-public class LongIdGeneratorTest {
-
-
- private final LongIdGenerator generator = new LongIdGenerator();
-
- @Test
- public void generatesLongInSequence() {
- for (long index = 0; index < 10; index++) {
- assertThat(generator.nextId(), is(index + 1));
- }
- }
-}
diff --git a/saga-core/src/test/java/org/apache/servicecomb/saga/core/RestOperationTest.java b/saga-core/src/test/java/org/apache/servicecomb/saga/core/RestOperationTest.java
deleted file mode 100644
index 900bb8b..0000000
--- a/saga-core/src/test/java/org/apache/servicecomb/saga/core/RestOperationTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import static com.seanyinx.github.unit.scaffolding.AssertUtils.expectFailing;
-import static java.util.Collections.emptyMap;
-import static java.util.Collections.singletonMap;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-
-import java.util.Collections;
-import java.util.Map;
-
-import org.junit.Test;
-
-public class RestOperationTest {
-
- public static final Map<String, Map<String, String>> EMPTY_MAP_MAP = Collections.<String, Map<String, String>>emptyMap();
- public static final Map<String, String> EMPTY_MAP = Collections.<String, String>emptyMap();
-
- @Test
- public void blowsUpWhenGetMethodWithForm() {
- try {
- new RestOperation("blah", "GET", singletonMap("form", EMPTY_MAP));
- expectFailing(IllegalArgumentException.class);
- } catch (IllegalArgumentException e) {
- assertThat(e.getMessage(), is("GET & DELETE request cannot enclose a body"));
- }
- }
-
- @Test
- public void blowsUpWhenGetMethodWithJson() {
- try {
- new RestOperation("blah", "GET", singletonMap("json", EMPTY_MAP));
- expectFailing(IllegalArgumentException.class);
- } catch (IllegalArgumentException e) {
- assertThat(e.getMessage(), is("GET & DELETE request cannot enclose a body"));
- }
- }
-
- @Test
- public void blowsUpWhenDeleteMethodWithForm() {
- try {
- new RestOperation("blah", "DELETE", singletonMap("form", EMPTY_MAP));
- expectFailing(IllegalArgumentException.class);
- } catch (IllegalArgumentException e) {
- assertThat(e.getMessage(), is("GET & DELETE request cannot enclose a body"));
- }
- }
-
- @Test
- public void blowsUpWhenDeleteMethodWithJson() {
- try {
- new RestOperation("blah", "DELETE", singletonMap("json", EMPTY_MAP));
- expectFailing(IllegalArgumentException.class);
- } catch (IllegalArgumentException e) {
- assertThat(e.getMessage(), is("GET & DELETE request cannot enclose a body"));
- }
- }
-
- @Test
- public void blowsUpWhenMethodIsNotSupported() {
- try {
- new RestOperation("blah", "foo", EMPTY_MAP_MAP );
- expectFailing(IllegalArgumentException.class);
- } catch (IllegalArgumentException e) {
- assertThat(e.getMessage(), is("Unsupported method foo"));
- }
- }
-
- @Test
- public void blowsUpWhenMethodIsNull() {
- try {
- new RestOperation("blah", null, EMPTY_MAP_MAP);
- expectFailing(IllegalArgumentException.class);
- } catch (IllegalArgumentException e) {
- assertThat(e.getMessage(), is("Unsupported method null"));
- }
- }
-}
diff --git a/saga-core/src/test/java/org/apache/servicecomb/saga/core/RetrySagaLogTest.java b/saga-core/src/test/java/org/apache/servicecomb/saga/core/RetrySagaLogTest.java
deleted file mode 100644
index 9f9bdc8..0000000
--- a/saga-core/src/test/java/org/apache/servicecomb/saga/core/RetrySagaLogTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-
-import static org.awaitility.Awaitility.await;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-import org.junit.Test;
-
-import org.apache.servicecomb.saga.core.SagaTaskFactory.RetrySagaLog;
-
-public class RetrySagaLogTest {
-
- private final PersistentStore persistentStore = mock(PersistentStore.class);
- private final SagaRequest sagaRequest = mock(SagaRequest.class);
- private final SagaEvent dummyEvent = new DummyEvent(sagaRequest);
- private final RetrySagaLog retrySagaLog = new RetrySagaLog(persistentStore, 100);
-
- private volatile boolean interrupted = false;
-
- @Test
- public void retryUntilSuccessWhenEventIsNotPersisted() throws InterruptedException {
- doThrow(RuntimeException.class).
- doThrow(RuntimeException.class).
- doThrow(RuntimeException.class).
- doThrow(RuntimeException.class).
- doThrow(RuntimeException.class).
- doNothing().
- when(persistentStore).offer(dummyEvent);
-
- retrySagaLog.offer(dummyEvent);
-
- verify(persistentStore, times(6)).offer(dummyEvent);
- }
-
- @Test
- public void exitOnInterruption() throws InterruptedException {
- ExecutorService executor = Executors.newSingleThreadExecutor();
-
- Future<?> future = executor.submit(new Runnable() {
- @Override
- public void run() {
- doThrow(RuntimeException.class).when(persistentStore).offer(dummyEvent);
-
- retrySagaLog.offer(dummyEvent);
- interrupted = true;
- }
- });
-
- Thread.sleep(500);
-
- assertThat(future.cancel(true), is(true));
-
- await().atMost(2, TimeUnit.SECONDS).until(new Callable<Boolean>() {
- @Override
- public Boolean call() {
- return interrupted;
- }
- });
- executor.shutdown();
- }
-}
diff --git a/saga-core/src/test/java/org/apache/servicecomb/saga/core/SagaEndTaskTest.java b/saga-core/src/test/java/org/apache/servicecomb/saga/core/SagaEndTaskTest.java
deleted file mode 100644
index 22f5fa1..0000000
--- a/saga-core/src/test/java/org/apache/servicecomb/saga/core/SagaEndTaskTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.mock;
-
-import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-
-public class SagaEndTaskTest {
- private final SagaRequest request = mock(SagaRequest.class);
- private final SagaLog sagaLog = mock(SagaLog.class);
-
- private final String sagaId = "0";
- private final SagaEndTask sagaEndTask = new SagaEndTask(sagaId, sagaLog);
-
- @Test
- public void emptyResponseOnSuccessfulEventPersistence() throws Exception {
- ArgumentCaptor<SagaEndedEvent> argumentCaptor = ArgumentCaptor.forClass(SagaEndedEvent.class);
- doNothing().when(sagaLog).offer(argumentCaptor.capture());
-
- sagaEndTask.commit(request, SagaResponse.EMPTY_RESPONSE);
-
- SagaEndedEvent event = argumentCaptor.getValue();
- assertThat(event.sagaId, is(sagaId));
- assertThat(event.json(null), is("{}"));
- assertThat(event.payload(), is(request));
- }
-}
diff --git a/saga-core/src/test/java/org/apache/servicecomb/saga/core/SagaEventMatcher.java b/saga-core/src/test/java/org/apache/servicecomb/saga/core/SagaEventMatcher.java
deleted file mode 100644
index 7e8289c..0000000
--- a/saga-core/src/test/java/org/apache/servicecomb/saga/core/SagaEventMatcher.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import java.util.Objects;
-
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
-import org.hamcrest.TypeSafeMatcher;
-
-public class SagaEventMatcher extends TypeSafeMatcher<SagaEvent> {
-
- private final String sagaId;
- private final Operation operation;
- private final Class<?> aClass;
-
- public static Matcher<SagaEvent> eventWith(String sagaId, Operation operation, Class<?> aClass) {
- return new SagaEventMatcher(sagaId, operation, aClass);
- }
-
- static Matcher<SagaEvent> eventWith(Operation operation, Class<?> aClass) {
- return eventWith("0", operation, aClass);
- }
-
- private SagaEventMatcher(String sagaId, Operation operation, Class<?> aClass) {
- this.sagaId = sagaId;
- this.operation = operation;
- this.aClass = aClass;
- }
-
- @Override
- protected void describeMismatchSafely(SagaEvent item, Description description) {
- description
- .appendText("SagaEvent {sagaId=" + item.sagaId + ", operation=" + operation(item) + ", class=" + item.getClass());
- }
-
- @Override
- protected boolean matchesSafely(SagaEvent envelope) {
- return Objects.equals(envelope.sagaId, sagaId)
- && operation(envelope).equals(operation)
- && envelope.getClass().equals(aClass);
- }
-
- @Override
- public void describeTo(Description description) {
- description
- .appendText("SagaEvent {sagaId=" + sagaId + ", operation=" + operation + ", class=" + aClass.getCanonicalName());
- }
-
- private Operation operation(SagaEvent envelope) {
- return operation instanceof Compensation ? envelope.payload().compensation() : envelope.payload().transaction();
- }
-}
diff --git a/saga-core/src/test/java/org/apache/servicecomb/saga/core/SagaExecutionComponentTestBase.java b/saga-core/src/test/java/org/apache/servicecomb/saga/core/SagaExecutionComponentTestBase.java
deleted file mode 100644
index d4f88c4..0000000
--- a/saga-core/src/test/java/org/apache/servicecomb/saga/core/SagaExecutionComponentTestBase.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import static org.apache.servicecomb.saga.core.Operation.TYPE_REST;
-import static java.util.Collections.singletonList;
-import static java.util.Collections.singletonMap;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.awaitility.Awaitility.waitAtMost;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.when;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import org.apache.servicecomb.saga.core.application.SagaFactory;
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
-import org.hamcrest.TypeSafeMatcher;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-
-import org.apache.servicecomb.saga.core.application.SagaExecutionComponent;
-import org.apache.servicecomb.saga.core.application.interpreter.FromJsonFormat;
-import org.apache.servicecomb.saga.infrastructure.EmbeddedEventStore;
-
-@SuppressWarnings("unchecked")
-public abstract class SagaExecutionComponentTestBase {
-
- private static final String requestJson = "[\n"
- + " {\n"
- + " \"id\": \"request-1\",\n"
- + " \"serviceName\": \"aaa\",\n"
- + " \"transaction\": {\n"
- + " \"method\": \"post\",\n"
- + " \"path\": \"/rest/as\"\n"
- + " },\n"
- + " \"compensation\": {\n"
- + " \"method\": \"delete\",\n"
- + " \"path\": \"/rest/as\"\n"
- + " }\n"
- + " }\n"
- + "]\n";
-
- private static final String sagaJson = "{\n"
- + " \"policy\": \"ForwardRecovery\",\n"
- + " \"requests\": " + requestJson + "\n"
- + "}";
-
- private static final String anotherRequestJson = "[\n"
- + " {\n"
- + " \"id\": \"request-2\",\n"
- + " \"serviceName\": \"bbb\",\n"
- + " \"transaction\": {\n"
- + " \"method\": \"post\",\n"
- + " \"path\": \"/rest/bs\"\n"
- + " },\n"
- + " \"compensation\": {\n"
- + " \"method\": \"delete\",\n"
- + " \"path\": \"/rest/bs\"\n"
- + " }\n"
- + " }\n"
- + "]\n";
-
- private static final String anotherSagaJson = "{\n"
- + " \"policy\": \"ForwardRecovery\",\n"
- + " \"requests\": " + anotherRequestJson + "\n"
- + "}";
-
- public static final Map<String, Map<String, String>> EMPTY_MAP = Collections.<String, Map<String, String>>emptyMap();
-
- private final SagaRequest request1 = new SagaRequestImpl(
- "request-1",
- "aaa",
- TYPE_REST,
- new TransactionImpl("/rest/as", "post", EMPTY_MAP),
- new CompensationImpl("/rest/as", "delete", EMPTY_MAP)
- );
-
- private final SagaRequest request2 = new SagaRequestImpl(
- "request-2",
- "bbb",
- TYPE_REST,
- new TransactionImpl("/rest/bs", "post", EMPTY_MAP),
- new CompensationImpl("/rest/bs", "delete", EMPTY_MAP)
- );
-
- private final SagaDefinition definition1 = new SagaDefinition() {
- @Override
- public RecoveryPolicy policy() {
- return new ForwardRecovery();
- }
-
- @Override
- public SagaRequest[] requests() {
- return new SagaRequest[]{request1};
- }
- };
-
- private final SagaDefinition definition2 = new SagaDefinition() {
- @Override
- public RecoveryPolicy policy() {
- return new BackwardRecovery();
- }
-
- @Override
- public SagaRequest[] requests() {
- return new SagaRequest[]{request2};
- }
- };
-
- private final FromJsonFormat<SagaDefinition> fromJsonFormat = Mockito.mock(FromJsonFormat.class);
- private final EmbeddedPersistentStore eventStore = new EmbeddedPersistentStore();
-
- private final SagaExecutionComponent coordinator = new SagaExecutionComponent(
- eventStore,
- fromJsonFormat,
- null,
- sagaFactory(eventStore)
- );
-
- private final String sagaId = "1";
-
- @Before
- public void setUp() throws Exception {
- when(fromJsonFormat.fromJson(sagaJson)).thenReturn(definition1);
- when(fromJsonFormat.fromJson(anotherSagaJson)).thenReturn(definition2);
- }
-
- @Test
- public void recoverSagaWithEventsFromEventStore() throws IOException {
- eventStore.offer(new SagaStartedEvent(sagaId, sagaJson, NoOpSagaRequest.SAGA_START_REQUEST));
- coordinator.reanimate();
-
- assertThat(eventStore, contains(
- eventWith(NoOpSagaRequest.SAGA_START_REQUEST, SagaStartedEvent.class),
- eventWith(request1, TransactionStartedEvent.class),
- eventWith(request1, TransactionEndedEvent.class),
- eventWith(NoOpSagaRequest.SAGA_END_REQUEST, SagaEndedEvent.class)
- ));
- }
-
- @Test
- public void runSagaWithEventStore() throws IOException {
- SagaResponse response = coordinator.run(sagaJson);
-
- assertThat(response, is(SagaResponse.EMPTY_RESPONSE));
- assertThat(eventStore, contains(
- eventWith(NoOpSagaRequest.SAGA_START_REQUEST, SagaStartedEvent.class),
- eventWith(request1, TransactionStartedEvent.class),
- eventWith(request1, TransactionEndedEvent.class),
- eventWith(NoOpSagaRequest.SAGA_END_REQUEST, SagaEndedEvent.class)
- ));
- }
-
- @Test
- public void processRequestsInParallel() {
- ExecutorService executor = Executors.newFixedThreadPool(2);
-
- executor.submit(new Runnable() {
- @Override
- public void run() {
- coordinator.run(sagaJson);
- }
- });
- executor.submit(new Runnable() {
- @Override
- public void run() {
- coordinator.run(anotherSagaJson);
- }
- });
-
- waitAtMost(2, SECONDS).until(new Callable<Boolean>() {
- @Override
- public Boolean call() throws Exception {
- return eventStore.size() == 8;
- }
- });
-
- assertThat(eventStore, containsInAnyOrder(
- eventWith(NoOpSagaRequest.SAGA_START_REQUEST, SagaStartedEvent.class),
- eventWith(request1, TransactionStartedEvent.class),
- eventWith(request1, TransactionEndedEvent.class),
- eventWith(NoOpSagaRequest.SAGA_END_REQUEST, SagaEndedEvent.class),
- eventWith(NoOpSagaRequest.SAGA_START_REQUEST, SagaStartedEvent.class),
- eventWith(request2, TransactionStartedEvent.class),
- eventWith(request2, TransactionEndedEvent.class),
- eventWith(NoOpSagaRequest.SAGA_END_REQUEST, SagaEndedEvent.class)
- ));
- }
-
- @Test
- public void runSagaAfterRecovery() throws IOException {
- eventStore.offer(new SagaStartedEvent(sagaId, sagaJson, NoOpSagaRequest.SAGA_START_REQUEST));
- coordinator.reanimate();
-
- coordinator.run(anotherSagaJson);
-
- assertThat(eventStore, contains(
- eventWith(NoOpSagaRequest.SAGA_START_REQUEST, SagaStartedEvent.class),
- eventWith(request1, TransactionStartedEvent.class),
- eventWith(request1, TransactionEndedEvent.class),
- eventWith(NoOpSagaRequest.SAGA_END_REQUEST, SagaEndedEvent.class),
- eventWith(NoOpSagaRequest.SAGA_START_REQUEST, SagaStartedEvent.class),
- eventWith(request2, TransactionStartedEvent.class),
- eventWith(request2, TransactionEndedEvent.class),
- eventWith(NoOpSagaRequest.SAGA_END_REQUEST, SagaEndedEvent.class)
- ));
- }
-
- private Matcher<SagaEvent> eventWith(
- final SagaRequest sagaRequest,
- final Class<?> type) {
-
- return new TypeSafeMatcher<SagaEvent>() {
- @Override
- protected boolean matchesSafely(SagaEvent event) {
- SagaRequest request = event.payload();
- return sagaRequest.equals(request)
- && event.getClass().equals(type);
- }
-
- @Override
- protected void describeMismatchSafely(SagaEvent item, Description mismatchDescription) {
- SagaRequest request = item.payload();
- mismatchDescription.appendText(
- "SagaEvent {" + request + "}");
- }
-
- @Override
- public void describeTo(Description description) {
- description.appendText(
- "SagaEvent {" + sagaRequest + "}");
- }
- };
- }
-
- private class EmbeddedPersistentStore extends EmbeddedEventStore implements PersistentStore {
-
- @Override
- public Map<String, List<EventEnvelope>> findPendingSagaEvents() {
- return singletonMap(sagaId, singletonList(
- new EventEnvelope(1L, new SagaStartedEvent(sagaId, sagaJson, NoOpSagaRequest.SAGA_START_REQUEST))));
- }
- }
-
- protected abstract SagaFactory sagaFactory(PersistentStore eventStore);
-}
diff --git a/saga-core/src/test/java/org/apache/servicecomb/saga/core/SagaIntegrationTest.java b/saga-core/src/test/java/org/apache/servicecomb/saga/core/SagaIntegrationTest.java
deleted file mode 100644
index 64187eb..0000000
--- a/saga-core/src/test/java/org/apache/servicecomb/saga/core/SagaIntegrationTest.java
+++ /dev/null
@@ -1,738 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import static com.seanyinx.github.unit.scaffolding.AssertUtils.expectFailing;
-import static org.apache.servicecomb.saga.core.Compensation.SAGA_START_COMPENSATION;
-import static org.apache.servicecomb.saga.core.Operation.TYPE_REST;
-import static org.apache.servicecomb.saga.core.SagaEventMatcher.eventWith;
-import static org.apache.servicecomb.saga.core.SagaResponse.EMPTY_RESPONSE;
-import static org.apache.servicecomb.saga.core.SagaResponse.NONE_RESPONSE;
-import static org.apache.servicecomb.saga.core.SagaTask.SAGA_END_TASK;
-import static org.apache.servicecomb.saga.core.SagaTask.SAGA_REQUEST_TASK;
-import static org.apache.servicecomb.saga.core.SagaTask.SAGA_START_TASK;
-import static org.apache.servicecomb.saga.core.Transaction.SAGA_END_TRANSACTION;
-import static org.apache.servicecomb.saga.core.Transaction.SAGA_START_TRANSACTION;
-import static java.util.Arrays.asList;
-import static java.util.Collections.emptySet;
-import static java.util.Collections.singletonList;
-import static org.hamcrest.Matchers.anyOf;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.CyclicBarrier;
-
-import org.hamcrest.core.Is;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-
-import com.seanyinx.github.unit.scaffolding.Randomness;
-
-import org.apache.servicecomb.saga.core.application.interpreter.FromJsonFormat;
-import org.apache.servicecomb.saga.core.dag.Node;
-import org.apache.servicecomb.saga.core.dag.SingleLeafDirectedAcyclicGraph;
-import org.apache.servicecomb.saga.infrastructure.ContextAwareEventStore;
-import org.apache.servicecomb.saga.infrastructure.EmbeddedEventStore;
-
-@SuppressWarnings("unchecked")
-public class SagaIntegrationTest {
- private static final String sagaId = Randomness.uniquify("sagaId");
-
- private final FromJsonFormat<Set<String>> childrenExtractor = mock(FromJsonFormat.class);
- private final SagaContext sagaContext = new SagaContextImpl(childrenExtractor);
- private final IdGenerator<Long> idGenerator = new LongIdGenerator();
- private final EventStore eventStore = new EmbeddedEventStore();
- private final ContextAwareEventStore sagaLog = new ContextAwareEventStore(eventStore, sagaContext);
-
- private final Transaction transaction1 = mock(Transaction.class, "transaction1");
- private final Transaction transaction2 = mock(Transaction.class, "transaction2");
- private final Transaction transaction3 = mock(Transaction.class, "transaction3");
- private final Transaction transaction4 = mock(Transaction.class, "transaction4");
-
- private final Compensation compensation1 = mock(Compensation.class, "compensation1");
- private final Compensation compensation2 = mock(Compensation.class, "compensation2");
- private final Compensation compensation3 = mock(Compensation.class, "compensation3");
- private final Compensation compensation4 = mock(Compensation.class, "compensation4");
-
- private final Fallback fallback1 = mock(Fallback.class, "fallback1");
-
- private final String requestJson = "{}";
- private final SagaRequest request1 = request("request1", "service1", transaction1, compensation1, fallback1);
- private final SagaRequest request2 = request("request2", "service2", transaction2, compensation2, request1.id());
- private final SagaRequest request3 = request("request3", "service3", transaction3, compensation3, request1.id());
- private final SagaRequest request4 = request("request4", "service4", transaction4, compensation4, request3.id());
-
- private final SagaResponse transactionResponse1 = new SuccessfulSagaResponse("transaction1");
- private final SagaResponse transactionResponse2 = new SuccessfulSagaResponse("transaction2");
- private final SagaResponse transactionResponse3 = new SuccessfulSagaResponse("transaction3");
- private final SagaResponse compensationResponse1 = new SuccessfulSagaResponse("compensation1");
- private final SagaResponse compensationResponse2 = new SuccessfulSagaResponse("compensation2");
- private final SagaResponse compensationResponse3 = new SuccessfulSagaResponse("compensation3");
-
- @SuppressWarnings("ThrowableInstanceNeverThrown")
- private final RuntimeException exception = new RuntimeException("oops");
-
- private final Node<SagaRequest> node1 = new Node<>(1, request1);
- private final Node<SagaRequest> node2 = new Node<>(2, request2);
- private final Node<SagaRequest> node3 = new Node<>(3, request3);
- private final Node<SagaRequest> node4 = new Node<>(4, request4);
- private final Node<SagaRequest> root = new Node<>(0, NoOpSagaRequest.SAGA_START_REQUEST);
- private final Node<SagaRequest> leaf = new Node<>(5, NoOpSagaRequest.SAGA_END_REQUEST);
- private final SingleLeafDirectedAcyclicGraph<SagaRequest> sagaTaskGraph = new SingleLeafDirectedAcyclicGraph<>(root, leaf);
-
- private Saga saga;
- private final Map<String, SagaTask> tasks = new HashMap<>();
-
- // root - node1 - node2 - leaf
- @Before
- public void setUp() throws Exception {
- when(childrenExtractor.fromJson(anyString())).thenReturn(Collections.<String>emptySet());
- when(childrenExtractor.fromJson(NONE_RESPONSE.body())).thenReturn(setOf("none"));
-
- when(transaction1.send(request1.serviceName(), EMPTY_RESPONSE)).thenReturn(transactionResponse1);
- when(transaction2.send(request2.serviceName(), transactionResponse1)).thenReturn(transactionResponse2);
- when(transaction3.send(request3.serviceName(), transactionResponse1)).thenReturn(transactionResponse3);
-
- when(compensation1.send(request1.serviceName(), compensationResponse2)).thenReturn(compensationResponse1);
- when(compensation2.send(request2.serviceName(), compensationResponse3)).thenReturn(compensationResponse2);
- when(compensation3.send(request3.serviceName(), EMPTY_RESPONSE)).thenReturn(compensationResponse3);
-
- root.addChild(node1);
- node1.addChild(node2);
- node2.addChild(leaf);
-
- SagaStartTask sagaStartTask = new SagaStartTask(sagaId, requestJson, sagaLog);
- SagaEndTask sagaEndTask = new SagaEndTask(sagaId, sagaLog);
- RequestProcessTask processTask = requestProcessTask(new BackwardRecovery());
-
- tasks.put(SAGA_START_TASK, sagaStartTask);
- tasks.put(SAGA_REQUEST_TASK, processTask);
- tasks.put(SAGA_END_TASK, sagaEndTask);
-
- saga = new GraphBasedSaga(eventStore, tasks, sagaContext, sagaTaskGraph);
- }
-
- @Test
- public void transactionsAreRunSuccessfully() {
- saga.run();
-
- assertThat(eventStore, contains(
- eventWith(sagaId, SAGA_START_TRANSACTION, SagaStartedEvent.class),
- eventWith(sagaId, transaction1, TransactionStartedEvent.class),
- eventWith(sagaId, transaction1, TransactionEndedEvent.class),
- eventWith(sagaId, transaction2, TransactionStartedEvent.class),
- eventWith(sagaId, transaction2, TransactionEndedEvent.class),
- eventWith(sagaId, SAGA_END_TRANSACTION, SagaEndedEvent.class)
- ));
-
- verify(transaction1).send(request1.serviceName(), EMPTY_RESPONSE);
- verify(transaction2).send(request2.serviceName(), transactionResponse1);
-
- verify(compensation1, never()).send(request1.serviceName());
- verify(compensation2, never()).send(request2.serviceName());
- }
-
- // root - node1 - node2 - leaf
- // \_ node3 _/
- @Test
- public void compensateCommittedTransactionsOnFailure() {
- addExtraChildToNode1();
-
- // barrier to make sure the two transactions starts at the same time
- final CyclicBarrier barrier = new CyclicBarrier(2);
- when(transaction2.send(request2.serviceName(), transactionResponse1))
- .thenAnswer(
- withAnswer(new Callable<SagaResponse>() {
- @Override
- public SagaResponse call() throws Exception {
- barrier.await();
- Thread.sleep(100);
- throw exception;
- }
- }));
-
- when(transaction3.send(request3.serviceName(), transactionResponse1))
- .thenAnswer(
- withAnswer(new Callable<SagaResponse>() {
- @Override
- public SagaResponse call() throws Exception {
- barrier.await();
- return transactionResponse3;
- }
- }));
-
- saga.run();
-
- assertThat(eventStore, contains(
- eventWith(sagaId, SAGA_START_TRANSACTION, SagaStartedEvent.class),
- eventWith(sagaId, transaction1, TransactionStartedEvent.class),
- eventWith(sagaId, transaction1, TransactionEndedEvent.class),
- anyOf(eventWith(sagaId, transaction2, TransactionStartedEvent.class), eventWith(sagaId, transaction3, TransactionStartedEvent.class)),
- anyOf(eventWith(sagaId, transaction2, TransactionStartedEvent.class), eventWith(sagaId, transaction3, TransactionStartedEvent.class)),
- eventWith(sagaId, transaction3, TransactionEndedEvent.class),
- eventWith(sagaId, transaction2, TransactionAbortedEvent.class),
- eventWith(sagaId, compensation3, TransactionCompensatedEvent.class),
- eventWith(sagaId, compensation1, TransactionCompensatedEvent.class),
- eventWith(sagaId, SAGA_START_COMPENSATION, SagaEndedEvent.class)));
-
- verify(transaction1).send(request1.serviceName(), EMPTY_RESPONSE);
- verify(transaction2).send(request2.serviceName(), transactionResponse1);
- verify(transaction3).send(request3.serviceName(), transactionResponse1);
-
- verify(compensation1).send(request1.serviceName());
- verify(compensation2, never()).send(request2.serviceName());
- verify(compensation3).send(request3.serviceName());
- }
-
- @Test
- public void skipIgnoredTransaction() throws Exception {
- addExtraChildToNode1();
-
- when(childrenExtractor.fromJson(transactionResponse1.body())).thenReturn(setOf(request3.id()));
-
- saga.run();
-
- assertThat(eventStore, contains(
- eventWith(sagaId, SAGA_START_TRANSACTION, SagaStartedEvent.class),
- eventWith(sagaId, transaction1, TransactionStartedEvent.class),
- eventWith(sagaId, transaction1, TransactionEndedEvent.class),
- eventWith(sagaId, transaction3, TransactionStartedEvent.class),
- eventWith(sagaId, transaction3, TransactionEndedEvent.class),
- eventWith(sagaId, SAGA_END_TRANSACTION, SagaEndedEvent.class)
- ));
-
- verify(transaction1).send(request1.serviceName(), EMPTY_RESPONSE);
- verify(transaction3).send(request3.serviceName(), transactionResponse1);
- verify(transaction2, never()).send(anyString(), any(SagaResponse.class));
-
- verify(compensation1, never()).send(request1.serviceName());
- verify(compensation2, never()).send(request2.serviceName());
- verify(compensation3, never()).send(request3.serviceName());
- }
-
- @Test
- public void skipAllIgnoredTransactions() throws Exception {
- node1.addChild(node3);
- node3.addChild(node4);
- node4.addChild(leaf);
-
- when(childrenExtractor.fromJson(transactionResponse1.body())).thenReturn(setOf("none"));
-
- saga.run();
-
- assertThat(eventStore, contains(
- eventWith(sagaId, SAGA_START_TRANSACTION, SagaStartedEvent.class),
- eventWith(sagaId, transaction1, TransactionStartedEvent.class),
- eventWith(sagaId, transaction1, TransactionEndedEvent.class),
- eventWith(sagaId, SAGA_END_TRANSACTION, SagaEndedEvent.class)
- ));
-
- verify(transaction1).send(request1.serviceName(), EMPTY_RESPONSE);
- verify(transaction2, never()).send(anyString(), any(SagaResponse.class));
- verify(transaction3, never()).send(anyString(), any(SagaResponse.class));
- verify(transaction4, never()).send(anyString(), any(SagaResponse.class));
-
- verify(compensation1, never()).send(request1.serviceName());
- verify(compensation2, never()).send(request2.serviceName());
- verify(compensation3, never()).send(request3.serviceName());
- verify(compensation4, never()).send(request4.serviceName());
- }
-
- @Test
- public void doNotCompensateIgnoredTransactions() throws Exception {
- node1.addChild(node3);
- node3.addChild(node4);
- node4.addChild(leaf);
-
- when(childrenExtractor.fromJson(transactionResponse1.body())).thenReturn(setOf(request3.id()));
-
- when(transaction4.send(request4.serviceName(), transactionResponse3)).thenThrow(exception);
-
- saga.run();
-
- assertThat(eventStore, contains(
- eventWith(sagaId, SAGA_START_TRANSACTION, SagaStartedEvent.class),
- eventWith(sagaId, transaction1, TransactionStartedEvent.class),
- eventWith(sagaId, transaction1, TransactionEndedEvent.class),
- eventWith(sagaId, transaction3, TransactionStartedEvent.class),
- eventWith(sagaId, transaction3, TransactionEndedEvent.class),
- eventWith(sagaId, transaction4, TransactionStartedEvent.class),
- eventWith(sagaId, transaction4, TransactionAbortedEvent.class),
- eventWith(sagaId, transaction3, TransactionCompensatedEvent.class),
- eventWith(sagaId, transaction1, TransactionCompensatedEvent.class),
- eventWith(sagaId, SAGA_START_COMPENSATION, SagaEndedEvent.class)
- ));
-
- verify(transaction1).send(request1.serviceName(), EMPTY_RESPONSE);
- verify(transaction3).send(request3.serviceName(), transactionResponse1);
- verify(transaction4).send(request4.serviceName(), transactionResponse3);
- verify(transaction2, never()).send(anyString(), any(SagaResponse.class));
-
- verify(compensation1).send(request1.serviceName());
- verify(compensation3).send(request3.serviceName());
- verify(compensation2, never()).send(request2.serviceName());
- verify(compensation4, never()).send(request4.serviceName());
- }
-
- // root - node1 - node2 - leaf
- // \_ node3 _/
- @Test
- public void redoHangingTransactionsOnFailure() throws InterruptedException {
- addExtraChildToNode1();
-
- // barrier to make sure the two transactions starts at the same time
- final CyclicBarrier barrier = new CyclicBarrier(2);
- when(transaction3.send(request3.serviceName(), transactionResponse1))
- .thenAnswer(withAnswer(new Callable<SagaResponse>() {
- @Override
- public SagaResponse call() throws Exception {
- barrier.await();
- throw exception;
- }
- }));
-
- final CountDownLatch latch = new CountDownLatch(1);
-
- when(transaction2.send(request2.serviceName(), transactionResponse1))
- .thenAnswer(withAnswer(new Callable<SagaResponse>() {
- @Override
- public SagaResponse call() throws Exception {
- barrier.await();
- latch.await();
- return transactionResponse2;
- }
- })).thenReturn(transactionResponse2);
-
- saga.run();
-
- // the ordering of events may not be consistence due to concurrent processing of requests
- assertThat(eventStore, contains(
- eventWith(sagaId, SAGA_START_TRANSACTION, SagaStartedEvent.class),
- eventWith(sagaId, transaction1, TransactionStartedEvent.class),
- eventWith(sagaId, transaction1, TransactionEndedEvent.class),
- anyOf(
- eventWith(sagaId, transaction2, TransactionStartedEvent.class),
- eventWith(sagaId, transaction3, TransactionStartedEvent.class)),
- anyOf(
- eventWith(sagaId, transaction3, TransactionStartedEvent.class),
- eventWith(sagaId, transaction2, TransactionStartedEvent.class)),
- eventWith(sagaId, transaction3, TransactionAbortedEvent.class),
- eventWith(sagaId, transaction2, TransactionStartedEvent.class),
- eventWith(sagaId, transaction2, TransactionEndedEvent.class),
- eventWith(sagaId, compensation2, TransactionCompensatedEvent.class),
- eventWith(sagaId, compensation1, TransactionCompensatedEvent.class),
- eventWith(sagaId, SAGA_START_COMPENSATION, SagaEndedEvent.class)));
-
- verify(transaction1).send(request1.serviceName(), EMPTY_RESPONSE);
- verify(transaction2, times(2)).send(request2.serviceName(), transactionResponse1);
- verify(transaction3).send(request3.serviceName(), transactionResponse1);
-
- verify(compensation1).send(request1.serviceName());
- verify(compensation2).send(request2.serviceName());
- verify(compensation3, never()).send(request3.serviceName());
-
- latch.countDown();
- }
-
- @Test
- public void retriesFailedTransactionTillSuccess() {
- RequestProcessTask processTask = requestProcessTask(new ForwardRecovery());
- tasks.put(SAGA_REQUEST_TASK, processTask);
-
- when(transaction2.retries()).thenReturn(-1);
- when(transaction2.send(request2.serviceName(), transactionResponse1))
- .thenThrow(exception).thenThrow(exception).thenReturn(transactionResponse2);
-
- saga.run();
-
- assertThat(eventStore, contains(
- eventWith(sagaId, SAGA_START_TRANSACTION, SagaStartedEvent.class),
- eventWith(sagaId, transaction1, TransactionStartedEvent.class),
- eventWith(sagaId, transaction1, TransactionEndedEvent.class),
- eventWith(sagaId, transaction2, TransactionStartedEvent.class),
- eventWith(sagaId, transaction2, TransactionEndedEvent.class),
- eventWith(sagaId, SAGA_END_TRANSACTION, SagaEndedEvent.class)
- ));
-
- verify(transaction1).send(request1.serviceName(), EMPTY_RESPONSE);
- verify(transaction2, times(3)).send(request2.serviceName(), transactionResponse1);
-
- verify(compensation1, never()).send(anyString(), any(SagaResponse.class));
- verify(compensation2, never()).send(anyString(), any(SagaResponse.class));
- }
-
- @Test
- public void retriesFailedTransactionTillMaximum() {
- RequestProcessTask processTask = requestProcessTask(new ForwardRecovery());
- tasks.put(SAGA_REQUEST_TASK, processTask);
-
- when(transaction2.send(request2.serviceName(), transactionResponse1)).thenThrow(exception);
- when(transaction2.retries()).thenReturn(2);
- when(transaction2.toString()).thenReturn("transaction2");
-
- try {
- saga.run();
- } catch (TransactionAbortedException e) {
- assertThat(e.getMessage(),
- Is.is("Too many failures in transaction transaction2 of service " + request2.serviceName() + ", stop transaction!"));
- }
-
- assertThat(eventStore, contains(
- eventWith(sagaId, SAGA_START_TRANSACTION, SagaStartedEvent.class),
- eventWith(sagaId, transaction1, TransactionStartedEvent.class),
- eventWith(sagaId, transaction1, TransactionEndedEvent.class),
- eventWith(sagaId, transaction2, TransactionStartedEvent.class)
- ));
-
- verify(transaction1).send(request1.serviceName(), EMPTY_RESPONSE);
- verify(transaction2, times(3)).send(request2.serviceName(), transactionResponse1);
-
- verify(compensation1, never()).send(anyString(), any(SagaResponse.class));
- verify(compensation2, never()).send(anyString(), any(SagaResponse.class));
- }
-
- @Test
- public void fallbackWhenCompensationFailed() {
- int retries = 3;
-
- when(transaction2.send(request2.serviceName(), transactionResponse1)).thenThrow(exception);
- when(compensation1.send(request1.serviceName())).thenThrow(exception);
- when(compensation1.retries()).thenReturn(retries);
-
- saga.run();
-
- verify(transaction1).send(request1.serviceName(), EMPTY_RESPONSE);
- verify(transaction2).send(request2.serviceName(), transactionResponse1);
-
- verify(compensation1, times(retries + 1)).send(request1.serviceName());
- verify(compensation2, never()).send(request2.serviceName());
-
- verify(fallback1).send(request1.serviceName());
- }
-
- @Test
- public void restoresSagaToTransactionStateByPlayingAllEvents() {
- addExtraChildToNode1();
-
- Iterable<EventEnvelope> events = asList(
- envelope(new SagaStartedEvent(sagaId, requestJson, NoOpSagaRequest.SAGA_START_REQUEST)),
- envelope(new TransactionStartedEvent(sagaId, request1)),
- envelope(new TransactionEndedEvent(sagaId, request1, transactionResponse1)),
- envelope(new TransactionStartedEvent(sagaId, request2)),
- envelope(new TransactionEndedEvent(sagaId, request2, transactionResponse2))
- );
-
- eventStore.populate(events);
- saga.play();
-
- saga.run();
- assertThat(eventStore, contains(
- eventWith(sagaId, SAGA_START_TRANSACTION, SagaStartedEvent.class),
- eventWith(sagaId, transaction1, TransactionStartedEvent.class),
- eventWith(sagaId, transaction1, TransactionEndedEvent.class),
- eventWith(sagaId, transaction2, TransactionStartedEvent.class),
- eventWith(sagaId, transaction2, TransactionEndedEvent.class),
- eventWith(sagaId, transaction3, TransactionStartedEvent.class),
- eventWith(sagaId, transaction3, TransactionEndedEvent.class),
- eventWith(sagaId, SAGA_END_TRANSACTION, SagaEndedEvent.class)
- ));
-
- verify(transaction1, never()).send(anyString(), any(SagaResponse.class));
- verify(transaction2, never()).send(anyString(), any(SagaResponse.class));
- verify(transaction3).send(request3.serviceName(), transactionResponse1);
-
- verify(compensation1, never()).send(request1.serviceName());
- verify(compensation2, never()).send(request2.serviceName());
- verify(compensation3, never()).send(request3.serviceName());
- }
-
- @Test
- public void restoresPartialTransactionByPlayingAllEvents() {
- addExtraChildToNode1();
-
- Iterable<EventEnvelope> events = asList(
- envelope(new SagaStartedEvent(sagaId, requestJson, NoOpSagaRequest.SAGA_START_REQUEST)),
- envelope(new TransactionStartedEvent(sagaId, request1)),
- envelope(new TransactionEndedEvent(sagaId, request1, transactionResponse1)),
- envelope(new TransactionStartedEvent(sagaId, request2)),
- envelope(new TransactionEndedEvent(sagaId, request2, transactionResponse2)),
- envelope(new TransactionStartedEvent(sagaId, request3))
- );
-
- eventStore.populate(events);
- saga.play();
-
- saga.run();
- assertThat(eventStore, contains(
- eventWith(sagaId, SAGA_START_TRANSACTION, SagaStartedEvent.class),
- eventWith(sagaId, transaction1, TransactionStartedEvent.class),
- eventWith(sagaId, transaction1, TransactionEndedEvent.class),
- eventWith(sagaId, transaction2, TransactionStartedEvent.class),
- eventWith(sagaId, transaction2, TransactionEndedEvent.class),
- eventWith(sagaId, transaction3, TransactionStartedEvent.class),
- eventWith(sagaId, transaction3, TransactionStartedEvent.class),
- eventWith(sagaId, transaction3, TransactionEndedEvent.class),
- eventWith(sagaId, SAGA_END_TRANSACTION, SagaEndedEvent.class)
- ));
-
- verify(transaction1, never()).send(anyString(), any(SagaResponse.class));
- verify(transaction2, never()).send(anyString(), any(SagaResponse.class));
- verify(transaction3).send(request3.serviceName(), transactionResponse1);
-
- verify(compensation1, never()).send(request1.serviceName());
- verify(compensation2, never()).send(request2.serviceName());
- verify(compensation3, never()).send(request3.serviceName());
- }
-
- @Test
- public void restoresToCompensationFromAbortedTransactionByPlayingAllEvents() {
- addExtraChildToNode1();
-
- Iterable<EventEnvelope> events = asList(
- envelope(new SagaStartedEvent(sagaId, requestJson, NoOpSagaRequest.SAGA_START_REQUEST)),
- envelope(new TransactionStartedEvent(sagaId, request1)),
- envelope(new TransactionEndedEvent(sagaId, request1)),
- envelope(new TransactionStartedEvent(sagaId, request2)),
- envelope(new TransactionEndedEvent(sagaId, request2)),
- envelope(new TransactionStartedEvent(sagaId, request3)),
- envelope(new TransactionAbortedEvent(sagaId, request3, exception))
- );
-
- eventStore.populate(events);
- saga.play();
-
- saga.run();
- assertThat(eventStore, contains(
- eventWith(sagaId, SAGA_START_TRANSACTION, SagaStartedEvent.class),
- eventWith(sagaId, transaction1, TransactionStartedEvent.class),
- eventWith(sagaId, transaction1, TransactionEndedEvent.class),
- eventWith(sagaId, transaction2, TransactionStartedEvent.class),
- eventWith(sagaId, transaction2, TransactionEndedEvent.class),
- eventWith(sagaId, transaction3, TransactionStartedEvent.class),
- eventWith(sagaId, transaction3, TransactionAbortedEvent.class),
- eventWith(sagaId, compensation2, TransactionCompensatedEvent.class),
- eventWith(sagaId, compensation1, TransactionCompensatedEvent.class),
- eventWith(sagaId, SAGA_START_COMPENSATION, SagaEndedEvent.class)
- ));
-
- verify(transaction1, never()).send(anyString(), any(SagaResponse.class));
- verify(transaction2, never()).send(anyString(), any(SagaResponse.class));
- verify(transaction3, never()).send(anyString(), any(SagaResponse.class));
-
- verify(compensation1).send(request1.serviceName());
- verify(compensation2).send(request2.serviceName());
- verify(compensation3, never()).send(request3.serviceName());
- }
-
- @Test
- public void restoresSagaToCompensationStateByPlayingAllEvents() {
- addExtraChildToNode1();
-
- Iterable<EventEnvelope> events = asList(
- envelope(new SagaStartedEvent(sagaId, requestJson, NoOpSagaRequest.SAGA_START_REQUEST)),
- envelope(new TransactionStartedEvent(sagaId, request1)),
- envelope(new TransactionEndedEvent(sagaId, request1)),
- envelope(new TransactionStartedEvent(sagaId, request2)),
- envelope(new TransactionEndedEvent(sagaId, request2)),
- envelope(new TransactionStartedEvent(sagaId, request3)),
- envelope(new TransactionEndedEvent(sagaId, request3)),
- envelope(new TransactionCompensatedEvent(sagaId, request2))
- );
-
- eventStore.populate(events);
- saga.play();
-
- saga.run();
- assertThat(eventStore, contains(
- eventWith(sagaId, SAGA_START_TRANSACTION, SagaStartedEvent.class),
- eventWith(sagaId, transaction1, TransactionStartedEvent.class),
- eventWith(sagaId, transaction1, TransactionEndedEvent.class),
- eventWith(sagaId, transaction2, TransactionStartedEvent.class),
- eventWith(sagaId, transaction2, TransactionEndedEvent.class),
- eventWith(sagaId, transaction3, TransactionStartedEvent.class),
- eventWith(sagaId, transaction3, TransactionEndedEvent.class),
- eventWith(sagaId, compensation2, TransactionCompensatedEvent.class),
- eventWith(sagaId, compensation3, TransactionCompensatedEvent.class),
- eventWith(sagaId, compensation1, TransactionCompensatedEvent.class),
- eventWith(sagaId, SAGA_START_COMPENSATION, SagaEndedEvent.class)
- ));
-
- verify(transaction1, never()).send(anyString(), any(SagaResponse.class));
- verify(transaction2, never()).send(anyString(), any(SagaResponse.class));
- verify(transaction3, never()).send(anyString(), any(SagaResponse.class));
-
- verify(compensation1).send(request1.serviceName());
- verify(compensation2, never()).send(request2.serviceName());
- verify(compensation3).send(request3.serviceName());
- }
-
- @Test
- public void restoresPartialCompensationByPlayingAllEvents() {
- addExtraChildToNode1();
-
- Iterable<EventEnvelope> events = asList(
- envelope(new SagaStartedEvent(sagaId, requestJson, NoOpSagaRequest.SAGA_START_REQUEST)),
- envelope(new TransactionStartedEvent(sagaId, request1)),
- envelope(new TransactionEndedEvent(sagaId, request1)),
- envelope(new TransactionStartedEvent(sagaId, request2)),
- envelope(new TransactionEndedEvent(sagaId, request2)),
- envelope(new TransactionStartedEvent(sagaId, request3)),
- envelope(new TransactionAbortedEvent(sagaId, request3, exception)),
- envelope(new TransactionCompensatedEvent(sagaId, request2))
- );
-
- eventStore.populate(events);
- saga.play();
-
- saga.run();
- assertThat(eventStore, contains(
- eventWith(sagaId, SAGA_START_TRANSACTION, SagaStartedEvent.class),
- eventWith(sagaId, transaction1, TransactionStartedEvent.class),
- eventWith(sagaId, transaction1, TransactionEndedEvent.class),
- eventWith(sagaId, transaction2, TransactionStartedEvent.class),
- eventWith(sagaId, transaction2, TransactionEndedEvent.class),
- eventWith(sagaId, transaction3, TransactionStartedEvent.class),
- eventWith(sagaId, transaction3, TransactionAbortedEvent.class),
- eventWith(sagaId, compensation2, TransactionCompensatedEvent.class),
- eventWith(sagaId, compensation1, TransactionCompensatedEvent.class),
- eventWith(sagaId, SAGA_START_COMPENSATION, SagaEndedEvent.class)
- ));
-
- verify(transaction1, never()).send(anyString(), any(SagaResponse.class));
- verify(transaction2, never()).send(anyString(), any(SagaResponse.class));
- verify(transaction3, never()).send(anyString(), any(SagaResponse.class));
-
- verify(compensation1).send(request1.serviceName());
- verify(compensation2, never()).send(request2.serviceName());
- verify(compensation3, never()).send(request3.serviceName());
- }
-
- @Test
- public void restoresSagaToEndStateByPlayingAllEvents() {
- Iterable<EventEnvelope> events = asList(
- envelope(new SagaStartedEvent(sagaId, requestJson, NoOpSagaRequest.SAGA_START_REQUEST)),
- envelope(new TransactionStartedEvent(sagaId, request1)),
- envelope(new TransactionEndedEvent(sagaId, request1)),
- envelope(new TransactionStartedEvent(sagaId, request2)),
- envelope(new TransactionEndedEvent(sagaId, request2))
- );
-
- eventStore.populate(events);
- saga.play();
-
- saga.run();
- assertThat(eventStore, contains(
- eventWith(sagaId, SAGA_START_TRANSACTION, SagaStartedEvent.class),
- eventWith(sagaId, transaction1, TransactionStartedEvent.class),
- eventWith(sagaId, transaction1, TransactionEndedEvent.class),
- eventWith(sagaId, transaction2, TransactionStartedEvent.class),
- eventWith(sagaId, transaction2, TransactionEndedEvent.class),
- eventWith(sagaId, SAGA_END_TRANSACTION, SagaEndedEvent.class)
- ));
-
- verify(transaction1, never()).send(anyString(), any(SagaResponse.class));
- verify(transaction2, never()).send(anyString(), any(SagaResponse.class));
-
- verify(compensation1, never()).send(request1.serviceName());
- verify(compensation2, never()).send(request2.serviceName());
- }
-
- @Test
- public void failFastIfSagaLogIsDown() throws Exception {
- SagaLog sagaLog = mock(SagaLog.class);
- tasks.put(SAGA_START_TASK, new SagaStartTask(sagaId, requestJson, sagaLog));
-
- doThrow(RuntimeException.class).when(sagaLog).offer(any(SagaStartedEvent.class));
-
- try {
- saga.run();
- expectFailing(SagaStartFailedException.class);
- } catch (SagaStartFailedException e) {
- assertThat(e.getMessage(), is("Failed to persist SagaStartedEvent for " + requestJson));
- }
-
- verify(sagaLog).offer(any(SagaStartedEvent.class));
- verify(transaction1, never()).send(anyString(), any(SagaResponse.class));
- verify(transaction2, never()).send(anyString(), any(SagaResponse.class));
-
- verify(compensation1, never()).send(request1.serviceName());
- verify(compensation2, never()).send(request2.serviceName());
- }
-
- private Answer<SagaResponse> withAnswer(final Callable<SagaResponse> callable) {
- return new Answer<SagaResponse>() {
- @Override
- public SagaResponse answer(InvocationOnMock invocation) throws Throwable {
- return callable.call();
- }
- };
- }
-
- private EventEnvelope envelope(SagaEvent event) {
- return new EventEnvelope(idGenerator.nextId(), event);
- }
-
- private void addExtraChildToNode1() {
- node1.addChild(node3);
- node3.addChild(leaf);
- }
-
- private SagaRequest request(String requestId,
- String serviceName,
- Transaction transaction,
- Compensation compensation,
- String... parentIds) {
-
- return new SagaRequestImpl(requestId, serviceName, TYPE_REST, transaction, compensation, parentIds);
- }
-
- private SagaRequest request(String requestId,
- String serviceName,
- Transaction transaction,
- Compensation compensation,
- Fallback fallback) {
-
- return new SagaRequestImpl(requestId, serviceName, TYPE_REST, transaction, compensation, fallback);
- }
-
- private HashSet<String> setOf(String requestId) {
- return new HashSet<>(singletonList(requestId));
- }
-
- private RequestProcessTask requestProcessTask(RecoveryPolicy recoveryPolicy) {
- return new RequestProcessTask(sagaId, sagaLog, recoveryPolicy, new FallbackPolicy(100));
- }
-}
diff --git a/saga-core/src/test/java/org/apache/servicecomb/saga/core/SagaStartTaskTest.java b/saga-core/src/test/java/org/apache/servicecomb/saga/core/SagaStartTaskTest.java
deleted file mode 100644
index b1d0c4e..0000000
--- a/saga-core/src/test/java/org/apache/servicecomb/saga/core/SagaStartTaskTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import static com.seanyinx.github.unit.scaffolding.AssertUtils.expectFailing;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.startsWith;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
-
-import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-
-public class SagaStartTaskTest {
- private final SagaRequest request = mock(SagaRequest.class);
- private final SagaLog sagaLog = mock(SagaLog.class);
-
- private final String sagaId = "0";
- private final String requestJson = null;
- private final SagaStartTask sagaStartTask = new SagaStartTask(sagaId, requestJson, sagaLog);
-
- @Test
- public void emptyResponseOnSuccessfulEventPersistence() throws Exception {
- ArgumentCaptor<SagaStartedEvent> argumentCaptor = ArgumentCaptor.forClass(SagaStartedEvent.class);
- doNothing().when(sagaLog).offer(argumentCaptor.capture());
-
- sagaStartTask.commit(request, SagaResponse.EMPTY_RESPONSE);
-
- SagaStartedEvent event = argumentCaptor.getValue();
- assertThat(event.sagaId, is(sagaId));
- assertThat(event.json(null), is(requestJson));
- assertThat(event.payload(), is(request));
- }
-
- @Test
- public void blowsUpWhenEventIsNotPersisted() {
- doThrow(RuntimeException.class).when(sagaLog).offer(any(SagaStartedEvent.class));
-
- try {
- sagaStartTask.commit(request, SagaResponse.EMPTY_RESPONSE);
- expectFailing(SagaStartFailedException.class);
- } catch (SagaStartFailedException e) {
- assertThat(e.getMessage(), startsWith("Failed to persist SagaStartedEvent"));
- }
- }
-}
diff --git a/saga-core/src/test/java/org/apache/servicecomb/saga/core/TransactionImpl.java b/saga-core/src/test/java/org/apache/servicecomb/saga/core/TransactionImpl.java
deleted file mode 100644
index b0d4a35..0000000
--- a/saga-core/src/test/java/org/apache/servicecomb/saga/core/TransactionImpl.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core;
-
-import java.util.Map;
-
-public class TransactionImpl extends RestOperation implements Transaction {
-
- public TransactionImpl(String path, String method, Map<String, Map<String, String>> params) {
- super(path, method, params);
- }
-
- @Override
- public int retries() {
- return INFINITE_RETRY;
- }
-}
diff --git a/saga-core/src/test/java/org/apache/servicecomb/saga/core/dag/DirectedAcyclicGraphTraversalTest.java b/saga-core/src/test/java/org/apache/servicecomb/saga/core/dag/DirectedAcyclicGraphTraversalTest.java
deleted file mode 100644
index 3c54fcf..0000000
--- a/saga-core/src/test/java/org/apache/servicecomb/saga/core/dag/DirectedAcyclicGraphTraversalTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.core.dag;
-
-import static java.util.Arrays.asList;
-import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
-import static org.junit.Assert.assertThat;
-
-import java.util.Collection;
-import org.junit.Before;
-import org.junit.Test;
-
-public class DirectedAcyclicGraphTraversalTest {
-
- private final Node<String> root = new Node<>(0, "i don't care");
- private final Node<String> node1 = new Node<>(1, "i don't care");
- private final Node<String> node2 = new Node<>(2, "i don't care");
- private final Node<String> node3 = new Node<>(3, "i don't care");
- private final Node<String> node4 = new Node<>(4, "i don't care");
- private final Node<String> node5 = new Node<>(5, "i don't care");
- private final Node<String> leaf = new Node<>(6, "i don't care");
-
- private final SingleLeafDirectedAcyclicGraph<String> dag = new SingleLeafDirectedAcyclicGraph<>(root, leaf);
-
- // 0
- // / \
- // 1 \
- // / \ \
- // 3 4 2
- // \ / /
- // 5 /
- // \ /
- // 6
- @Before
- public void setUp() throws Exception {
- root.addChildren(asList(node1, node2));
- node1.addChildren(asList(node3, node4));
- node3.addChild(node5);
- node4.addChild(node5);
- node5.addChild(leaf);
- node2.addChild(leaf);
- }
-
- @Test
- public void traverseGraphOneLevelPerStepFromRoot() {
- Traveller<String> traveller = new ByLevelTraveller<>(dag, new FromRootTraversalDirection<String>());
-
- Collection<Node<String>> nodes = traveller.nodes();
-
- traveller.next();
- assertThat(nodes, contains(root));
-
- traveller.next();
- assertThat(nodes, contains(root, node1, node2));
-
- traveller.next();
- assertThat(nodes, contains(root, node1, node2, node3, node4));
-
- traveller.next();
- assertThat(nodes, contains(root, node1, node2, node3, node4, node5));
-
- traveller.next();
- assertThat(nodes, contains(root, node1, node2, node3, node4, node5, leaf));
- }
-
- @Test
- public void traverseGraphOneLevelPerStepFromLeaf() {
- Traveller<String> traveller = new ByLevelTraveller<>(dag, new FromLeafTraversalDirection<String>());
-
- Collection<Node<String>> nodes = traveller.nodes();
-
- traveller.next();
- assertThat(nodes, contains(leaf));
-
- traveller.next();
- assertThat(nodes, contains(leaf, node2, node5));
... 10920 lines suppressed ...
[servicecomb-pack] 08/13: SCB-976 Renamed the package name of omega
modules
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/servicecomb-pack.git
commit 00cb37010c093f470278873b52e520248008e03d
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Fri Dec 14 14:35:35 2018 +0800
SCB-976 Renamed the package name of omega modules
---
.../saga/demo/dubbo/servicea/ApplicationA.java | 2 +-
.../saga/demo/dubbo/servicea/ServiceA.java | 4 +--
.../saga/demo/dubbo/serviceb/ApplicationB.java | 2 +-
.../saga/demo/dubbo/serviceb/ServiceB.java | 2 +-
.../saga/demo/dubbo/servicec/ApplicationC.java | 2 +-
.../saga/demo/dubbo/servicec/ServiceC.java | 2 +-
.../saga/demo/scb/booking/BookingApplication.java | 2 +-
.../saga/demo/scb/booking/BookingController.java | 5 +--
.../saga/demo/scb/car/CarApplication.java | 2 +-
.../saga/demo/scb/car/CarBookingService.java | 2 +-
.../saga/demo/scb/hotel/HotelApplication.java | 2 +-
.../saga/demo/scb/hotel/HotelBookingService.java | 2 +-
.../saga/demo/pack/booking/Application.java | 2 +-
.../saga/demo/pack/booking/BookingController.java | 2 +-
.../saga/demo/pack/car/Application.java | 2 +-
.../saga/demo/pack/car/CarBookingService.java | 2 +-
.../saga/demo/pack/hotel/Application.java | 2 +-
.../saga/demo/pack/hotel/HotelBookingService.java | 2 +-
.../saga/demo/pack/inventory/InventoryService.java | 2 +-
.../pack/inventory/TccInventoryApplication.java | 2 +-
.../demo/pack/ordering/OrderingController.java | 2 +-
.../demo/pack/ordering/TccOrderingApplication.java | 2 +-
.../saga/demo/pack/payment/PaymentService.java | 2 +-
.../demo/pack/payment/TccPaymentApplication.java | 2 +-
.../pack/tests/GreetingApplication.java | 2 +-
.../integration/pack/tests/GreetingController.java | 4 +--
.../integration/pack/tests/GreetingService.java | 2 +-
.../saga/integration/pack/tests/PackIT.java | 2 +-
.../omega/connector/grpc/AlphaClusterConfig.java | 12 +++----
.../omega/connector/grpc/core/FastestSender.java | 4 +--
.../connector/grpc/core/GrpcOnErrorHandler.java | 6 ++--
.../connector/grpc/core/LoadBalanceContext.java | 4 +--
.../grpc/core/LoadBalanceContextBuilder.java | 13 +++----
.../grpc/core/LoadBalanceSenderAdapter.java | 8 ++---
.../connector/grpc/core/MessageSenderPicker.java | 4 +--
.../connector/grpc/core/PendingTaskRunner.java | 2 +-
.../grpc/core/PushBackReconnectRunnable.java | 4 +--
.../grpc/core/ReconnectStreamObserver.java | 6 ++--
.../omega/connector/grpc/core/SenderExecutor.java | 4 +--
.../omega/connector/grpc/core/TransactionType.java | 2 +-
.../grpc/saga/GrpcCompensateStreamObserver.java | 12 +++----
.../grpc/saga/GrpcSagaClientMessageSender.java | 18 +++++-----
.../grpc/saga/RetryableMessageSender.java | 12 +++----
.../connector/grpc/saga/SagaLoadBalanceSender.java | 19 +++++-----
.../grpc/tcc/GrpcCoordinateStreamObserver.java | 11 +++---
.../grpc/tcc/GrpcTccClientMessageSender.java | 21 +++++------
.../connector/grpc/tcc/TccLoadBalanceSender.java | 25 ++++++-------
.../grpc/LoadBalanceContextBuilderTest.java | 20 +++++------
.../connector/grpc/LoadBalanceSenderTestBase.java | 2 +-
.../grpc/PushBackReconnectRunnableTest.java | 6 ++--
.../grpc/saga/RetryableMessageSenderTest.java | 16 ++++-----
.../saga/SagaLoadBalanceSenderWithTLSTest.java | 14 ++++----
.../grpc/saga/SagaLoadBalancedSenderTest.java | 26 +++++++-------
.../grpc/saga/SagaLoadBalancedSenderTestBase.java | 10 +++---
.../grpc/tcc/GrpcTccClientMessageSenderTest.java | 16 ++++-----
.../connector/grpc/tcc/MyTccEventServiceImpl.java | 2 +-
.../grpc/tcc/TccLoadBalanceSenderTest.java | 36 +++++++++----------
.../omega/context/CallbackContext.java | 2 +-
.../{saga => pack}/omega/context/IdGenerator.java | 2 +-
.../{saga => pack}/omega/context/OmegaContext.java | 5 +--
.../omega/context/ServiceConfig.java | 2 +-
.../omega/context/UniqueIdGenerator.java | 2 +-
.../omega/context/annotations/SagaStart.java | 2 +-
.../omega/context/annotations/TccStart.java | 2 +-
.../omega/context/OmegaContextTest.java | 2 +-
.../omega/context/UniqueIdGeneratorTest.java | 2 +-
.../omega/format/KryoMessageFormat.java | 4 +--
.../{saga => pack}/omega/format/MessageFormat.java | 6 ++--
.../omega/format/KryoMessageFormatTest.java | 2 +-
.../omega/format/MessageFormatTestBase.java | 6 ++--
.../{saga => pack}/omega/spring/EnableOmega.java | 7 ++--
.../omega/spring/OmegaSpringConfig.java | 42 +++++++++++-----------
.../omega/transaction/spring/CallbackType.java | 2 +-
.../spring/CompensableAnnotationProcessor.java | 6 ++--
.../spring/CompensableMethodCheckingCallback.java | 6 ++--
.../transaction/spring/ExecutorFieldCallback.java | 6 ++--
.../transaction/spring/MethodCheckingCallback.java | 6 ++--
.../spring/ParticipateAnnotationProcessor.java | 6 ++--
.../spring/ParticipateMethodCheckingCallback.java | 6 ++--
.../spring/TransactionAspectConfig.java | 28 +++++++--------
.../spring/annotations/OmegaContextAware.java | 2 +-
.../spring/CompensableAnnotationCheckingTest.java | 2 +-
.../omega/transaction/spring/MessageConfig.java | 28 +++++++--------
.../spring/MisconfiguredAnnotation.java | 4 +--
.../spring/MisconfiguredRetriesService.java | 4 +--
.../transaction/spring/MisconfiguredService.java | 4 +--
.../transaction/spring/TccInterceptorTest.java | 17 +++++----
.../omega/transaction/spring/TccUserService.java | 4 +--
.../transaction/spring/TccUserServiceMain.java | 4 +--
.../spring/TransactionInterceptionTest.java | 21 ++++++-----
.../transaction/spring/TransactionTestMain.java | 2 +-
.../spring/TransactionalUserService.java | 4 +--
.../omega/transaction/spring/User.java | 2 +-
.../omega/transaction/spring/UserRepository.java | 2 +-
.../omega/transaction/AlphaResponse.java | 2 +-
.../omega/transaction/CompensableInterceptor.java | 4 +--
.../transaction/CompensationMessageHandler.java | 4 +--
.../omega/transaction/DefaultRecovery.java | 6 ++--
.../omega/transaction/EventAwareInterceptor.java | 2 +-
.../omega/transaction/ForwardRecovery.java | 6 ++--
.../omega/transaction/MessageDeserializer.java | 2 +-
.../omega/transaction/MessageHandler.java | 2 +-
.../omega/transaction/MessageSender.java | 2 +-
.../omega/transaction/MessageSerializer.java | 2 +-
.../transaction/NoOpEventAwareInterceptor.java | 2 +-
.../omega/transaction/OmegaException.java | 2 +-
.../omega/transaction/RecoveryPolicy.java | 6 ++--
.../omega/transaction/RecoveryPolicyFactory.java | 2 +-
.../omega/transaction/SagaEndedEvent.java | 2 +-
.../omega/transaction/SagaMessageSender.java | 2 +-
.../transaction/SagaStartAnnotationProcessor.java | 4 +--
.../omega/transaction/SagaStartAspect.java | 8 ++---
.../omega/transaction/SagaStartedEvent.java | 2 +-
.../omega/transaction/TransactionAspect.java | 8 ++---
.../omega/transaction/TxAbortedEvent.java | 2 +-
.../omega/transaction/TxCompensatedEvent.java | 2 +-
.../omega/transaction/TxEndedEvent.java | 2 +-
.../{saga => pack}/omega/transaction/TxEvent.java | 2 +-
.../omega/transaction/TxStartedEvent.java | 2 +-
.../omega/transaction/annotations/Compensable.java | 2 +-
.../omega/transaction/annotations/Participate.java | 2 +-
.../transaction/tcc/CoordinateMessageHandler.java | 8 ++---
.../transaction/tcc/DefaultParametersContext.java | 2 +-
.../omega/transaction/tcc/ParametersContext.java | 2 +-
.../omega/transaction/tcc/TccEventService.java | 12 +++----
.../omega/transaction/tcc/TccMessageHandler.java | 2 +-
.../omega/transaction/tcc/TccMessageSender.java | 16 ++++-----
.../transaction/tcc/TccParticipatorAspect.java | 10 +++---
.../tcc/TccStartAnnotationProcessor.java | 12 +++----
.../omega/transaction/tcc/TccStartAspect.java | 10 +++---
.../transaction/tcc/events/CoordinatedEvent.java | 2 +-
.../transaction/tcc/events/ParticipatedEvent.java | 2 +-
.../transaction/tcc/events/TccEndedEvent.java | 2 +-
.../transaction/tcc/events/TccStartedEvent.java | 2 +-
.../transaction/CompensableInterceptorTest.java | 6 ++--
.../CompensationMessageHandlerTest.java | 4 +--
.../omega/transaction/DefaultRecoveryTest.java | 8 ++---
.../omega/transaction/ForwardRecoveryTest.java | 8 ++---
.../SagaStartAnnotationProcessorTest.java | 6 ++--
.../omega/transaction/SagaStartAspectTest.java | 8 ++---
.../omega/transaction/TransactionAspectTest.java | 8 ++---
.../tcc/CoordinateMessageHandlerTest.java | 16 ++++-----
.../transaction/tcc/TccParticipatorAspectTest.java | 18 +++++-----
.../tcc/TccStartAnnotationProcessorTest.java | 18 +++++-----
.../omega/transaction/tcc/TccStartAspectTest.java | 18 +++++-----
.../transport/dubbo/SagaDubboConsumerFilter.java | 9 +++--
.../transport/dubbo/SagaDubboProviderFilter.java | 9 +++--
.../META-INF/dubbo/com.alibaba.dubbo.rpc.Filter | 4 +--
.../dubbo}/SagaDubboConsumerFilterTest.java | 8 ++---
.../dubbo}/SagaDubboProviderFilterTest.java | 7 ++--
.../transport/feign/FeignAutoConfiguration.java | 4 +--
.../feign/FeignClientRequestInterceptor.java | 8 ++---
.../feign/FeignAutoConfigurationTest.java | 6 ++--
.../transport/resttemplate/RestTemplateConfig.java | 4 +--
.../TransactionClientHttpRequestInterceptor.java | 9 +++--
.../TransactionHandlerInterceptor.java | 8 ++---
.../omega/transport/resttemplate/WebConfig.java | 4 +--
.../src/main/resources/META-INF/spring.factories | 4 +--
...ransactionClientHttpRequestInterceptorTest.java | 6 ++--
.../TransactionHandlerInterceptorTest.java | 6 ++--
.../transport/servicecomb/SagaConsumerHandler.java | 8 ++---
.../transport/servicecomb/SagaProviderHandler.java | 8 ++---
.../src/main/resources/config/cse.handler.xml | 6 ++--
.../servicecomb/SagaConsumerHandlerTest.java | 6 ++--
.../servicecomb/SagaProviderHandlerTest.java | 11 +++---
.../jpa/EclipseLinkJpaConfiguration.java | 2 +-
.../src/main/resources/META-INF/spring.factories | 2 +-
167 files changed, 533 insertions(+), 542 deletions(-)
diff --git a/demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/ApplicationA.java b/demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/ApplicationA.java
index ae715a6..c8714e8 100644
--- a/demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/ApplicationA.java
+++ b/demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/ApplicationA.java
@@ -16,7 +16,7 @@
*/
package org.apache.servicecomb.saga.demo.dubbo.servicea;
-import org.apache.servicecomb.saga.omega.spring.EnableOmega;
+import org.apache.servicecomb.pack.omega.spring.EnableOmega;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.ImportResource;
diff --git a/demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/ServiceA.java b/demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/ServiceA.java
index 0bd5f7b..c1a69cd 100644
--- a/demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/ServiceA.java
+++ b/demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/ServiceA.java
@@ -23,8 +23,8 @@ import org.apache.servicecomb.saga.demo.dubbo.api.IServiceB;
import org.apache.servicecomb.saga.demo.dubbo.api.IServiceC;
import org.apache.servicecomb.saga.demo.dubbo.pub.AbsService;
import org.apache.servicecomb.saga.demo.dubbo.pub.InvokeContext;
-import org.apache.servicecomb.saga.omega.context.annotations.SagaStart;
-import org.apache.servicecomb.saga.omega.transaction.annotations.Compensable;
+import org.apache.servicecomb.pack.omega.context.annotations.SagaStart;
+import org.apache.servicecomb.pack.omega.transaction.annotations.Compensable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/saga/demo/dubbo/serviceb/ApplicationB.java b/demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/saga/demo/dubbo/serviceb/ApplicationB.java
index e31c375..ccfcdaf 100644
--- a/demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/saga/demo/dubbo/serviceb/ApplicationB.java
+++ b/demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/saga/demo/dubbo/serviceb/ApplicationB.java
@@ -17,7 +17,7 @@
package org.apache.servicecomb.saga.demo.dubbo.serviceb;
-import org.apache.servicecomb.saga.omega.spring.EnableOmega;
+import org.apache.servicecomb.pack.omega.spring.EnableOmega;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.ImportResource;
diff --git a/demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/saga/demo/dubbo/serviceb/ServiceB.java b/demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/saga/demo/dubbo/serviceb/ServiceB.java
index 01cfb89..85c409f 100644
--- a/demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/saga/demo/dubbo/serviceb/ServiceB.java
+++ b/demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/saga/demo/dubbo/serviceb/ServiceB.java
@@ -22,7 +22,7 @@ import org.apache.servicecomb.saga.demo.dubbo.api.IServiceB;
import org.apache.servicecomb.saga.demo.dubbo.api.IServiceC;
import org.apache.servicecomb.saga.demo.dubbo.pub.AbsService;
import org.apache.servicecomb.saga.demo.dubbo.pub.InvokeContext;
-import org.apache.servicecomb.saga.omega.transaction.annotations.Compensable;
+import org.apache.servicecomb.pack.omega.transaction.annotations.Compensable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicec/ApplicationC.java b/demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicec/ApplicationC.java
index 5b3d7c7..add67e3 100644
--- a/demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicec/ApplicationC.java
+++ b/demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicec/ApplicationC.java
@@ -16,7 +16,7 @@
*/
package org.apache.servicecomb.saga.demo.dubbo.servicec;
-import org.apache.servicecomb.saga.omega.spring.EnableOmega;
+import org.apache.servicecomb.pack.omega.spring.EnableOmega;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.ImportResource;
diff --git a/demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicec/ServiceC.java b/demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicec/ServiceC.java
index a2abd2e..102139c 100644
--- a/demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicec/ServiceC.java
+++ b/demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicec/ServiceC.java
@@ -21,7 +21,7 @@ import java.lang.invoke.MethodHandles;
import org.apache.servicecomb.saga.demo.dubbo.api.IServiceC;
import org.apache.servicecomb.saga.demo.dubbo.pub.AbsService;
import org.apache.servicecomb.saga.demo.dubbo.pub.InvokeContext;
-import org.apache.servicecomb.saga.omega.transaction.annotations.Compensable;
+import org.apache.servicecomb.pack.omega.transaction.annotations.Compensable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.transaction.annotation.Transactional;
diff --git a/demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/saga/demo/scb/booking/BookingApplication.java b/demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/saga/demo/scb/booking/BookingApplication.java
index bc24337..c4ee655 100644
--- a/demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/saga/demo/scb/booking/BookingApplication.java
+++ b/demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/saga/demo/scb/booking/BookingApplication.java
@@ -17,7 +17,7 @@
package org.apache.servicecomb.saga.demo.scb.booking;
-import org.apache.servicecomb.saga.omega.spring.EnableOmega;
+import org.apache.servicecomb.pack.omega.spring.EnableOmega;
import org.apache.servicecomb.springboot.starter.provider.EnableServiceComb;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/saga/demo/scb/booking/BookingController.java b/demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/saga/demo/scb/booking/BookingController.java
index cc6947b..d24512b 100644
--- a/demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/saga/demo/scb/booking/BookingController.java
+++ b/demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/saga/demo/scb/booking/BookingController.java
@@ -19,13 +19,10 @@ package org.apache.servicecomb.saga.demo.scb.booking;
import org.apache.servicecomb.provider.rest.common.RestSchema;
import org.apache.servicecomb.provider.springmvc.reference.RestTemplateBuilder;
-import org.apache.servicecomb.saga.omega.context.annotations.SagaStart;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
+import org.apache.servicecomb.pack.omega.context.annotations.SagaStart;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.RestTemplate;
@RestSchema(schemaId = "booking")
diff --git a/demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarApplication.java b/demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarApplication.java
index 435168d..d6366f9 100644
--- a/demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarApplication.java
+++ b/demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarApplication.java
@@ -17,7 +17,7 @@
package org.apache.servicecomb.saga.demo.scb.car;
-import org.apache.servicecomb.saga.omega.spring.EnableOmega;
+import org.apache.servicecomb.pack.omega.spring.EnableOmega;
import org.apache.servicecomb.springboot.starter.provider.EnableServiceComb;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarBookingService.java b/demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarBookingService.java
index a94cf09..9a8a257 100644
--- a/demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarBookingService.java
+++ b/demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarBookingService.java
@@ -21,7 +21,7 @@ import java.util.Collection;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.servicecomb.saga.omega.transaction.annotations.Compensable;
+import org.apache.servicecomb.pack.omega.transaction.annotations.Compensable;
import org.springframework.stereotype.Service;
@Service
diff --git a/demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelApplication.java b/demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelApplication.java
index ce8c0cb..3738444 100644
--- a/demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelApplication.java
+++ b/demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelApplication.java
@@ -17,7 +17,7 @@
package org.apache.servicecomb.saga.demo.scb.hotel;
-import org.apache.servicecomb.saga.omega.spring.EnableOmega;
+import org.apache.servicecomb.pack.omega.spring.EnableOmega;
import org.apache.servicecomb.springboot.starter.provider.EnableServiceComb;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelBookingService.java b/demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelBookingService.java
index 4d4d550..6164ee7 100644
--- a/demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelBookingService.java
+++ b/demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelBookingService.java
@@ -21,7 +21,7 @@ import java.util.Collection;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.servicecomb.saga.omega.transaction.annotations.Compensable;
+import org.apache.servicecomb.pack.omega.transaction.annotations.Compensable;
import org.springframework.stereotype.Service;
@Service
diff --git a/demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/Application.java b/demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/Application.java
index 2dda806..0a5fdf9 100644
--- a/demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/Application.java
+++ b/demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/Application.java
@@ -17,7 +17,7 @@
package org.apache.servicecomb.saga.demo.pack.booking;
-import org.apache.servicecomb.saga.omega.spring.EnableOmega;
+import org.apache.servicecomb.pack.omega.spring.EnableOmega;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/BookingController.java b/demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/BookingController.java
index 5091321..fd7d94f 100644
--- a/demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/BookingController.java
+++ b/demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/BookingController.java
@@ -17,7 +17,7 @@
package org.apache.servicecomb.saga.demo.pack.booking;
-import org.apache.servicecomb.saga.omega.context.annotations.SagaStart;
+import org.apache.servicecomb.pack.omega.context.annotations.SagaStart;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.PathVariable;
diff --git a/demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/Application.java b/demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/Application.java
index a4fe3d9..17dee59 100644
--- a/demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/Application.java
+++ b/demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/Application.java
@@ -17,7 +17,7 @@
package org.apache.servicecomb.saga.demo.pack.car;
-import org.apache.servicecomb.saga.omega.spring.EnableOmega;
+import org.apache.servicecomb.pack.omega.spring.EnableOmega;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingService.java b/demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingService.java
index e225280..abc233e 100644
--- a/demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingService.java
+++ b/demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingService.java
@@ -17,7 +17,7 @@
package org.apache.servicecomb.saga.demo.pack.car;
-import org.apache.servicecomb.saga.omega.transaction.annotations.Compensable;
+import org.apache.servicecomb.pack.omega.transaction.annotations.Compensable;
import org.springframework.stereotype.Service;
import java.util.Collection;
diff --git a/demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/Application.java b/demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/Application.java
index 26a55e3..27bbdc2 100644
--- a/demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/Application.java
+++ b/demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/Application.java
@@ -17,7 +17,7 @@
package org.apache.servicecomb.saga.demo.pack.hotel;
-import org.apache.servicecomb.saga.omega.spring.EnableOmega;
+import org.apache.servicecomb.pack.omega.spring.EnableOmega;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingService.java b/demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingService.java
index 9abf040..74a89cd 100644
--- a/demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingService.java
+++ b/demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingService.java
@@ -17,7 +17,7 @@
package org.apache.servicecomb.saga.demo.pack.hotel;
-import org.apache.servicecomb.saga.omega.transaction.annotations.Compensable;
+import org.apache.servicecomb.pack.omega.transaction.annotations.Compensable;
import org.springframework.stereotype.Service;
import java.util.Collection;
diff --git a/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/InventoryService.java b/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/InventoryService.java
index 5ff8db1..d4d057b 100644
--- a/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/InventoryService.java
+++ b/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/InventoryService.java
@@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
import javax.transaction.Transactional;
-import org.apache.servicecomb.saga.omega.transaction.annotations.Participate;
+import org.apache.servicecomb.pack.omega.transaction.annotations.Participate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/TccInventoryApplication.java b/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/TccInventoryApplication.java
index 878c156..64afe30 100644
--- a/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/TccInventoryApplication.java
+++ b/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/TccInventoryApplication.java
@@ -17,7 +17,7 @@
package org.apache.servicecomb.saga.demo.pack.inventory;
-import org.apache.servicecomb.saga.omega.spring.EnableOmega;
+import org.apache.servicecomb.pack.omega.spring.EnableOmega;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/saga/demo/pack/ordering/OrderingController.java b/demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/saga/demo/pack/ordering/OrderingController.java
index 5affe76..c5e9ea6 100644
--- a/demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/saga/demo/pack/ordering/OrderingController.java
+++ b/demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/saga/demo/pack/ordering/OrderingController.java
@@ -16,7 +16,7 @@
*/
package org.apache.servicecomb.saga.demo.pack.ordering;
-import org.apache.servicecomb.saga.omega.context.annotations.TccStart;
+import org.apache.servicecomb.pack.omega.context.annotations.TccStart;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
diff --git a/demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/saga/demo/pack/ordering/TccOrderingApplication.java b/demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/saga/demo/pack/ordering/TccOrderingApplication.java
index a4000fe..f482e42 100644
--- a/demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/saga/demo/pack/ordering/TccOrderingApplication.java
+++ b/demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/saga/demo/pack/ordering/TccOrderingApplication.java
@@ -17,7 +17,7 @@
package org.apache.servicecomb.saga.demo.pack.ordering;
-import org.apache.servicecomb.saga.omega.spring.EnableOmega;
+import org.apache.servicecomb.pack.omega.spring.EnableOmega;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentService.java b/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentService.java
index b10d72f..2fb1ec2 100644
--- a/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentService.java
+++ b/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentService.java
@@ -21,7 +21,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.servicecomb.saga.omega.transaction.annotations.Participate;
+import org.apache.servicecomb.pack.omega.transaction.annotations.Participate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
diff --git a/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/TccPaymentApplication.java b/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/TccPaymentApplication.java
index 40f67c4..fa5720b 100644
--- a/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/TccPaymentApplication.java
+++ b/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/TccPaymentApplication.java
@@ -17,7 +17,7 @@
package org.apache.servicecomb.saga.demo.pack.payment;
-import org.apache.servicecomb.saga.omega.spring.EnableOmega;
+import org.apache.servicecomb.pack.omega.spring.EnableOmega;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/GreetingApplication.java b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/GreetingApplication.java
index c49829c..1cbfa8e 100644
--- a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/GreetingApplication.java
+++ b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/GreetingApplication.java
@@ -20,7 +20,7 @@ package org.apache.servicecomb.saga.integration.pack.tests;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
-import org.apache.servicecomb.saga.omega.spring.EnableOmega;
+import org.apache.servicecomb.pack.omega.spring.EnableOmega;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.domain.EntityScan;
diff --git a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/GreetingController.java b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/GreetingController.java
index e497cec..27b6938 100644
--- a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/GreetingController.java
+++ b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/GreetingController.java
@@ -17,8 +17,8 @@
package org.apache.servicecomb.saga.integration.pack.tests;
-import org.apache.servicecomb.saga.omega.context.annotations.SagaStart;
-import org.apache.servicecomb.saga.omega.transaction.annotations.Compensable;
+import org.apache.servicecomb.pack.omega.context.annotations.SagaStart;
+import org.apache.servicecomb.pack.omega.transaction.annotations.Compensable;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
diff --git a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/GreetingService.java b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/GreetingService.java
index 554dc15..c96c766 100644
--- a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/GreetingService.java
+++ b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/GreetingService.java
@@ -19,7 +19,7 @@ package org.apache.servicecomb.saga.integration.pack.tests;
import java.util.Queue;
-import org.apache.servicecomb.saga.omega.transaction.annotations.Compensable;
+import org.apache.servicecomb.pack.omega.transaction.annotations.Compensable;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/PackIT.java b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/PackIT.java
index ca6376d..a7a5bc8 100644
--- a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/PackIT.java
+++ b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/PackIT.java
@@ -32,7 +32,7 @@ import java.util.List;
import java.util.Queue;
import org.apache.servicecomb.saga.alpha.core.TxEvent;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/AlphaClusterConfig.java b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/AlphaClusterConfig.java
similarity index 94%
rename from omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/AlphaClusterConfig.java
rename to omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/AlphaClusterConfig.java
index 43fb8fc..d590ac3 100644
--- a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/AlphaClusterConfig.java
+++ b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/AlphaClusterConfig.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc;
+package org.apache.servicecomb.pack.omega.connector.grpc;
import java.util.Collections;
import java.util.List;
-import org.apache.servicecomb.saga.omega.transaction.MessageDeserializer;
-import org.apache.servicecomb.saga.omega.transaction.MessageHandler;
-import org.apache.servicecomb.saga.omega.transaction.MessageSerializer;
-import org.apache.servicecomb.saga.omega.transaction.tcc.TccMessageHandler;
+import org.apache.servicecomb.pack.omega.transaction.MessageDeserializer;
+import org.apache.servicecomb.pack.omega.transaction.MessageHandler;
+import org.apache.servicecomb.pack.omega.transaction.MessageSerializer;
+import org.apache.servicecomb.pack.omega.transaction.tcc.TccMessageHandler;
public class AlphaClusterConfig {
@@ -203,4 +203,4 @@ public class AlphaClusterConfig {
public TccMessageHandler getTccMessageHandler() {
return tccMessageHandler;
}
-}
\ No newline at end of file
+}
diff --git a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/FastestSender.java b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/FastestSender.java
similarity index 92%
rename from omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/FastestSender.java
rename to omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/FastestSender.java
index 486c1b7..7831f4e 100644
--- a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/FastestSender.java
+++ b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/FastestSender.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc.core;
+package org.apache.servicecomb.pack.omega.connector.grpc.core;
import com.google.common.base.Supplier;
import java.util.Map;
-import org.apache.servicecomb.saga.omega.transaction.MessageSender;
+import org.apache.servicecomb.pack.omega.transaction.MessageSender;
/**
* The strategy of picking the fastest {@link MessageSender}
diff --git a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/GrpcOnErrorHandler.java b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/GrpcOnErrorHandler.java
similarity index 94%
rename from omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/GrpcOnErrorHandler.java
rename to omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/GrpcOnErrorHandler.java
index 2a54f96..d2ad6ee 100644
--- a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/GrpcOnErrorHandler.java
+++ b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/GrpcOnErrorHandler.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc.core;
+package org.apache.servicecomb.pack.omega.connector.grpc.core;
import com.google.common.base.Supplier;
import java.util.Map;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
-import org.apache.servicecomb.saga.omega.transaction.MessageSender;
-import org.apache.servicecomb.saga.omega.transaction.OmegaException;
+import org.apache.servicecomb.pack.omega.transaction.MessageSender;
+import org.apache.servicecomb.pack.omega.transaction.OmegaException;
public class GrpcOnErrorHandler {
diff --git a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/LoadBalanceContext.java b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/LoadBalanceContext.java
similarity index 94%
rename from omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/LoadBalanceContext.java
rename to omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/LoadBalanceContext.java
index e2425fc..46af514 100644
--- a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/LoadBalanceContext.java
+++ b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/LoadBalanceContext.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc.core;
+package org.apache.servicecomb.pack.omega.connector.grpc.core;
import io.grpc.ManagedChannel;
import java.util.Collection;
import java.util.Map;
-import org.apache.servicecomb.saga.omega.transaction.MessageSender;
+import org.apache.servicecomb.pack.omega.transaction.MessageSender;
public class LoadBalanceContext {
diff --git a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/LoadBalanceContextBuilder.java b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/LoadBalanceContextBuilder.java
similarity index 93%
rename from omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/LoadBalanceContextBuilder.java
rename to omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/LoadBalanceContextBuilder.java
index 2768135..c25e0c8 100644
--- a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/LoadBalanceContextBuilder.java
+++ b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/LoadBalanceContextBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc.core;
+package org.apache.servicecomb.pack.omega.connector.grpc.core;
import com.google.common.base.Optional;
import io.grpc.ManagedChannel;
@@ -35,11 +35,12 @@ import java.util.Map;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
import javax.net.ssl.SSLException;
-import org.apache.servicecomb.saga.omega.connector.grpc.AlphaClusterConfig;
-import org.apache.servicecomb.saga.omega.connector.grpc.saga.GrpcSagaClientMessageSender;
-import org.apache.servicecomb.saga.omega.connector.grpc.tcc.GrpcTccClientMessageSender;
-import org.apache.servicecomb.saga.omega.context.ServiceConfig;
-import org.apache.servicecomb.saga.omega.transaction.MessageSender;
+
+import org.apache.servicecomb.pack.omega.connector.grpc.saga.GrpcSagaClientMessageSender;
+import org.apache.servicecomb.pack.omega.connector.grpc.AlphaClusterConfig;
+import org.apache.servicecomb.pack.omega.connector.grpc.tcc.GrpcTccClientMessageSender;
+import org.apache.servicecomb.pack.omega.context.ServiceConfig;
+import org.apache.servicecomb.pack.omega.transaction.MessageSender;
public class LoadBalanceContextBuilder {
diff --git a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/LoadBalanceSenderAdapter.java b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/LoadBalanceSenderAdapter.java
similarity index 92%
rename from omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/LoadBalanceSenderAdapter.java
rename to omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/LoadBalanceSenderAdapter.java
index 424dbbe..af3a4a4 100644
--- a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/LoadBalanceSenderAdapter.java
+++ b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/LoadBalanceSenderAdapter.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc.core;
+package org.apache.servicecomb.pack.omega.connector.grpc.core;
import com.google.common.base.Optional;
import io.grpc.ManagedChannel;
import java.lang.invoke.MethodHandles;
-import org.apache.servicecomb.saga.omega.transaction.AlphaResponse;
-import org.apache.servicecomb.saga.omega.transaction.MessageSender;
-import org.apache.servicecomb.saga.omega.transaction.OmegaException;
+import org.apache.servicecomb.pack.omega.transaction.AlphaResponse;
+import org.apache.servicecomb.pack.omega.transaction.MessageSender;
+import org.apache.servicecomb.pack.omega.transaction.OmegaException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/MessageSenderPicker.java b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/MessageSenderPicker.java
similarity index 92%
rename from omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/MessageSenderPicker.java
rename to omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/MessageSenderPicker.java
index c4b669d..c549747 100644
--- a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/MessageSenderPicker.java
+++ b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/MessageSenderPicker.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc.core;
+package org.apache.servicecomb.pack.omega.connector.grpc.core;
import com.google.common.base.Supplier;
import java.util.Collection;
import java.util.Map;
-import org.apache.servicecomb.saga.omega.transaction.MessageSender;
+import org.apache.servicecomb.pack.omega.transaction.MessageSender;
/**
* The strategy of picking a specific {@link MessageSender} from a {@link Collection} of {@link
diff --git a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/PendingTaskRunner.java b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/PendingTaskRunner.java
similarity index 96%
rename from omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/PendingTaskRunner.java
rename to omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/PendingTaskRunner.java
index 9bb7c95..ae0ae25 100644
--- a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/PendingTaskRunner.java
+++ b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/PendingTaskRunner.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc.core;
+package org.apache.servicecomb.pack.omega.connector.grpc.core;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
diff --git a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/PushBackReconnectRunnable.java b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/PushBackReconnectRunnable.java
similarity index 95%
rename from omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/PushBackReconnectRunnable.java
rename to omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/PushBackReconnectRunnable.java
index bc3c1b3..7e7a729 100644
--- a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/PushBackReconnectRunnable.java
+++ b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/PushBackReconnectRunnable.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc.core;
+package org.apache.servicecomb.pack.omega.connector.grpc.core;
import java.lang.invoke.MethodHandles;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.BlockingQueue;
-import org.apache.servicecomb.saga.omega.transaction.MessageSender;
+import org.apache.servicecomb.pack.omega.transaction.MessageSender;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/ReconnectStreamObserver.java b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/ReconnectStreamObserver.java
similarity index 88%
rename from omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/ReconnectStreamObserver.java
rename to omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/ReconnectStreamObserver.java
index bc6971d..9fb1270 100644
--- a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/ReconnectStreamObserver.java
+++ b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/ReconnectStreamObserver.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc.core;
+package org.apache.servicecomb.pack.omega.connector.grpc.core;
import io.grpc.stub.StreamObserver;
import java.lang.invoke.MethodHandles;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.LoadBalanceContext;
-import org.apache.servicecomb.saga.omega.transaction.MessageSender;
+
+import org.apache.servicecomb.pack.omega.transaction.MessageSender;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/SenderExecutor.java b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/SenderExecutor.java
similarity index 87%
rename from omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/SenderExecutor.java
rename to omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/SenderExecutor.java
index ed0a03f..ccf007e 100644
--- a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/SenderExecutor.java
+++ b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/SenderExecutor.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc.core;
+package org.apache.servicecomb.pack.omega.connector.grpc.core;
-import org.apache.servicecomb.saga.omega.transaction.AlphaResponse;
+import org.apache.servicecomb.pack.omega.transaction.AlphaResponse;
public interface SenderExecutor<T> {
diff --git a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/TransactionType.java b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/TransactionType.java
similarity index 93%
rename from omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/TransactionType.java
rename to omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/TransactionType.java
index 236bb53..fdf0556 100644
--- a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/TransactionType.java
+++ b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/TransactionType.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc.core;
+package org.apache.servicecomb.pack.omega.connector.grpc.core;
public enum TransactionType {
TCC, SAGA
diff --git a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/GrpcCompensateStreamObserver.java b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/GrpcCompensateStreamObserver.java
similarity index 85%
rename from omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/GrpcCompensateStreamObserver.java
rename to omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/GrpcCompensateStreamObserver.java
index 9b227a5..0cf9f42 100644
--- a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/GrpcCompensateStreamObserver.java
+++ b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/GrpcCompensateStreamObserver.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc.saga;
+package org.apache.servicecomb.pack.omega.connector.grpc.saga;
import java.lang.invoke.MethodHandles;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.LoadBalanceContext;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.ReconnectStreamObserver;
-import org.apache.servicecomb.saga.omega.transaction.MessageDeserializer;
-import org.apache.servicecomb.saga.omega.transaction.MessageHandler;
-import org.apache.servicecomb.saga.omega.transaction.MessageSender;
+import org.apache.servicecomb.pack.omega.connector.grpc.core.LoadBalanceContext;
+import org.apache.servicecomb.pack.omega.connector.grpc.core.ReconnectStreamObserver;
+import org.apache.servicecomb.pack.omega.transaction.MessageDeserializer;
+import org.apache.servicecomb.pack.omega.transaction.MessageHandler;
+import org.apache.servicecomb.pack.omega.transaction.MessageSender;
import org.apache.servicecomb.pack.contract.grpc.GrpcCompensateCommand;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/GrpcSagaClientMessageSender.java b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/GrpcSagaClientMessageSender.java
similarity index 87%
rename from omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/GrpcSagaClientMessageSender.java
rename to omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/GrpcSagaClientMessageSender.java
index 98c3772..f55634f 100644
--- a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/GrpcSagaClientMessageSender.java
+++ b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/GrpcSagaClientMessageSender.java
@@ -15,18 +15,18 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc.saga;
+package org.apache.servicecomb.pack.omega.connector.grpc.saga;
import com.google.protobuf.ByteString;
import io.grpc.ManagedChannel;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.LoadBalanceContext;
-import org.apache.servicecomb.saga.omega.context.ServiceConfig;
-import org.apache.servicecomb.saga.omega.transaction.AlphaResponse;
-import org.apache.servicecomb.saga.omega.transaction.MessageDeserializer;
-import org.apache.servicecomb.saga.omega.transaction.MessageHandler;
-import org.apache.servicecomb.saga.omega.transaction.MessageSerializer;
-import org.apache.servicecomb.saga.omega.transaction.SagaMessageSender;
-import org.apache.servicecomb.saga.omega.transaction.TxEvent;
+import org.apache.servicecomb.pack.omega.connector.grpc.core.LoadBalanceContext;
+import org.apache.servicecomb.pack.omega.context.ServiceConfig;
+import org.apache.servicecomb.pack.omega.transaction.AlphaResponse;
+import org.apache.servicecomb.pack.omega.transaction.MessageDeserializer;
+import org.apache.servicecomb.pack.omega.transaction.MessageHandler;
+import org.apache.servicecomb.pack.omega.transaction.MessageSerializer;
+import org.apache.servicecomb.pack.omega.transaction.SagaMessageSender;
+import org.apache.servicecomb.pack.omega.transaction.TxEvent;
import org.apache.servicecomb.pack.contract.grpc.GrpcAck;
import org.apache.servicecomb.pack.contract.grpc.GrpcServiceConfig;
import org.apache.servicecomb.pack.contract.grpc.GrpcTxEvent;
diff --git a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/RetryableMessageSender.java b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/RetryableMessageSender.java
similarity index 83%
rename from omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/RetryableMessageSender.java
rename to omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/RetryableMessageSender.java
index 99bba38..275c45a 100644
--- a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/RetryableMessageSender.java
+++ b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/RetryableMessageSender.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc.saga;
+package org.apache.servicecomb.pack.omega.connector.grpc.saga;
import static org.apache.servicecomb.pack.common.EventType.SagaStartedEvent;
import java.util.concurrent.BlockingQueue;
-import org.apache.servicecomb.saga.omega.transaction.AlphaResponse;
-import org.apache.servicecomb.saga.omega.transaction.MessageSender;
-import org.apache.servicecomb.saga.omega.transaction.OmegaException;
-import org.apache.servicecomb.saga.omega.transaction.SagaMessageSender;
-import org.apache.servicecomb.saga.omega.transaction.TxEvent;
+import org.apache.servicecomb.pack.omega.transaction.AlphaResponse;
+import org.apache.servicecomb.pack.omega.transaction.MessageSender;
+import org.apache.servicecomb.pack.omega.transaction.OmegaException;
+import org.apache.servicecomb.pack.omega.transaction.SagaMessageSender;
+import org.apache.servicecomb.pack.omega.transaction.TxEvent;
public class RetryableMessageSender implements SagaMessageSender {
private final BlockingQueue<MessageSender> availableMessageSenders;
diff --git a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalanceSender.java b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/SagaLoadBalanceSender.java
similarity index 75%
rename from omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalanceSender.java
rename to omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/SagaLoadBalanceSender.java
index df2a367..25eccda 100644
--- a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalanceSender.java
+++ b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/SagaLoadBalanceSender.java
@@ -15,17 +15,18 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc.saga;
+package org.apache.servicecomb.pack.omega.connector.grpc.saga;
import com.google.common.base.Optional;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.MessageSenderPicker;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.LoadBalanceContext;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.LoadBalanceSenderAdapter;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.SenderExecutor;
-import org.apache.servicecomb.saga.omega.transaction.AlphaResponse;
-import org.apache.servicecomb.saga.omega.transaction.OmegaException;
-import org.apache.servicecomb.saga.omega.transaction.SagaMessageSender;
-import org.apache.servicecomb.saga.omega.transaction.TxEvent;
+
+import org.apache.servicecomb.pack.omega.connector.grpc.core.LoadBalanceSenderAdapter;
+import org.apache.servicecomb.pack.omega.connector.grpc.core.MessageSenderPicker;
+import org.apache.servicecomb.pack.omega.connector.grpc.core.SenderExecutor;
+import org.apache.servicecomb.pack.omega.connector.grpc.core.LoadBalanceContext;
+import org.apache.servicecomb.pack.omega.transaction.AlphaResponse;
+import org.apache.servicecomb.pack.omega.transaction.OmegaException;
+import org.apache.servicecomb.pack.omega.transaction.SagaMessageSender;
+import org.apache.servicecomb.pack.omega.transaction.TxEvent;
public class SagaLoadBalanceSender extends LoadBalanceSenderAdapter implements SagaMessageSender {
diff --git a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/GrpcCoordinateStreamObserver.java b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/tcc/GrpcCoordinateStreamObserver.java
similarity index 85%
rename from omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/GrpcCoordinateStreamObserver.java
rename to omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/tcc/GrpcCoordinateStreamObserver.java
index 8cc8c49..52a5899 100644
--- a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/GrpcCoordinateStreamObserver.java
+++ b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/tcc/GrpcCoordinateStreamObserver.java
@@ -15,13 +15,14 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc.tcc;
+package org.apache.servicecomb.pack.omega.connector.grpc.tcc;
import java.lang.invoke.MethodHandles;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.LoadBalanceContext;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.ReconnectStreamObserver;
-import org.apache.servicecomb.saga.omega.transaction.MessageSender;
-import org.apache.servicecomb.saga.omega.transaction.tcc.TccMessageHandler;
+
+import org.apache.servicecomb.pack.omega.connector.grpc.core.LoadBalanceContext;
+import org.apache.servicecomb.pack.omega.connector.grpc.core.ReconnectStreamObserver;
+import org.apache.servicecomb.pack.omega.transaction.MessageSender;
+import org.apache.servicecomb.pack.omega.transaction.tcc.TccMessageHandler;
import org.apache.servicecomb.pack.contract.grpc.GrpcTccCoordinateCommand;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/GrpcTccClientMessageSender.java b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/tcc/GrpcTccClientMessageSender.java
similarity index 90%
rename from omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/GrpcTccClientMessageSender.java
rename to omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/tcc/GrpcTccClientMessageSender.java
index 4ea4b9f..e475542 100644
--- a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/GrpcTccClientMessageSender.java
+++ b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/tcc/GrpcTccClientMessageSender.java
@@ -15,18 +15,19 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc.tcc;
+package org.apache.servicecomb.pack.omega.connector.grpc.tcc;
import io.grpc.ManagedChannel;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.LoadBalanceContext;
-import org.apache.servicecomb.saga.omega.context.ServiceConfig;
-import org.apache.servicecomb.saga.omega.transaction.AlphaResponse;
-import org.apache.servicecomb.saga.omega.transaction.tcc.TccMessageHandler;
-import org.apache.servicecomb.saga.omega.transaction.tcc.TccMessageSender;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.CoordinatedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.ParticipatedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccEndedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccStartedEvent;
+
+import org.apache.servicecomb.pack.omega.connector.grpc.core.LoadBalanceContext;
+import org.apache.servicecomb.pack.omega.context.ServiceConfig;
+import org.apache.servicecomb.pack.omega.transaction.AlphaResponse;
+import org.apache.servicecomb.pack.omega.transaction.tcc.TccMessageHandler;
+import org.apache.servicecomb.pack.omega.transaction.tcc.TccMessageSender;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.CoordinatedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.ParticipatedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.TccEndedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.TccStartedEvent;
import org.apache.servicecomb.pack.contract.grpc.GrpcAck;
import org.apache.servicecomb.pack.contract.grpc.GrpcServiceConfig;
import org.apache.servicecomb.pack.contract.grpc.GrpcTccCoordinatedEvent;
diff --git a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/TccLoadBalanceSender.java b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/tcc/TccLoadBalanceSender.java
similarity index 83%
rename from omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/TccLoadBalanceSender.java
rename to omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/tcc/TccLoadBalanceSender.java
index a1e762c..6356b1e 100644
--- a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/TccLoadBalanceSender.java
+++ b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/tcc/TccLoadBalanceSender.java
@@ -15,20 +15,21 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc.tcc;
+package org.apache.servicecomb.pack.omega.connector.grpc.tcc;
import com.google.common.base.Optional;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.LoadBalanceContext;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.LoadBalanceSenderAdapter;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.MessageSenderPicker;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.SenderExecutor;
-import org.apache.servicecomb.saga.omega.transaction.AlphaResponse;
-import org.apache.servicecomb.saga.omega.transaction.OmegaException;
-import org.apache.servicecomb.saga.omega.transaction.tcc.TccMessageSender;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.CoordinatedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.ParticipatedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccEndedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccStartedEvent;
+
+import org.apache.servicecomb.pack.omega.connector.grpc.core.LoadBalanceContext;
+import org.apache.servicecomb.pack.omega.connector.grpc.core.LoadBalanceSenderAdapter;
+import org.apache.servicecomb.pack.omega.connector.grpc.core.MessageSenderPicker;
+import org.apache.servicecomb.pack.omega.connector.grpc.core.SenderExecutor;
+import org.apache.servicecomb.pack.omega.transaction.AlphaResponse;
+import org.apache.servicecomb.pack.omega.transaction.OmegaException;
+import org.apache.servicecomb.pack.omega.transaction.tcc.TccMessageSender;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.CoordinatedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.ParticipatedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.TccEndedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.TccStartedEvent;
public class TccLoadBalanceSender extends LoadBalanceSenderAdapter implements TccMessageSender {
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalanceContextBuilderTest.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/LoadBalanceContextBuilderTest.java
similarity index 91%
rename from omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalanceContextBuilderTest.java
rename to omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/LoadBalanceContextBuilderTest.java
index 9d8ef1d..caad66b 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalanceContextBuilderTest.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/LoadBalanceContextBuilderTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc;
+package org.apache.servicecomb.pack.omega.connector.grpc;
import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -30,15 +30,15 @@ import io.grpc.inprocess.InProcessServerBuilder;
import io.grpc.testing.GrpcCleanupRule;
import java.io.IOException;
import java.util.ArrayList;
-import org.apache.servicecomb.saga.omega.connector.grpc.AlphaClusterConfig;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.LoadBalanceContext;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.LoadBalanceContextBuilder;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.TransactionType;
-import org.apache.servicecomb.saga.omega.context.ServiceConfig;
-import org.apache.servicecomb.saga.omega.transaction.SagaMessageSender;
-import org.apache.servicecomb.saga.omega.transaction.tcc.CoordinateMessageHandler;
-import org.apache.servicecomb.saga.omega.transaction.tcc.TccMessageHandler;
-import org.apache.servicecomb.saga.omega.transaction.tcc.TccMessageSender;
+
+import org.apache.servicecomb.pack.omega.connector.grpc.core.LoadBalanceContext;
+import org.apache.servicecomb.pack.omega.connector.grpc.core.LoadBalanceContextBuilder;
+import org.apache.servicecomb.pack.omega.connector.grpc.core.TransactionType;
+import org.apache.servicecomb.pack.omega.context.ServiceConfig;
+import org.apache.servicecomb.pack.omega.transaction.SagaMessageSender;
+import org.apache.servicecomb.pack.omega.transaction.tcc.CoordinateMessageHandler;
+import org.apache.servicecomb.pack.omega.transaction.tcc.TccMessageHandler;
+import org.apache.servicecomb.pack.omega.transaction.tcc.TccMessageSender;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalanceSenderTestBase.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/LoadBalanceSenderTestBase.java
similarity index 96%
rename from omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalanceSenderTestBase.java
rename to omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/LoadBalanceSenderTestBase.java
index f7c8111..444e238 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalanceSenderTestBase.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/LoadBalanceSenderTestBase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc;
+package org.apache.servicecomb.pack.omega.connector.grpc;
import io.grpc.Server;
import java.util.HashMap;
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/PushBackReconnectRunnableTest.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/PushBackReconnectRunnableTest.java
similarity index 94%
rename from omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/PushBackReconnectRunnableTest.java
rename to omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/PushBackReconnectRunnableTest.java
index aad214f..54ad5ef 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/PushBackReconnectRunnableTest.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/PushBackReconnectRunnableTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc;
+package org.apache.servicecomb.pack.omega.connector.grpc;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.core.Is.is;
@@ -30,8 +30,8 @@ import java.util.Map;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.PushBackReconnectRunnable;
-import org.apache.servicecomb.saga.omega.transaction.MessageSender;
+import org.apache.servicecomb.pack.omega.connector.grpc.core.PushBackReconnectRunnable;
+import org.apache.servicecomb.pack.omega.transaction.MessageSender;
import org.junit.Before;
import org.junit.Test;
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/RetryableMessageSenderTest.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/RetryableMessageSenderTest.java
similarity index 84%
rename from omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/RetryableMessageSenderTest.java
rename to omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/RetryableMessageSenderTest.java
index 6f29708..c16c143 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/RetryableMessageSenderTest.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/RetryableMessageSenderTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc.saga;
+package org.apache.servicecomb.pack.omega.connector.grpc.saga;
import static com.seanyinx.github.unit.scaffolding.AssertUtils.expectFailing;
import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
@@ -27,13 +27,13 @@ import static org.mockito.Mockito.verify;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
-import org.apache.servicecomb.saga.omega.connector.grpc.saga.RetryableMessageSender;
-import org.apache.servicecomb.saga.omega.transaction.MessageSender;
-import org.apache.servicecomb.saga.omega.transaction.OmegaException;
-import org.apache.servicecomb.saga.omega.transaction.SagaMessageSender;
-import org.apache.servicecomb.saga.omega.transaction.SagaStartedEvent;
-import org.apache.servicecomb.saga.omega.transaction.TxEvent;
-import org.apache.servicecomb.saga.omega.transaction.TxStartedEvent;
+
+import org.apache.servicecomb.pack.omega.transaction.MessageSender;
+import org.apache.servicecomb.pack.omega.transaction.OmegaException;
+import org.apache.servicecomb.pack.omega.transaction.SagaMessageSender;
+import org.apache.servicecomb.pack.omega.transaction.SagaStartedEvent;
+import org.apache.servicecomb.pack.omega.transaction.TxEvent;
+import org.apache.servicecomb.pack.omega.transaction.TxStartedEvent;
import org.junit.Test;
public class RetryableMessageSenderTest {
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalanceSenderWithTLSTest.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/SagaLoadBalanceSenderWithTLSTest.java
similarity index 92%
rename from omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalanceSenderWithTLSTest.java
rename to omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/SagaLoadBalanceSenderWithTLSTest.java
index 4b53e83..8007f19 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalanceSenderWithTLSTest.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/SagaLoadBalanceSenderWithTLSTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc.saga;
+package org.apache.servicecomb.pack.omega.connector.grpc.saga;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.awaitility.Awaitility.await;
@@ -38,12 +38,12 @@ import java.net.InetSocketAddress;
import java.util.Arrays;
import java.util.concurrent.Callable;
import javax.net.ssl.SSLException;
-import org.apache.servicecomb.saga.omega.connector.grpc.AlphaClusterConfig;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.FastestSender;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.LoadBalanceContext;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.LoadBalanceContextBuilder;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.TransactionType;
-import org.apache.servicecomb.saga.omega.context.ServiceConfig;
+import org.apache.servicecomb.pack.omega.connector.grpc.AlphaClusterConfig;
+import org.apache.servicecomb.pack.omega.connector.grpc.core.FastestSender;
+import org.apache.servicecomb.pack.omega.connector.grpc.core.LoadBalanceContext;
+import org.apache.servicecomb.pack.omega.connector.grpc.core.LoadBalanceContextBuilder;
+import org.apache.servicecomb.pack.omega.connector.grpc.core.TransactionType;
+import org.apache.servicecomb.pack.omega.context.ServiceConfig;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalancedSenderTest.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/SagaLoadBalancedSenderTest.java
similarity index 92%
rename from omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalancedSenderTest.java
rename to omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/SagaLoadBalancedSenderTest.java
index ce6b96e..9d623ff 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalancedSenderTest.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/SagaLoadBalancedSenderTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc.saga;
+package org.apache.servicecomb.pack.omega.connector.grpc.saga;
import static com.seanyinx.github.unit.scaffolding.AssertUtils.expectFailing;
import static java.lang.Thread.State.TERMINATED;
@@ -36,18 +36,18 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.Callable;
-import org.apache.servicecomb.saga.omega.connector.grpc.AlphaClusterConfig;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.FastestSender;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.LoadBalanceContext;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.LoadBalanceContextBuilder;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.TransactionType;
-import org.apache.servicecomb.saga.omega.context.ServiceConfig;
-import org.apache.servicecomb.saga.omega.transaction.MessageSender;
-import org.apache.servicecomb.saga.omega.transaction.OmegaException;
-import org.apache.servicecomb.saga.omega.transaction.SagaMessageSender;
-import org.apache.servicecomb.saga.omega.transaction.TxAbortedEvent;
-import org.apache.servicecomb.saga.omega.transaction.TxEvent;
-import org.apache.servicecomb.saga.omega.transaction.TxStartedEvent;
+import org.apache.servicecomb.pack.omega.connector.grpc.AlphaClusterConfig;
+import org.apache.servicecomb.pack.omega.connector.grpc.core.FastestSender;
+import org.apache.servicecomb.pack.omega.connector.grpc.core.LoadBalanceContext;
+import org.apache.servicecomb.pack.omega.connector.grpc.core.LoadBalanceContextBuilder;
+import org.apache.servicecomb.pack.omega.connector.grpc.core.TransactionType;
+import org.apache.servicecomb.pack.omega.context.ServiceConfig;
+import org.apache.servicecomb.pack.omega.transaction.MessageSender;
+import org.apache.servicecomb.pack.omega.transaction.OmegaException;
+import org.apache.servicecomb.pack.omega.transaction.SagaMessageSender;
+import org.apache.servicecomb.pack.omega.transaction.TxAbortedEvent;
+import org.apache.servicecomb.pack.omega.transaction.TxEvent;
+import org.apache.servicecomb.pack.omega.transaction.TxStartedEvent;
import org.junit.BeforeClass;
import org.junit.Test;
import org.mockito.Mockito;
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalancedSenderTestBase.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/SagaLoadBalancedSenderTestBase.java
similarity index 95%
rename from omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalancedSenderTestBase.java
rename to omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/SagaLoadBalancedSenderTestBase.java
index ad936b2..f29a203 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalancedSenderTestBase.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/SagaLoadBalancedSenderTestBase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc.saga;
+package org.apache.servicecomb.pack.omega.connector.grpc.saga;
import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
import static org.junit.Assert.fail;
@@ -28,10 +28,10 @@ import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
import org.apache.servicecomb.pack.common.EventType;
-import org.apache.servicecomb.saga.omega.transaction.MessageDeserializer;
-import org.apache.servicecomb.saga.omega.transaction.MessageHandler;
-import org.apache.servicecomb.saga.omega.transaction.MessageSerializer;
-import org.apache.servicecomb.saga.omega.transaction.TxEvent;
+import org.apache.servicecomb.pack.omega.transaction.MessageDeserializer;
+import org.apache.servicecomb.pack.omega.transaction.MessageHandler;
+import org.apache.servicecomb.pack.omega.transaction.MessageSerializer;
+import org.apache.servicecomb.pack.omega.transaction.TxEvent;
import org.apache.servicecomb.pack.contract.grpc.GrpcAck;
import org.apache.servicecomb.pack.contract.grpc.GrpcCompensateCommand;
import org.apache.servicecomb.pack.contract.grpc.GrpcServiceConfig;
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/GrpcTccClientMessageSenderTest.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/tcc/GrpcTccClientMessageSenderTest.java
similarity index 95%
rename from omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/GrpcTccClientMessageSenderTest.java
rename to omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/tcc/GrpcTccClientMessageSenderTest.java
index 0bea0c3..0dcdb14 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/GrpcTccClientMessageSenderTest.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/tcc/GrpcTccClientMessageSenderTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc.tcc;
+package org.apache.servicecomb.pack.omega.connector.grpc.tcc;
import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -24,13 +24,13 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import org.apache.servicecomb.pack.common.TransactionStatus;
-import org.apache.servicecomb.saga.omega.context.ServiceConfig;
-import org.apache.servicecomb.saga.omega.transaction.AlphaResponse;
-import org.apache.servicecomb.saga.omega.transaction.tcc.TccMessageHandler;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.CoordinatedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.ParticipatedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccEndedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccStartedEvent;
+import org.apache.servicecomb.pack.omega.context.ServiceConfig;
+import org.apache.servicecomb.pack.omega.transaction.AlphaResponse;
+import org.apache.servicecomb.pack.omega.transaction.tcc.TccMessageHandler;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.CoordinatedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.ParticipatedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.TccEndedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.TccStartedEvent;
import org.apache.servicecomb.pack.contract.grpc.GrpcAck;
import org.apache.servicecomb.pack.contract.grpc.GrpcServiceConfig;
import org.apache.servicecomb.pack.contract.grpc.GrpcTccCoordinateCommand;
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/MyTccEventServiceImpl.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/tcc/MyTccEventServiceImpl.java
similarity index 98%
rename from omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/MyTccEventServiceImpl.java
rename to omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/tcc/MyTccEventServiceImpl.java
index 2c64e5a..1b5bb3b 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/MyTccEventServiceImpl.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/tcc/MyTccEventServiceImpl.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc.tcc;
+package org.apache.servicecomb.pack.omega.connector.grpc.tcc;
import static org.junit.Assert.fail;
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java
similarity index 91%
rename from omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java
rename to omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java
index 06a4653..810948d 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc.tcc;
+package org.apache.servicecomb.pack.omega.connector.grpc.tcc;
import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
import static java.util.concurrent.TimeUnit.SECONDS;
@@ -43,23 +43,23 @@ import java.util.Queue;
import java.util.concurrent.Callable;
import java.util.concurrent.TimeUnit;
import org.apache.servicecomb.pack.common.TransactionStatus;
-import org.apache.servicecomb.saga.omega.connector.grpc.AlphaClusterConfig;
-import org.apache.servicecomb.saga.omega.connector.grpc.LoadBalanceSenderTestBase;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.FastestSender;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.LoadBalanceContext;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.LoadBalanceContextBuilder;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.TransactionType;
-import org.apache.servicecomb.saga.omega.context.ServiceConfig;
-import org.apache.servicecomb.saga.omega.transaction.AlphaResponse;
-import org.apache.servicecomb.saga.omega.transaction.MessageSender;
-import org.apache.servicecomb.saga.omega.transaction.OmegaException;
-import org.apache.servicecomb.saga.omega.transaction.tcc.CoordinateMessageHandler;
-import org.apache.servicecomb.saga.omega.transaction.tcc.TccMessageHandler;
-import org.apache.servicecomb.saga.omega.transaction.tcc.TccMessageSender;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.CoordinatedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.ParticipatedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccEndedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccStartedEvent;
+import org.apache.servicecomb.pack.omega.connector.grpc.LoadBalanceSenderTestBase;
+import org.apache.servicecomb.pack.omega.connector.grpc.AlphaClusterConfig;
+import org.apache.servicecomb.pack.omega.connector.grpc.core.FastestSender;
+import org.apache.servicecomb.pack.omega.connector.grpc.core.LoadBalanceContext;
+import org.apache.servicecomb.pack.omega.connector.grpc.core.LoadBalanceContextBuilder;
+import org.apache.servicecomb.pack.omega.connector.grpc.core.TransactionType;
+import org.apache.servicecomb.pack.omega.context.ServiceConfig;
+import org.apache.servicecomb.pack.omega.transaction.AlphaResponse;
+import org.apache.servicecomb.pack.omega.transaction.MessageSender;
+import org.apache.servicecomb.pack.omega.transaction.OmegaException;
+import org.apache.servicecomb.pack.omega.transaction.tcc.CoordinateMessageHandler;
+import org.apache.servicecomb.pack.omega.transaction.tcc.TccMessageHandler;
+import org.apache.servicecomb.pack.omega.transaction.tcc.TccMessageSender;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.CoordinatedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.ParticipatedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.TccEndedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.TccStartedEvent;
import org.apache.servicecomb.pack.contract.grpc.GrpcTccParticipatedEvent;
import org.hamcrest.core.Is;
import org.junit.After;
diff --git a/omega/omega-context/src/main/java/org/apache/servicecomb/saga/omega/context/CallbackContext.java b/omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/CallbackContext.java
similarity index 98%
rename from omega/omega-context/src/main/java/org/apache/servicecomb/saga/omega/context/CallbackContext.java
rename to omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/CallbackContext.java
index cf5ab50..90e06d6 100644
--- a/omega/omega-context/src/main/java/org/apache/servicecomb/saga/omega/context/CallbackContext.java
+++ b/omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/CallbackContext.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.context;
+package org.apache.servicecomb.pack.omega.context;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.InvocationTargetException;
diff --git a/omega/omega-context/src/main/java/org/apache/servicecomb/saga/omega/context/IdGenerator.java b/omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/IdGenerator.java
similarity index 94%
rename from omega/omega-context/src/main/java/org/apache/servicecomb/saga/omega/context/IdGenerator.java
rename to omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/IdGenerator.java
index 0917192..0e02265 100644
--- a/omega/omega-context/src/main/java/org/apache/servicecomb/saga/omega/context/IdGenerator.java
+++ b/omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/IdGenerator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.context;
+package org.apache.servicecomb.pack.omega.context;
import java.io.Serializable;
diff --git a/omega/omega-context/src/main/java/org/apache/servicecomb/saga/omega/context/OmegaContext.java b/omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/OmegaContext.java
similarity index 95%
rename from omega/omega-context/src/main/java/org/apache/servicecomb/saga/omega/context/OmegaContext.java
rename to omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/OmegaContext.java
index c84337a..015aa67 100644
--- a/omega/omega-context/src/main/java/org/apache/servicecomb/saga/omega/context/OmegaContext.java
+++ b/omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/OmegaContext.java
@@ -15,10 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.context;
-
-import java.util.HashMap;
-import java.util.Map;
+package org.apache.servicecomb.pack.omega.context;
/**
* OmegaContext holds the globalTxId and localTxId which are used to build the invocation map
diff --git a/omega/omega-context/src/main/java/org/apache/servicecomb/saga/omega/context/ServiceConfig.java b/omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/ServiceConfig.java
similarity index 96%
rename from omega/omega-context/src/main/java/org/apache/servicecomb/saga/omega/context/ServiceConfig.java
rename to omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/ServiceConfig.java
index 1e16b62..044b87d 100644
--- a/omega/omega-context/src/main/java/org/apache/servicecomb/saga/omega/context/ServiceConfig.java
+++ b/omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/ServiceConfig.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.context;
+package org.apache.servicecomb.pack.omega.context;
import java.net.InetAddress;
import java.net.UnknownHostException;
diff --git a/omega/omega-context/src/main/java/org/apache/servicecomb/saga/omega/context/UniqueIdGenerator.java b/omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/UniqueIdGenerator.java
similarity index 95%
rename from omega/omega-context/src/main/java/org/apache/servicecomb/saga/omega/context/UniqueIdGenerator.java
rename to omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/UniqueIdGenerator.java
index 36c991a..3a050e5 100644
--- a/omega/omega-context/src/main/java/org/apache/servicecomb/saga/omega/context/UniqueIdGenerator.java
+++ b/omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/UniqueIdGenerator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.context;
+package org.apache.servicecomb.pack.omega.context;
import java.util.UUID;
diff --git a/omega/omega-context/src/main/java/org/apache/servicecomb/saga/omega/context/annotations/SagaStart.java b/omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/annotations/SagaStart.java
similarity index 95%
rename from omega/omega-context/src/main/java/org/apache/servicecomb/saga/omega/context/annotations/SagaStart.java
rename to omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/annotations/SagaStart.java
index 8b68618..2a66a84 100644
--- a/omega/omega-context/src/main/java/org/apache/servicecomb/saga/omega/context/annotations/SagaStart.java
+++ b/omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/annotations/SagaStart.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.context.annotations;
+package org.apache.servicecomb.pack.omega.context.annotations;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/omega/omega-context/src/main/java/org/apache/servicecomb/saga/omega/context/annotations/TccStart.java b/omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/annotations/TccStart.java
similarity index 95%
rename from omega/omega-context/src/main/java/org/apache/servicecomb/saga/omega/context/annotations/TccStart.java
rename to omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/annotations/TccStart.java
index c7f8369..d558522 100644
--- a/omega/omega-context/src/main/java/org/apache/servicecomb/saga/omega/context/annotations/TccStart.java
+++ b/omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/annotations/TccStart.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.context.annotations;
+package org.apache.servicecomb.pack.omega.context.annotations;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/omega/omega-context/src/test/java/org/apache/servicecomb/saga/omega/context/OmegaContextTest.java b/omega/omega-context/src/test/java/org/apache/servicecomb/pack/omega/context/OmegaContextTest.java
similarity index 98%
rename from omega/omega-context/src/test/java/org/apache/servicecomb/saga/omega/context/OmegaContextTest.java
rename to omega/omega-context/src/test/java/org/apache/servicecomb/pack/omega/context/OmegaContextTest.java
index a104f7e..5394c01 100644
--- a/omega/omega-context/src/test/java/org/apache/servicecomb/saga/omega/context/OmegaContextTest.java
+++ b/omega/omega-context/src/test/java/org/apache/servicecomb/pack/omega/context/OmegaContextTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.context;
+package org.apache.servicecomb.pack.omega.context;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertThat;
diff --git a/omega/omega-context/src/test/java/org/apache/servicecomb/saga/omega/context/UniqueIdGeneratorTest.java b/omega/omega-context/src/test/java/org/apache/servicecomb/pack/omega/context/UniqueIdGeneratorTest.java
similarity index 97%
rename from omega/omega-context/src/test/java/org/apache/servicecomb/saga/omega/context/UniqueIdGeneratorTest.java
rename to omega/omega-context/src/test/java/org/apache/servicecomb/pack/omega/context/UniqueIdGeneratorTest.java
index 7325a1e..f69c058 100644
--- a/omega/omega-context/src/test/java/org/apache/servicecomb/saga/omega/context/UniqueIdGeneratorTest.java
+++ b/omega/omega-context/src/test/java/org/apache/servicecomb/pack/omega/context/UniqueIdGeneratorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.context;
+package org.apache.servicecomb.pack.omega.context;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertThat;
diff --git a/omega/omega-format/src/main/java/org/apache/servicecomb/saga/omega/format/KryoMessageFormat.java b/omega/omega-format/src/main/java/org/apache/servicecomb/pack/omega/format/KryoMessageFormat.java
similarity index 94%
rename from omega/omega-format/src/main/java/org/apache/servicecomb/saga/omega/format/KryoMessageFormat.java
rename to omega/omega-format/src/main/java/org/apache/servicecomb/pack/omega/format/KryoMessageFormat.java
index 50dfba8..495ba3e 100644
--- a/omega/omega-format/src/main/java/org/apache/servicecomb/saga/omega/format/KryoMessageFormat.java
+++ b/omega/omega-format/src/main/java/org/apache/servicecomb/pack/omega/format/KryoMessageFormat.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.format;
+package org.apache.servicecomb.pack.omega.format;
import java.io.ByteArrayInputStream;
-import org.apache.servicecomb.saga.omega.transaction.OmegaException;
+import org.apache.servicecomb.pack.omega.transaction.OmegaException;
import com.esotericsoftware.kryo.Kryo;
import com.esotericsoftware.kryo.KryoException;
diff --git a/omega/omega-format/src/main/java/org/apache/servicecomb/saga/omega/format/MessageFormat.java b/omega/omega-format/src/main/java/org/apache/servicecomb/pack/omega/format/MessageFormat.java
similarity index 83%
rename from omega/omega-format/src/main/java/org/apache/servicecomb/saga/omega/format/MessageFormat.java
rename to omega/omega-format/src/main/java/org/apache/servicecomb/pack/omega/format/MessageFormat.java
index d80467d..5da326a 100644
--- a/omega/omega-format/src/main/java/org/apache/servicecomb/saga/omega/format/MessageFormat.java
+++ b/omega/omega-format/src/main/java/org/apache/servicecomb/pack/omega/format/MessageFormat.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.format;
+package org.apache.servicecomb.pack.omega.format;
-import org.apache.servicecomb.saga.omega.transaction.MessageDeserializer;
-import org.apache.servicecomb.saga.omega.transaction.MessageSerializer;
+import org.apache.servicecomb.pack.omega.transaction.MessageDeserializer;
+import org.apache.servicecomb.pack.omega.transaction.MessageSerializer;
public interface MessageFormat extends MessageSerializer, MessageDeserializer {
}
diff --git a/omega/omega-format/src/test/java/org/apache/servicecomb/saga/omega/format/KryoMessageFormatTest.java b/omega/omega-format/src/test/java/org/apache/servicecomb/pack/omega/format/KryoMessageFormatTest.java
similarity index 96%
rename from omega/omega-format/src/test/java/org/apache/servicecomb/saga/omega/format/KryoMessageFormatTest.java
rename to omega/omega-format/src/test/java/org/apache/servicecomb/pack/omega/format/KryoMessageFormatTest.java
index 327b6ec..aa518f0 100644
--- a/omega/omega-format/src/test/java/org/apache/servicecomb/saga/omega/format/KryoMessageFormatTest.java
+++ b/omega/omega-format/src/test/java/org/apache/servicecomb/pack/omega/format/KryoMessageFormatTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.format;
+package org.apache.servicecomb.pack.omega.format;
import static org.hamcrest.Matchers.instanceOf;
import static org.junit.Assert.assertThat;
diff --git a/omega/omega-format/src/test/java/org/apache/servicecomb/saga/omega/format/MessageFormatTestBase.java b/omega/omega-format/src/test/java/org/apache/servicecomb/pack/omega/format/MessageFormatTestBase.java
similarity index 96%
rename from omega/omega-format/src/test/java/org/apache/servicecomb/saga/omega/format/MessageFormatTestBase.java
rename to omega/omega-format/src/test/java/org/apache/servicecomb/pack/omega/format/MessageFormatTestBase.java
index a37ff20..1d21485 100644
--- a/omega/omega-format/src/test/java/org/apache/servicecomb/saga/omega/format/MessageFormatTestBase.java
+++ b/omega/omega-format/src/test/java/org/apache/servicecomb/pack/omega/format/MessageFormatTestBase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.format;
+package org.apache.servicecomb.pack.omega.format;
import static com.seanyinx.github.unit.scaffolding.AssertUtils.expectFailing;
import static java.util.Arrays.asList;
@@ -25,11 +25,9 @@ import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.Matchers.startsWith;
import static org.junit.Assert.assertThat;
-import java.util.List;
import java.util.Objects;
-import org.apache.servicecomb.saga.omega.transaction.OmegaException;
-import org.hamcrest.Matcher;
+import org.apache.servicecomb.pack.omega.transaction.OmegaException;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/saga/omega/spring/EnableOmega.java b/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/EnableOmega.java
similarity index 87%
rename from omega/omega-spring-starter/src/main/java/org/apache/servicecomb/saga/omega/spring/EnableOmega.java
rename to omega/omega-spring-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/EnableOmega.java
index e94c39e..6117d48 100644
--- a/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/saga/omega/spring/EnableOmega.java
+++ b/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/EnableOmega.java
@@ -15,16 +15,17 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.spring;
+package org.apache.servicecomb.pack.omega.spring;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
import org.springframework.context.annotation.Import;
-import org.apache.servicecomb.saga.omega.transaction.spring.TransactionAspectConfig;
+import org.apache.servicecomb.pack.omega.transaction.spring.TransactionAspectConfig;
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@@ -32,7 +33,7 @@ import org.apache.servicecomb.saga.omega.transaction.spring.TransactionAspectCon
/**
* Indicates create the OmegaContext and inject it into the interceptors
* to pass the transactions id across the application.
- * @see org.apache.servicecomb.saga.omega.context.OmegaContext
+ * @see OmegaContext
*/
public @interface EnableOmega {
}
diff --git a/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/saga/omega/spring/OmegaSpringConfig.java b/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/OmegaSpringConfig.java
similarity index 80%
rename from omega/omega-spring-starter/src/main/java/org/apache/servicecomb/saga/omega/spring/OmegaSpringConfig.java
rename to omega/omega-spring-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/OmegaSpringConfig.java
index 02593e1..29406bc 100644
--- a/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/saga/omega/spring/OmegaSpringConfig.java
+++ b/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/OmegaSpringConfig.java
@@ -15,29 +15,29 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.spring;
+package org.apache.servicecomb.pack.omega.spring;
import com.google.common.collect.ImmutableList;
-import org.apache.servicecomb.saga.omega.connector.grpc.AlphaClusterConfig;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.FastestSender;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.LoadBalanceContext;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.LoadBalanceContextBuilder;
-import org.apache.servicecomb.saga.omega.connector.grpc.core.TransactionType;
-import org.apache.servicecomb.saga.omega.connector.grpc.saga.SagaLoadBalanceSender;
-import org.apache.servicecomb.saga.omega.connector.grpc.tcc.TccLoadBalanceSender;
-import org.apache.servicecomb.saga.omega.context.CallbackContext;
-import org.apache.servicecomb.saga.omega.context.IdGenerator;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
-import org.apache.servicecomb.saga.omega.context.ServiceConfig;
-import org.apache.servicecomb.saga.omega.context.UniqueIdGenerator;
-import org.apache.servicecomb.saga.omega.format.KryoMessageFormat;
-import org.apache.servicecomb.saga.omega.format.MessageFormat;
-import org.apache.servicecomb.saga.omega.transaction.MessageHandler;
-import org.apache.servicecomb.saga.omega.transaction.SagaMessageSender;
-import org.apache.servicecomb.saga.omega.transaction.tcc.DefaultParametersContext;
-import org.apache.servicecomb.saga.omega.transaction.tcc.ParametersContext;
-import org.apache.servicecomb.saga.omega.transaction.tcc.TccMessageHandler;
-import org.apache.servicecomb.saga.omega.transaction.tcc.TccMessageSender;
+import org.apache.servicecomb.pack.omega.connector.grpc.AlphaClusterConfig;
+import org.apache.servicecomb.pack.omega.connector.grpc.core.FastestSender;
+import org.apache.servicecomb.pack.omega.connector.grpc.core.LoadBalanceContext;
+import org.apache.servicecomb.pack.omega.connector.grpc.core.LoadBalanceContextBuilder;
+import org.apache.servicecomb.pack.omega.connector.grpc.core.TransactionType;
+import org.apache.servicecomb.pack.omega.connector.grpc.saga.SagaLoadBalanceSender;
+import org.apache.servicecomb.pack.omega.connector.grpc.tcc.TccLoadBalanceSender;
+import org.apache.servicecomb.pack.omega.context.CallbackContext;
+import org.apache.servicecomb.pack.omega.context.IdGenerator;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.context.ServiceConfig;
+import org.apache.servicecomb.pack.omega.context.UniqueIdGenerator;
+import org.apache.servicecomb.pack.omega.format.KryoMessageFormat;
+import org.apache.servicecomb.pack.omega.format.MessageFormat;
+import org.apache.servicecomb.pack.omega.transaction.MessageHandler;
+import org.apache.servicecomb.pack.omega.transaction.SagaMessageSender;
+import org.apache.servicecomb.pack.omega.transaction.tcc.DefaultParametersContext;
+import org.apache.servicecomb.pack.omega.transaction.tcc.ParametersContext;
+import org.apache.servicecomb.pack.omega.transaction.tcc.TccMessageHandler;
+import org.apache.servicecomb.pack.omega.transaction.tcc.TccMessageSender;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
diff --git a/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/CallbackType.java b/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/CallbackType.java
similarity index 94%
rename from omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/CallbackType.java
rename to omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/CallbackType.java
index 70d9c82..109f26b 100644
--- a/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/CallbackType.java
+++ b/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/CallbackType.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.spring;
+package org.apache.servicecomb.pack.omega.transaction.spring;
public enum CallbackType {
/**
diff --git a/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/CompensableAnnotationProcessor.java b/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/CompensableAnnotationProcessor.java
similarity index 91%
rename from omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/CompensableAnnotationProcessor.java
rename to omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/CompensableAnnotationProcessor.java
index 254c3e7..b714a6b 100644
--- a/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/CompensableAnnotationProcessor.java
+++ b/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/CompensableAnnotationProcessor.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.spring;
+package org.apache.servicecomb.pack.omega.transaction.spring;
-import org.apache.servicecomb.saga.omega.context.CallbackContext;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.context.CallbackContext;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.util.ReflectionUtils;
diff --git a/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/CompensableMethodCheckingCallback.java b/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/CompensableMethodCheckingCallback.java
similarity index 89%
rename from omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/CompensableMethodCheckingCallback.java
rename to omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/CompensableMethodCheckingCallback.java
index bf2b5ce..16bfc70 100644
--- a/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/CompensableMethodCheckingCallback.java
+++ b/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/CompensableMethodCheckingCallback.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.spring;
+package org.apache.servicecomb.pack.omega.transaction.spring;
import java.lang.reflect.Method;
-import org.apache.servicecomb.saga.omega.context.CallbackContext;
-import org.apache.servicecomb.saga.omega.transaction.annotations.Compensable;
+import org.apache.servicecomb.pack.omega.context.CallbackContext;
+import org.apache.servicecomb.pack.omega.transaction.annotations.Compensable;
class CompensableMethodCheckingCallback extends MethodCheckingCallback {
diff --git a/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/ExecutorFieldCallback.java b/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/ExecutorFieldCallback.java
similarity index 96%
rename from omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/ExecutorFieldCallback.java
rename to omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/ExecutorFieldCallback.java
index 07a9466..4f72ad2 100644
--- a/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/ExecutorFieldCallback.java
+++ b/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/ExecutorFieldCallback.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.spring;
+package org.apache.servicecomb.pack.omega.transaction.spring;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.Field;
@@ -27,8 +27,8 @@ import java.util.Collection;
import java.util.List;
import java.util.concurrent.Callable;
import java.util.concurrent.Executor;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
-import org.apache.servicecomb.saga.omega.transaction.spring.annotations.OmegaContextAware;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.transaction.spring.annotations.OmegaContextAware;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.ReflectionUtils;
diff --git a/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/MethodCheckingCallback.java b/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/MethodCheckingCallback.java
similarity index 95%
rename from omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/MethodCheckingCallback.java
rename to omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/MethodCheckingCallback.java
index 6c52313..071ac73 100644
--- a/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/MethodCheckingCallback.java
+++ b/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/MethodCheckingCallback.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.spring;
+package org.apache.servicecomb.pack.omega.transaction.spring;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
-import org.apache.servicecomb.saga.omega.context.CallbackContext;
-import org.apache.servicecomb.saga.omega.transaction.OmegaException;
+import org.apache.servicecomb.pack.omega.context.CallbackContext;
+import org.apache.servicecomb.pack.omega.transaction.OmegaException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.aop.framework.AdvisedSupport;
diff --git a/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/ParticipateAnnotationProcessor.java b/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/ParticipateAnnotationProcessor.java
similarity index 91%
rename from omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/ParticipateAnnotationProcessor.java
rename to omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/ParticipateAnnotationProcessor.java
index 80583bd..9ecc272 100644
--- a/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/ParticipateAnnotationProcessor.java
+++ b/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/ParticipateAnnotationProcessor.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.spring;
+package org.apache.servicecomb.pack.omega.transaction.spring;
-import org.apache.servicecomb.saga.omega.context.CallbackContext;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.context.CallbackContext;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.util.ReflectionUtils;
diff --git a/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/ParticipateMethodCheckingCallback.java b/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/ParticipateMethodCheckingCallback.java
similarity index 88%
rename from omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/ParticipateMethodCheckingCallback.java
rename to omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/ParticipateMethodCheckingCallback.java
index 959727a..54a09db 100644
--- a/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/ParticipateMethodCheckingCallback.java
+++ b/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/ParticipateMethodCheckingCallback.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.spring;
+package org.apache.servicecomb.pack.omega.transaction.spring;
import java.lang.reflect.Method;
-import org.apache.servicecomb.saga.omega.context.CallbackContext;
-import org.apache.servicecomb.saga.omega.transaction.annotations.Participate;
+import org.apache.servicecomb.pack.omega.context.CallbackContext;
+import org.apache.servicecomb.pack.omega.transaction.annotations.Participate;
public class ParticipateMethodCheckingCallback extends MethodCheckingCallback {
diff --git a/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/TransactionAspectConfig.java b/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/TransactionAspectConfig.java
similarity index 77%
rename from omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/TransactionAspectConfig.java
rename to omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/TransactionAspectConfig.java
index e5ab968..a268381 100644
--- a/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/TransactionAspectConfig.java
+++ b/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/TransactionAspectConfig.java
@@ -15,21 +15,21 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.spring;
+package org.apache.servicecomb.pack.omega.transaction.spring;
-import org.apache.servicecomb.saga.omega.context.CallbackContext;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
-import org.apache.servicecomb.saga.omega.transaction.CompensationMessageHandler;
-import org.apache.servicecomb.saga.omega.transaction.MessageHandler;
-import org.apache.servicecomb.saga.omega.transaction.SagaMessageSender;
-import org.apache.servicecomb.saga.omega.transaction.SagaStartAspect;
-import org.apache.servicecomb.saga.omega.transaction.TransactionAspect;
-import org.apache.servicecomb.saga.omega.transaction.tcc.CoordinateMessageHandler;
-import org.apache.servicecomb.saga.omega.transaction.tcc.ParametersContext;
-import org.apache.servicecomb.saga.omega.transaction.tcc.TccMessageHandler;
-import org.apache.servicecomb.saga.omega.transaction.tcc.TccMessageSender;
-import org.apache.servicecomb.saga.omega.transaction.tcc.TccParticipatorAspect;
-import org.apache.servicecomb.saga.omega.transaction.tcc.TccStartAspect;
+import org.apache.servicecomb.pack.omega.context.CallbackContext;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.transaction.CompensationMessageHandler;
+import org.apache.servicecomb.pack.omega.transaction.MessageHandler;
+import org.apache.servicecomb.pack.omega.transaction.SagaMessageSender;
+import org.apache.servicecomb.pack.omega.transaction.SagaStartAspect;
+import org.apache.servicecomb.pack.omega.transaction.TransactionAspect;
+import org.apache.servicecomb.pack.omega.transaction.tcc.CoordinateMessageHandler;
+import org.apache.servicecomb.pack.omega.transaction.tcc.ParametersContext;
+import org.apache.servicecomb.pack.omega.transaction.tcc.TccMessageHandler;
+import org.apache.servicecomb.pack.omega.transaction.tcc.TccMessageSender;
+import org.apache.servicecomb.pack.omega.transaction.tcc.TccParticipatorAspect;
+import org.apache.servicecomb.pack.omega.transaction.tcc.TccStartAspect;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/annotations/OmegaContextAware.java b/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/annotations/OmegaContextAware.java
similarity index 94%
rename from omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/annotations/OmegaContextAware.java
rename to omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/annotations/OmegaContextAware.java
index 5a4e7e4..3160dba 100644
--- a/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/saga/omega/transaction/spring/annotations/OmegaContextAware.java
+++ b/omega/omega-spring-tx/src/main/java/org/apache/servicecomb/pack/omega/transaction/spring/annotations/OmegaContextAware.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.spring.annotations;
+package org.apache.servicecomb.pack.omega.transaction.spring.annotations;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
diff --git a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/CompensableAnnotationCheckingTest.java b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/CompensableAnnotationCheckingTest.java
similarity index 97%
rename from omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/CompensableAnnotationCheckingTest.java
rename to omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/CompensableAnnotationCheckingTest.java
index 6cbf8f9..4840201 100644
--- a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/CompensableAnnotationCheckingTest.java
+++ b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/CompensableAnnotationCheckingTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.spring;
+package org.apache.servicecomb.pack.omega.transaction.spring;
import static com.seanyinx.github.unit.scaffolding.AssertUtils.expectFailing;
import static org.hamcrest.CoreMatchers.endsWith;
diff --git a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/MessageConfig.java b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/MessageConfig.java
similarity index 80%
rename from omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/MessageConfig.java
rename to omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/MessageConfig.java
index 7b650ef..415e42e 100644
--- a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/MessageConfig.java
+++ b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/MessageConfig.java
@@ -15,23 +15,23 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.spring;
+package org.apache.servicecomb.pack.omega.transaction.spring;
import java.util.ArrayList;
import java.util.List;
-import org.apache.servicecomb.saga.omega.context.CallbackContext;
-import org.apache.servicecomb.saga.omega.context.IdGenerator;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
-import org.apache.servicecomb.saga.omega.transaction.AlphaResponse;
-import org.apache.servicecomb.saga.omega.transaction.SagaMessageSender;
-import org.apache.servicecomb.saga.omega.transaction.TxEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.DefaultParametersContext;
-import org.apache.servicecomb.saga.omega.transaction.tcc.ParametersContext;
-import org.apache.servicecomb.saga.omega.transaction.tcc.TccMessageSender;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.CoordinatedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.ParticipatedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccEndedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccStartedEvent;
+import org.apache.servicecomb.pack.omega.context.CallbackContext;
+import org.apache.servicecomb.pack.omega.context.IdGenerator;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.transaction.AlphaResponse;
+import org.apache.servicecomb.pack.omega.transaction.SagaMessageSender;
+import org.apache.servicecomb.pack.omega.transaction.TxEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.DefaultParametersContext;
+import org.apache.servicecomb.pack.omega.transaction.tcc.ParametersContext;
+import org.apache.servicecomb.pack.omega.transaction.tcc.TccMessageSender;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.CoordinatedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.ParticipatedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.TccEndedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.TccStartedEvent;
import org.mockito.Mockito;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/MisconfiguredAnnotation.java b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/MisconfiguredAnnotation.java
similarity index 89%
rename from omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/MisconfiguredAnnotation.java
rename to omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/MisconfiguredAnnotation.java
index 99459a5..28811b0 100644
--- a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/MisconfiguredAnnotation.java
+++ b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/MisconfiguredAnnotation.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.spring;
+package org.apache.servicecomb.pack.omega.transaction.spring;
-import org.apache.servicecomb.saga.omega.transaction.spring.annotations.OmegaContextAware;
+import org.apache.servicecomb.pack.omega.transaction.spring.annotations.OmegaContextAware;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
diff --git a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/MisconfiguredRetriesService.java b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/MisconfiguredRetriesService.java
similarity index 89%
rename from omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/MisconfiguredRetriesService.java
rename to omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/MisconfiguredRetriesService.java
index e68c99c..0c90567 100644
--- a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/MisconfiguredRetriesService.java
+++ b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/MisconfiguredRetriesService.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.spring;
+package org.apache.servicecomb.pack.omega.transaction.spring;
-import org.apache.servicecomb.saga.omega.transaction.annotations.Compensable;
+import org.apache.servicecomb.pack.omega.transaction.annotations.Compensable;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Component;
diff --git a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/MisconfiguredService.java b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/MisconfiguredService.java
similarity index 89%
rename from omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/MisconfiguredService.java
rename to omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/MisconfiguredService.java
index a569d23..936f219 100644
--- a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/MisconfiguredService.java
+++ b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/MisconfiguredService.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.spring;
+package org.apache.servicecomb.pack.omega.transaction.spring;
-import org.apache.servicecomb.saga.omega.transaction.annotations.Compensable;
+import org.apache.servicecomb.pack.omega.transaction.annotations.Compensable;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Component;
diff --git a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TccInterceptorTest.java b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/TccInterceptorTest.java
similarity index 90%
rename from omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TccInterceptorTest.java
rename to omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/TccInterceptorTest.java
index 7c9cebe..5bda4ce 100644
--- a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TccInterceptorTest.java
+++ b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/TccInterceptorTest.java
@@ -15,11 +15,10 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.spring;
+package org.apache.servicecomb.pack.omega.transaction.spring;
import static com.seanyinx.github.unit.scaffolding.AssertUtils.expectFailing;
import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
-import static org.apache.servicecomb.saga.omega.transaction.spring.TransactionalUserService.ILLEGAL_USER;
import static org.assertj.core.util.IterableUtil.toArray;
import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.core.Is.is;
@@ -30,12 +29,12 @@ import static org.mockito.Mockito.when;
import java.util.List;
import java.util.UUID;
import org.apache.servicecomb.pack.common.TransactionStatus;
-import org.apache.servicecomb.saga.omega.context.IdGenerator;
-import org.apache.servicecomb.saga.omega.transaction.tcc.TccMessageHandler;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.CoordinatedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.ParticipatedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccEndedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccStartedEvent;
+import org.apache.servicecomb.pack.omega.context.IdGenerator;
+import org.apache.servicecomb.pack.omega.transaction.tcc.TccMessageHandler;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.CoordinatedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.ParticipatedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.TccEndedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.TccStartedEvent;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
@@ -56,7 +55,7 @@ public class TccInterceptorTest {
private final String email = uniquify("email");
private final User user = new User(username, email);
- private final User illegalUser = new User(ILLEGAL_USER, email);
+ private final User illegalUser = new User(TransactionalUserService.ILLEGAL_USER, email);
private final String usernameJack = uniquify("Jack");
private final User jack = new User(usernameJack, uniquify("jack@gmail.com"));
diff --git a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TccUserService.java b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/TccUserService.java
similarity index 94%
rename from omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TccUserService.java
rename to omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/TccUserService.java
index 31da4c9..0d7abc0 100644
--- a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TccUserService.java
+++ b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/TccUserService.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.spring;
+package org.apache.servicecomb.pack.omega.transaction.spring;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import javax.annotation.Resource;
-import org.apache.servicecomb.saga.omega.transaction.annotations.Participate;
+import org.apache.servicecomb.pack.omega.transaction.annotations.Participate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
diff --git a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TccUserServiceMain.java b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/TccUserServiceMain.java
similarity index 89%
rename from omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TccUserServiceMain.java
rename to omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/TccUserServiceMain.java
index 4d09dec..59d8c31 100644
--- a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TccUserServiceMain.java
+++ b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/TccUserServiceMain.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.spring;
+package org.apache.servicecomb.pack.omega.transaction.spring;
-import org.apache.servicecomb.saga.omega.context.annotations.TccStart;
+import org.apache.servicecomb.pack.omega.context.annotations.TccStart;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TransactionInterceptionTest.java b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/TransactionInterceptionTest.java
similarity index 95%
rename from omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TransactionInterceptionTest.java
rename to omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/TransactionInterceptionTest.java
index 4505f72..92dd5db 100644
--- a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TransactionInterceptionTest.java
+++ b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/TransactionInterceptionTest.java
@@ -15,14 +15,13 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.spring;
+package org.apache.servicecomb.pack.omega.transaction.spring;
import static akka.actor.ActorRef.noSender;
import static com.seanyinx.github.unit.scaffolding.AssertUtils.expectFailing;
import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
import static java.util.Collections.singletonList;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static org.apache.servicecomb.saga.omega.transaction.spring.TransactionalUserService.ILLEGAL_USER;
import static org.awaitility.Awaitility.await;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.nullValue;
@@ -48,14 +47,14 @@ import java.util.UUID;
import java.util.concurrent.Callable;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
-import org.apache.servicecomb.saga.omega.context.IdGenerator;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
-import org.apache.servicecomb.saga.omega.transaction.MessageHandler;
-import org.apache.servicecomb.saga.omega.transaction.TxAbortedEvent;
-import org.apache.servicecomb.saga.omega.transaction.TxCompensatedEvent;
-import org.apache.servicecomb.saga.omega.transaction.TxEndedEvent;
-import org.apache.servicecomb.saga.omega.transaction.TxStartedEvent;
-import org.apache.servicecomb.saga.omega.transaction.spring.annotations.OmegaContextAware;
+import org.apache.servicecomb.pack.omega.context.IdGenerator;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.transaction.spring.annotations.OmegaContextAware;
+import org.apache.servicecomb.pack.omega.transaction.MessageHandler;
+import org.apache.servicecomb.pack.omega.transaction.TxAbortedEvent;
+import org.apache.servicecomb.pack.omega.transaction.TxCompensatedEvent;
+import org.apache.servicecomb.pack.omega.transaction.TxEndedEvent;
+import org.apache.servicecomb.pack.omega.transaction.TxStartedEvent;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
@@ -78,7 +77,7 @@ public class TransactionInterceptionTest {
private final String email = uniquify("email");
private final User user = new User(username, email);
- private final User illegalUser = new User(ILLEGAL_USER, email);
+ private final User illegalUser = new User(TransactionalUserService.ILLEGAL_USER, email);
private final String usernameJack = uniquify("Jack");
private final User jack = new User(usernameJack, uniquify("jack@gmail.com"));
diff --git a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TransactionTestMain.java b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/TransactionTestMain.java
similarity index 94%
rename from omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TransactionTestMain.java
rename to omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/TransactionTestMain.java
index ab9bb7e..ba4733c 100644
--- a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TransactionTestMain.java
+++ b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/TransactionTestMain.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.spring;
+package org.apache.servicecomb.pack.omega.transaction.spring;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TransactionalUserService.java b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/TransactionalUserService.java
similarity index 95%
rename from omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TransactionalUserService.java
rename to omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/TransactionalUserService.java
index ff0b572..bc7bcc9 100644
--- a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/TransactionalUserService.java
+++ b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/TransactionalUserService.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.spring;
+package org.apache.servicecomb.pack.omega.transaction.spring;
-import org.apache.servicecomb.saga.omega.transaction.annotations.Compensable;
+import org.apache.servicecomb.pack.omega.transaction.annotations.Compensable;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
diff --git a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/User.java b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/User.java
similarity index 96%
rename from omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/User.java
rename to omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/User.java
index da9d4b2..b9e668a 100644
--- a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/User.java
+++ b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/User.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.spring;
+package org.apache.servicecomb.pack.omega.transaction.spring;
import java.util.Objects;
diff --git a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/UserRepository.java b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/UserRepository.java
similarity index 93%
rename from omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/UserRepository.java
rename to omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/UserRepository.java
index 729b7ab..9ff8c39 100644
--- a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/saga/omega/transaction/spring/UserRepository.java
+++ b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/UserRepository.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.spring;
+package org.apache.servicecomb.pack.omega.transaction.spring;
import org.springframework.data.repository.CrudRepository;
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/AlphaResponse.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/AlphaResponse.java
similarity index 94%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/AlphaResponse.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/AlphaResponse.java
index 07df793..bfcf649 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/AlphaResponse.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/AlphaResponse.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction;
+package org.apache.servicecomb.pack.omega.transaction;
public class AlphaResponse {
private final boolean aborted;
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/CompensableInterceptor.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/CompensableInterceptor.java
similarity index 94%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/CompensableInterceptor.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/CompensableInterceptor.java
index 5c5bb18..7186147 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/CompensableInterceptor.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/CompensableInterceptor.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction;
+package org.apache.servicecomb.pack.omega.transaction;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
class CompensableInterceptor implements EventAwareInterceptor {
private final OmegaContext context;
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/CompensationMessageHandler.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/CompensationMessageHandler.java
similarity index 92%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/CompensationMessageHandler.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/CompensationMessageHandler.java
index 2e1e0a3..97b80ee 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/CompensationMessageHandler.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/CompensationMessageHandler.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction;
+package org.apache.servicecomb.pack.omega.transaction;
-import org.apache.servicecomb.saga.omega.context.CallbackContext;
+import org.apache.servicecomb.pack.omega.context.CallbackContext;
public class CompensationMessageHandler implements MessageHandler {
private final SagaMessageSender sender;
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/DefaultRecovery.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/DefaultRecovery.java
similarity index 95%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/DefaultRecovery.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/DefaultRecovery.java
index 0844981..49b9d90 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/DefaultRecovery.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/DefaultRecovery.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction;
+package org.apache.servicecomb.pack.omega.transaction;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.Method;
import javax.transaction.InvalidTransactionException;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
-import org.apache.servicecomb.saga.omega.transaction.annotations.Compensable;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.transaction.annotations.Compensable;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.reflect.MethodSignature;
import org.slf4j.Logger;
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/EventAwareInterceptor.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/EventAwareInterceptor.java
similarity index 95%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/EventAwareInterceptor.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/EventAwareInterceptor.java
index b542222..5a88ee3 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/EventAwareInterceptor.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/EventAwareInterceptor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction;
+package org.apache.servicecomb.pack.omega.transaction;
public interface EventAwareInterceptor {
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/ForwardRecovery.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/ForwardRecovery.java
similarity index 94%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/ForwardRecovery.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/ForwardRecovery.java
index d1a28c2..35fe419 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/ForwardRecovery.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/ForwardRecovery.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction;
+package org.apache.servicecomb.pack.omega.transaction;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.Method;
import javax.transaction.InvalidTransactionException;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
-import org.apache.servicecomb.saga.omega.transaction.annotations.Compensable;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.transaction.annotations.Compensable;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.reflect.MethodSignature;
import org.slf4j.Logger;
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/MessageDeserializer.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/MessageDeserializer.java
similarity index 94%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/MessageDeserializer.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/MessageDeserializer.java
index 23f1126..3efd45d 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/MessageDeserializer.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/MessageDeserializer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction;
+package org.apache.servicecomb.pack.omega.transaction;
public interface MessageDeserializer {
Object[] deserialize(byte[] message);
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/MessageHandler.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/MessageHandler.java
similarity index 94%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/MessageHandler.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/MessageHandler.java
index ada064e..38a9dab 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/MessageHandler.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/MessageHandler.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction;
+package org.apache.servicecomb.pack.omega.transaction;
public interface MessageHandler {
void onReceive(String globalTxId, String localTxId, String parentTxId, String compensationMethod, Object... payloads);
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/MessageSender.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/MessageSender.java
similarity index 94%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/MessageSender.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/MessageSender.java
index 4062082..9833fdf 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/MessageSender.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/MessageSender.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction;
+package org.apache.servicecomb.pack.omega.transaction;
public interface MessageSender {
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/MessageSerializer.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/MessageSerializer.java
similarity index 94%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/MessageSerializer.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/MessageSerializer.java
index 0bc1e46..95da95e 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/MessageSerializer.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/MessageSerializer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction;
+package org.apache.servicecomb.pack.omega.transaction;
public interface MessageSerializer {
byte[] serialize(Object[] objects);
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/NoOpEventAwareInterceptor.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/NoOpEventAwareInterceptor.java
similarity index 96%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/NoOpEventAwareInterceptor.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/NoOpEventAwareInterceptor.java
index 9909735..bc46242 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/NoOpEventAwareInterceptor.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/NoOpEventAwareInterceptor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction;
+package org.apache.servicecomb.pack.omega.transaction;
public class NoOpEventAwareInterceptor implements EventAwareInterceptor {
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/OmegaException.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/OmegaException.java
similarity index 94%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/OmegaException.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/OmegaException.java
index 4488e44..4d3f983 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/OmegaException.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/OmegaException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction;
+package org.apache.servicecomb.pack.omega.transaction;
public class OmegaException extends RuntimeException {
public OmegaException(String message) {
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/RecoveryPolicy.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/RecoveryPolicy.java
similarity index 85%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/RecoveryPolicy.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/RecoveryPolicy.java
index bc1d4d8..7aec7c7 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/RecoveryPolicy.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/RecoveryPolicy.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction;
+package org.apache.servicecomb.pack.omega.transaction;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
-import org.apache.servicecomb.saga.omega.transaction.annotations.Compensable;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.transaction.annotations.Compensable;
import org.aspectj.lang.ProceedingJoinPoint;
public interface RecoveryPolicy {
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/RecoveryPolicyFactory.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/RecoveryPolicyFactory.java
similarity index 96%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/RecoveryPolicyFactory.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/RecoveryPolicyFactory.java
index f59ac2b..33098d9 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/RecoveryPolicyFactory.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/RecoveryPolicyFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction;
+package org.apache.servicecomb.pack.omega.transaction;
public class RecoveryPolicyFactory {
private static final RecoveryPolicy DEFAULT_RECOVERY = new DefaultRecovery();
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/SagaEndedEvent.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/SagaEndedEvent.java
similarity index 95%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/SagaEndedEvent.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/SagaEndedEvent.java
index 4684d5d..aa2bb3b 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/SagaEndedEvent.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/SagaEndedEvent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction;
+package org.apache.servicecomb.pack.omega.transaction;
import org.apache.servicecomb.pack.common.EventType;
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/SagaMessageSender.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/SagaMessageSender.java
similarity index 94%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/SagaMessageSender.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/SagaMessageSender.java
index 3a6c67c..ca147fb 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/SagaMessageSender.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/SagaMessageSender.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction;
+package org.apache.servicecomb.pack.omega.transaction;
public interface SagaMessageSender extends MessageSender {
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAnnotationProcessor.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/SagaStartAnnotationProcessor.java
similarity index 94%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAnnotationProcessor.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/SagaStartAnnotationProcessor.java
index 4c3b122..87b7808 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAnnotationProcessor.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/SagaStartAnnotationProcessor.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction;
+package org.apache.servicecomb.pack.omega.transaction;
import javax.transaction.TransactionalException;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
class SagaStartAnnotationProcessor {
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAspect.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/SagaStartAspect.java
similarity index 91%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAspect.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/SagaStartAspect.java
index 0e09f49..ec4441e 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAspect.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/SagaStartAspect.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction;
+package org.apache.servicecomb.pack.omega.transaction;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.Method;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
-import org.apache.servicecomb.saga.omega.context.annotations.SagaStart;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.context.annotations.SagaStart;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
@@ -41,7 +41,7 @@ public class SagaStartAspect {
this.sagaStartAnnotationProcessor = new SagaStartAnnotationProcessor(context, sender);
}
- @Around("execution(@org.apache.servicecomb.saga.omega.context.annotations.SagaStart * *(..)) && @annotation(sagaStart)")
+ @Around("execution(@org.apache.servicecomb.pack.omega.context.annotations.SagaStart * *(..)) && @annotation(sagaStart)")
Object advise(ProceedingJoinPoint joinPoint, SagaStart sagaStart) throws Throwable {
initializeOmegaContext();
Method method = ((MethodSignature) joinPoint.getSignature()).getMethod();
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/SagaStartedEvent.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/SagaStartedEvent.java
similarity index 95%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/SagaStartedEvent.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/SagaStartedEvent.java
index 7112041..66fba1a 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/SagaStartedEvent.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/SagaStartedEvent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction;
+package org.apache.servicecomb.pack.omega.transaction;
import org.apache.servicecomb.pack.common.EventType;
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TransactionAspect.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/TransactionAspect.java
similarity index 90%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TransactionAspect.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/TransactionAspect.java
index ee247ce..262067f 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TransactionAspect.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/TransactionAspect.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction;
+package org.apache.servicecomb.pack.omega.transaction;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.Method;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
-import org.apache.servicecomb.saga.omega.transaction.annotations.Compensable;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.transaction.annotations.Compensable;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
@@ -42,7 +42,7 @@ public class TransactionAspect {
this.interceptor = new CompensableInterceptor(context, sender);
}
- @Around("execution(@org.apache.servicecomb.saga.omega.transaction.annotations.Compensable * *(..)) && @annotation(compensable)")
+ @Around("execution(@org.apache.servicecomb.pack.omega.transaction.annotations.Compensable * *(..)) && @annotation(compensable)")
Object advise(ProceedingJoinPoint joinPoint, Compensable compensable) throws Throwable {
Method method = ((MethodSignature) joinPoint.getSignature()).getMethod();
String localTxId = context.localTxId();
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxAbortedEvent.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/TxAbortedEvent.java
similarity index 96%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxAbortedEvent.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/TxAbortedEvent.java
index 6e53354..c6dea5a 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxAbortedEvent.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/TxAbortedEvent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction;
+package org.apache.servicecomb.pack.omega.transaction;
import java.io.PrintWriter;
import java.io.StringWriter;
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxCompensatedEvent.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/TxCompensatedEvent.java
similarity index 95%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxCompensatedEvent.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/TxCompensatedEvent.java
index 7194fa2..e4b1a17 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxCompensatedEvent.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/TxCompensatedEvent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction;
+package org.apache.servicecomb.pack.omega.transaction;
import org.apache.servicecomb.pack.common.EventType;
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxEndedEvent.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/TxEndedEvent.java
similarity index 95%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxEndedEvent.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/TxEndedEvent.java
index 26c0bc1..8618e7f 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxEndedEvent.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/TxEndedEvent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction;
+package org.apache.servicecomb.pack.omega.transaction;
import org.apache.servicecomb.pack.common.EventType;
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxEvent.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/TxEvent.java
similarity index 98%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxEvent.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/TxEvent.java
index 213b2da..71e10b5 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxEvent.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/TxEvent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction;
+package org.apache.servicecomb.pack.omega.transaction;
import java.util.Arrays;
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxStartedEvent.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/TxStartedEvent.java
similarity index 95%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxStartedEvent.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/TxStartedEvent.java
index e74682c..fe7bb5b 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TxStartedEvent.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/TxStartedEvent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction;
+package org.apache.servicecomb.pack.omega.transaction;
import org.apache.servicecomb.pack.common.EventType;
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/annotations/Compensable.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/annotations/Compensable.java
similarity index 97%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/annotations/Compensable.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/annotations/Compensable.java
index 9475374..a3e9d33 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/annotations/Compensable.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/annotations/Compensable.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.annotations;
+package org.apache.servicecomb.pack.omega.transaction.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/annotations/Participate.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/annotations/Participate.java
similarity index 97%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/annotations/Participate.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/annotations/Participate.java
index 8351076..8f5c3a2 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/annotations/Participate.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/annotations/Participate.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.annotations;
+package org.apache.servicecomb.pack.omega.transaction.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/CoordinateMessageHandler.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/CoordinateMessageHandler.java
similarity index 89%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/CoordinateMessageHandler.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/CoordinateMessageHandler.java
index 71e0474..73673aa 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/CoordinateMessageHandler.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/CoordinateMessageHandler.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.tcc;
+package org.apache.servicecomb.pack.omega.transaction.tcc;
import org.apache.servicecomb.pack.common.TransactionStatus;
-import org.apache.servicecomb.saga.omega.context.CallbackContext;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.CoordinatedEvent;
+import org.apache.servicecomb.pack.omega.context.CallbackContext;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.CoordinatedEvent;
public class CoordinateMessageHandler implements TccMessageHandler {
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/DefaultParametersContext.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/DefaultParametersContext.java
similarity index 95%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/DefaultParametersContext.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/DefaultParametersContext.java
index 2fb9f2f..5cd3baa 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/DefaultParametersContext.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/DefaultParametersContext.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.tcc;
+package org.apache.servicecomb.pack.omega.transaction.tcc;
import java.util.HashMap;
import java.util.Map;
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/ParametersContext.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/ParametersContext.java
similarity index 94%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/ParametersContext.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/ParametersContext.java
index 26fc4d2..7e992d8 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/ParametersContext.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/ParametersContext.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.tcc;
+package org.apache.servicecomb.pack.omega.transaction.tcc;
public interface ParametersContext {
Object[] getParameters(String localTransactionId);
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccEventService.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccEventService.java
similarity index 77%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccEventService.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccEventService.java
index 6c5b7e2..370fe31 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccEventService.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccEventService.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.tcc;
+package org.apache.servicecomb.pack.omega.transaction.tcc;
-import org.apache.servicecomb.saga.omega.transaction.AlphaResponse;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.CoordinatedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.ParticipatedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccEndedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccStartedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.CoordinatedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.ParticipatedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.TccStartedEvent;
+import org.apache.servicecomb.pack.omega.transaction.AlphaResponse;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.TccEndedEvent;
public interface TccEventService {
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccMessageHandler.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccMessageHandler.java
similarity index 94%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccMessageHandler.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccMessageHandler.java
index 461c310..e2c8a70 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccMessageHandler.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccMessageHandler.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.tcc;
+package org.apache.servicecomb.pack.omega.transaction.tcc;
public interface TccMessageHandler {
void onReceive(String globalTxId, String localTxId, String parentTxId, String method);
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccMessageSender.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccMessageSender.java
similarity index 73%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccMessageSender.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccMessageSender.java
index 2a9055e..a1d16a8 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccMessageSender.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccMessageSender.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.tcc;
-
-import org.apache.servicecomb.saga.omega.transaction.AlphaResponse;
-import org.apache.servicecomb.saga.omega.transaction.MessageSender;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.CoordinatedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.ParticipatedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccEndedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccStartedEvent;
+package org.apache.servicecomb.pack.omega.transaction.tcc;
+
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.CoordinatedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.ParticipatedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.TccStartedEvent;
+import org.apache.servicecomb.pack.omega.transaction.AlphaResponse;
+import org.apache.servicecomb.pack.omega.transaction.MessageSender;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.TccEndedEvent;
public interface TccMessageSender extends MessageSender {
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccParticipatorAspect.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccParticipatorAspect.java
similarity index 92%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccParticipatorAspect.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccParticipatorAspect.java
index db2917e..f70f61a 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccParticipatorAspect.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccParticipatorAspect.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.tcc;
+package org.apache.servicecomb.pack.omega.transaction.tcc;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.Method;
import org.apache.servicecomb.pack.common.TransactionStatus;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
-import org.apache.servicecomb.saga.omega.transaction.annotations.Participate;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.ParticipatedEvent;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.transaction.annotations.Participate;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.ParticipatedEvent;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
@@ -47,7 +47,7 @@ public class TccParticipatorAspect {
this.parametersContext = parametersContext;
}
- @Around("execution(@org.apache.servicecomb.saga.omega.transaction.annotations.Participate * *(..)) && @annotation(participate)")
+ @Around("execution(@org.apache.servicecomb.pack.omega.transaction.annotations.Participate * *(..)) && @annotation(participate)")
Object advise(ProceedingJoinPoint joinPoint, Participate participate) throws Throwable {
Method method = ((MethodSignature) joinPoint.getSignature()).getMethod();
String localTxId = context.localTxId();
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAnnotationProcessor.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccStartAnnotationProcessor.java
similarity index 85%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAnnotationProcessor.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccStartAnnotationProcessor.java
index cf264cf..948f79f 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAnnotationProcessor.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccStartAnnotationProcessor.java
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.tcc;
+package org.apache.servicecomb.pack.omega.transaction.tcc;
import javax.transaction.TransactionalException;
import org.apache.servicecomb.pack.common.TransactionStatus;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
-import org.apache.servicecomb.saga.omega.transaction.AlphaResponse;
-import org.apache.servicecomb.saga.omega.transaction.OmegaException;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccEndedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccStartedEvent;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.TccStartedEvent;
+import org.apache.servicecomb.pack.omega.transaction.AlphaResponse;
+import org.apache.servicecomb.pack.omega.transaction.OmegaException;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.TccEndedEvent;
public class TccStartAnnotationProcessor {
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAspect.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccStartAspect.java
similarity index 89%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAspect.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccStartAspect.java
index 8d0bf83..057c3e1 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAspect.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccStartAspect.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.tcc;
+package org.apache.servicecomb.pack.omega.transaction.tcc;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.Method;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
-import org.apache.servicecomb.saga.omega.context.annotations.TccStart;
-import org.apache.servicecomb.saga.omega.transaction.OmegaException;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.context.annotations.TccStart;
+import org.apache.servicecomb.pack.omega.transaction.OmegaException;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
@@ -42,7 +42,7 @@ public class TccStartAspect {
this.tccStartAnnotationProcessor = new TccStartAnnotationProcessor(context, tccMessageSender);
}
- @Around("execution(@org.apache.servicecomb.saga.omega.context.annotations.TccStart * *(..)) && @annotation(tccStart)")
+ @Around("execution(@org.apache.servicecomb.pack.omega.context.annotations.TccStart * *(..)) && @annotation(tccStart)")
Object advise(ProceedingJoinPoint joinPoint, TccStart tccStart) throws Throwable {
initializeOmegaContext();
Method method = ((MethodSignature) joinPoint.getSignature()).getMethod();
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/CoordinatedEvent.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/events/CoordinatedEvent.java
similarity index 96%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/CoordinatedEvent.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/events/CoordinatedEvent.java
index 38ef4ff..1ef6bb6 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/CoordinatedEvent.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/events/CoordinatedEvent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.tcc.events;
+package org.apache.servicecomb.pack.omega.transaction.tcc.events;
import org.apache.servicecomb.pack.common.TransactionStatus;
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/ParticipatedEvent.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/events/ParticipatedEvent.java
similarity index 97%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/ParticipatedEvent.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/events/ParticipatedEvent.java
index 18c5d45..701509d 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/ParticipatedEvent.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/events/ParticipatedEvent.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.tcc.events;
+package org.apache.servicecomb.pack.omega.transaction.tcc.events;
import org.apache.servicecomb.pack.common.TransactionStatus;
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/TccEndedEvent.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/events/TccEndedEvent.java
similarity index 96%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/TccEndedEvent.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/events/TccEndedEvent.java
index dff9a6f..41a2c25 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/TccEndedEvent.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/events/TccEndedEvent.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.tcc.events;
+package org.apache.servicecomb.pack.omega.transaction.tcc.events;
import org.apache.servicecomb.pack.common.TransactionStatus;
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/TccStartedEvent.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/events/TccStartedEvent.java
similarity index 95%
rename from omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/TccStartedEvent.java
rename to omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/events/TccStartedEvent.java
index 7a1e7b3..4b9205d 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/tcc/events/TccStartedEvent.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/events/TccStartedEvent.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.tcc.events;
+package org.apache.servicecomb.pack.omega.transaction.tcc.events;
public class TccStartedEvent {
private final String globalTxId;
diff --git a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/CompensableInterceptorTest.java b/omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/CompensableInterceptorTest.java
similarity index 95%
rename from omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/CompensableInterceptorTest.java
rename to omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/CompensableInterceptorTest.java
index c646a08..617b4c4 100644
--- a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/CompensableInterceptorTest.java
+++ b/omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/CompensableInterceptorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction;
+package org.apache.servicecomb.pack.omega.transaction;
import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
import static java.util.Arrays.asList;
@@ -29,8 +29,8 @@ import java.util.Random;
import java.util.UUID;
import org.apache.servicecomb.pack.common.EventType;
-import org.apache.servicecomb.saga.omega.context.IdGenerator;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.context.IdGenerator;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
diff --git a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/CompensationMessageHandlerTest.java b/omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/CompensationMessageHandlerTest.java
similarity index 96%
rename from omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/CompensationMessageHandlerTest.java
rename to omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/CompensationMessageHandlerTest.java
index 6f94d5c..3bc1362 100644
--- a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/CompensationMessageHandlerTest.java
+++ b/omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/CompensationMessageHandlerTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction;
+package org.apache.servicecomb.pack.omega.transaction;
import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
import static org.hamcrest.core.Is.is;
@@ -27,7 +27,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.servicecomb.pack.common.EventType;
-import org.apache.servicecomb.saga.omega.context.CallbackContext;
+import org.apache.servicecomb.pack.omega.context.CallbackContext;
import org.junit.Before;
import org.junit.Test;
diff --git a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/DefaultRecoveryTest.java b/omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/DefaultRecoveryTest.java
similarity index 96%
rename from omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/DefaultRecoveryTest.java
rename to omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/DefaultRecoveryTest.java
index bb8c0ed..5d76804 100644
--- a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/DefaultRecoveryTest.java
+++ b/omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/DefaultRecoveryTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction;
+package org.apache.servicecomb.pack.omega.transaction;
import static com.seanyinx.github.unit.scaffolding.AssertUtils.expectFailing;
import static org.hamcrest.core.Is.is;
@@ -35,9 +35,9 @@ import java.util.UUID;
import javax.transaction.InvalidTransactionException;
import org.apache.servicecomb.pack.common.EventType;
-import org.apache.servicecomb.saga.omega.context.IdGenerator;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
-import org.apache.servicecomb.saga.omega.transaction.annotations.Compensable;
+import org.apache.servicecomb.pack.omega.context.IdGenerator;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.transaction.annotations.Compensable;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.reflect.MethodSignature;
import org.junit.Before;
diff --git a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/ForwardRecoveryTest.java b/omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/ForwardRecoveryTest.java
similarity index 96%
rename from omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/ForwardRecoveryTest.java
rename to omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/ForwardRecoveryTest.java
index 6103caf..23482af 100644
--- a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/ForwardRecoveryTest.java
+++ b/omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/ForwardRecoveryTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction;
+package org.apache.servicecomb.pack.omega.transaction;
import static com.seanyinx.github.unit.scaffolding.AssertUtils.expectFailing;
import static org.hamcrest.core.Is.is;
@@ -34,9 +34,9 @@ import java.util.UUID;
import javax.transaction.InvalidTransactionException;
import org.apache.servicecomb.pack.common.EventType;
-import org.apache.servicecomb.saga.omega.context.IdGenerator;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
-import org.apache.servicecomb.saga.omega.transaction.annotations.Compensable;
+import org.apache.servicecomb.pack.omega.context.IdGenerator;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.transaction.annotations.Compensable;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.reflect.MethodSignature;
import org.junit.Before;
diff --git a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAnnotationProcessorTest.java b/omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/SagaStartAnnotationProcessorTest.java
similarity index 95%
rename from omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAnnotationProcessorTest.java
rename to omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/SagaStartAnnotationProcessorTest.java
index f65be03..015d2de 100644
--- a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAnnotationProcessorTest.java
+++ b/omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/SagaStartAnnotationProcessorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction;
+package org.apache.servicecomb.pack.omega.transaction;
import static com.seanyinx.github.unit.scaffolding.AssertUtils.expectFailing;
import static org.hamcrest.Matchers.instanceOf;
@@ -31,8 +31,8 @@ import java.util.List;
import java.util.UUID;
import javax.transaction.TransactionalException;
import org.apache.servicecomb.pack.common.EventType;
-import org.apache.servicecomb.saga.omega.context.IdGenerator;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.context.IdGenerator;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
import org.junit.Before;
import org.junit.Test;
diff --git a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAspectTest.java b/omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/SagaStartAspectTest.java
similarity index 95%
rename from omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAspectTest.java
rename to omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/SagaStartAspectTest.java
index e613272..c11a790 100644
--- a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAspectTest.java
+++ b/omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/SagaStartAspectTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction;
+package org.apache.servicecomb.pack.omega.transaction;
import static com.seanyinx.github.unit.scaffolding.AssertUtils.expectFailing;
import static org.hamcrest.CoreMatchers.nullValue;
@@ -28,9 +28,9 @@ import java.util.List;
import java.util.UUID;
import org.apache.servicecomb.pack.common.EventType;
-import org.apache.servicecomb.saga.omega.context.IdGenerator;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
-import org.apache.servicecomb.saga.omega.context.annotations.SagaStart;
+import org.apache.servicecomb.pack.omega.context.IdGenerator;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.context.annotations.SagaStart;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.reflect.MethodSignature;
import org.junit.Before;
diff --git a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/TransactionAspectTest.java b/omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/TransactionAspectTest.java
similarity index 97%
rename from omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/TransactionAspectTest.java
rename to omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/TransactionAspectTest.java
index 6dc4f41..0f4cf8b 100644
--- a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/TransactionAspectTest.java
+++ b/omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/TransactionAspectTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction;
+package org.apache.servicecomb.pack.omega.transaction;
import static com.seanyinx.github.unit.scaffolding.AssertUtils.expectFailing;
import static org.hamcrest.core.Is.is;
@@ -28,9 +28,9 @@ import java.util.List;
import java.util.UUID;
import org.apache.servicecomb.pack.common.EventType;
-import org.apache.servicecomb.saga.omega.context.IdGenerator;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
-import org.apache.servicecomb.saga.omega.transaction.annotations.Compensable;
+import org.apache.servicecomb.pack.omega.context.IdGenerator;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.transaction.annotations.Compensable;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.reflect.MethodSignature;
import org.junit.Before;
diff --git a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/tcc/CoordinateMessageHandlerTest.java b/omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/tcc/CoordinateMessageHandlerTest.java
similarity index 87%
rename from omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/tcc/CoordinateMessageHandlerTest.java
rename to omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/tcc/CoordinateMessageHandlerTest.java
index f03fa59..ca2879e 100644
--- a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/tcc/CoordinateMessageHandlerTest.java
+++ b/omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/tcc/CoordinateMessageHandlerTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.tcc;
+package org.apache.servicecomb.pack.omega.transaction.tcc;
import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
@@ -25,13 +25,13 @@ import static org.junit.Assert.assertThat;
import java.util.ArrayList;
import java.util.List;
import org.apache.servicecomb.pack.common.TransactionStatus;
-import org.apache.servicecomb.saga.omega.context.CallbackContext;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
-import org.apache.servicecomb.saga.omega.transaction.AlphaResponse;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.CoordinatedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.ParticipatedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccEndedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccStartedEvent;
+import org.apache.servicecomb.pack.omega.context.CallbackContext;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.transaction.AlphaResponse;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.CoordinatedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.ParticipatedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.TccEndedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.TccStartedEvent;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
diff --git a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccParticipatorAspectTest.java b/omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccParticipatorAspectTest.java
similarity index 91%
rename from omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccParticipatorAspectTest.java
rename to omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccParticipatorAspectTest.java
index 6295607..da19491 100644
--- a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccParticipatorAspectTest.java
+++ b/omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccParticipatorAspectTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.tcc;
+package org.apache.servicecomb.pack.omega.transaction.tcc;
import static com.seanyinx.github.unit.scaffolding.AssertUtils.expectFailing;
import static org.hamcrest.core.Is.is;
@@ -27,14 +27,14 @@ import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import org.apache.servicecomb.pack.common.TransactionStatus;
-import org.apache.servicecomb.saga.omega.context.IdGenerator;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
-import org.apache.servicecomb.saga.omega.transaction.AlphaResponse;
-import org.apache.servicecomb.saga.omega.transaction.annotations.Participate;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.CoordinatedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.ParticipatedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccEndedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccStartedEvent;
+import org.apache.servicecomb.pack.omega.context.IdGenerator;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.transaction.AlphaResponse;
+import org.apache.servicecomb.pack.omega.transaction.annotations.Participate;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.CoordinatedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.ParticipatedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.TccEndedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.TccStartedEvent;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.reflect.MethodSignature;
import org.junit.Before;
diff --git a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAnnotationProcessorTest.java b/omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccStartAnnotationProcessorTest.java
similarity index 89%
rename from omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAnnotationProcessorTest.java
rename to omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccStartAnnotationProcessorTest.java
index f3b1c18..96d0de6 100644
--- a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAnnotationProcessorTest.java
+++ b/omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccStartAnnotationProcessorTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.tcc;
+package org.apache.servicecomb.pack.omega.transaction.tcc;
import static com.seanyinx.github.unit.scaffolding.AssertUtils.expectFailing;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -29,14 +29,14 @@ import java.util.UUID;
import javax.transaction.TransactionalException;
import org.apache.servicecomb.pack.common.TransactionStatus;
-import org.apache.servicecomb.saga.omega.context.IdGenerator;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
-import org.apache.servicecomb.saga.omega.transaction.AlphaResponse;
-import org.apache.servicecomb.saga.omega.transaction.OmegaException;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.CoordinatedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.ParticipatedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccEndedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccStartedEvent;
+import org.apache.servicecomb.pack.omega.context.IdGenerator;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.transaction.AlphaResponse;
+import org.apache.servicecomb.pack.omega.transaction.OmegaException;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.CoordinatedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.ParticipatedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.TccEndedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.TccStartedEvent;
import org.hamcrest.core.Is;
import org.junit.Assert;
import org.junit.Before;
diff --git a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAspectTest.java b/omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccStartAspectTest.java
similarity index 90%
rename from omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAspectTest.java
rename to omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccStartAspectTest.java
index a0ac89a..2572c72 100644
--- a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/tcc/TccStartAspectTest.java
+++ b/omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccStartAspectTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transaction.tcc;
+package org.apache.servicecomb.pack.omega.transaction.tcc;
import static com.seanyinx.github.unit.scaffolding.AssertUtils.expectFailing;
import static org.hamcrest.CoreMatchers.nullValue;
@@ -28,14 +28,14 @@ import java.util.List;
import java.util.UUID;
import org.apache.servicecomb.pack.common.TransactionStatus;
-import org.apache.servicecomb.saga.omega.context.IdGenerator;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
-import org.apache.servicecomb.saga.omega.context.annotations.TccStart;
-import org.apache.servicecomb.saga.omega.transaction.AlphaResponse;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.CoordinatedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.ParticipatedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccEndedEvent;
-import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccStartedEvent;
+import org.apache.servicecomb.pack.omega.context.IdGenerator;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.context.annotations.TccStart;
+import org.apache.servicecomb.pack.omega.transaction.AlphaResponse;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.CoordinatedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.ParticipatedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.TccEndedEvent;
+import org.apache.servicecomb.pack.omega.transaction.tcc.events.TccStartedEvent;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.reflect.MethodSignature;
import org.junit.Before;
diff --git a/omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/saga/omega/transport/dubbo/SagaDubboConsumerFilter.java b/omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboConsumerFilter.java
similarity index 88%
rename from omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/saga/omega/transport/dubbo/SagaDubboConsumerFilter.java
rename to omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboConsumerFilter.java
index afb83d1..2a44a46 100644
--- a/omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/saga/omega/transport/dubbo/SagaDubboConsumerFilter.java
+++ b/omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboConsumerFilter.java
@@ -15,11 +15,10 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transport.dubbo;
+package org.apache.servicecomb.pack.omega.transport.dubbo;
import com.alibaba.dubbo.common.Constants;
import com.alibaba.dubbo.common.extension.Activate;
-import com.alibaba.dubbo.config.spring.extension.SpringExtensionFactory;
import com.alibaba.dubbo.rpc.Filter;
import com.alibaba.dubbo.rpc.Invocation;
import com.alibaba.dubbo.rpc.Invoker;
@@ -28,13 +27,13 @@ import com.alibaba.dubbo.rpc.RpcException;
import java.lang.invoke.MethodHandles;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import static org.apache.servicecomb.saga.omega.context.OmegaContext.GLOBAL_TX_ID_KEY;
-import static org.apache.servicecomb.saga.omega.context.OmegaContext.LOCAL_TX_ID_KEY;
+import static org.apache.servicecomb.pack.omega.context.OmegaContext.GLOBAL_TX_ID_KEY;
+import static org.apache.servicecomb.pack.omega.context.OmegaContext.LOCAL_TX_ID_KEY;
/**
* add saga transaction id to dubbo invocation
diff --git a/omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/saga/omega/transport/dubbo/SagaDubboProviderFilter.java b/omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboProviderFilter.java
similarity index 88%
rename from omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/saga/omega/transport/dubbo/SagaDubboProviderFilter.java
rename to omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboProviderFilter.java
index 618b9b9..ee6c905 100644
--- a/omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/saga/omega/transport/dubbo/SagaDubboProviderFilter.java
+++ b/omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboProviderFilter.java
@@ -14,22 +14,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transport.dubbo;
+package org.apache.servicecomb.pack.omega.transport.dubbo;
import com.alibaba.dubbo.common.Constants;
import com.alibaba.dubbo.common.extension.Activate;
-import com.alibaba.dubbo.config.spring.extension.SpringExtensionFactory;
import com.alibaba.dubbo.rpc.*;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import java.lang.invoke.MethodHandles;
-import static org.apache.servicecomb.saga.omega.context.OmegaContext.GLOBAL_TX_ID_KEY;
-import static org.apache.servicecomb.saga.omega.context.OmegaContext.LOCAL_TX_ID_KEY;
+import static org.apache.servicecomb.pack.omega.context.OmegaContext.GLOBAL_TX_ID_KEY;
+import static org.apache.servicecomb.pack.omega.context.OmegaContext.LOCAL_TX_ID_KEY;
/**
* get saga transaction id from dubbo invocation and set into omega context
diff --git a/omega/omega-transport/omega-transport-dubbo/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter b/omega/omega-transport/omega-transport-dubbo/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter
index f60a743..3505b4f 100644
--- a/omega/omega-transport/omega-transport-dubbo/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter
+++ b/omega/omega-transport/omega-transport-dubbo/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter
@@ -14,5 +14,5 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-sagaDubboConsumerFilter=org.apache.servicecomb.saga.omega.transport.dubbo.SagaDubboConsumerFilter
-sageDubboProviderFilter=org.apache.servicecomb.saga.omega.transport.dubbo.SagaDubboProviderFilter
\ No newline at end of file
+sagaDubboConsumerFilter=org.apache.servicecomb.pack.omega.transport.dubbo.SagaDubboConsumerFilter
+sageDubboProviderFilter=org.apache.servicecomb.pack.omega.transport.dubbo.SagaDubboProviderFilter
diff --git a/omega/omega-transport/omega-transport-dubbo/src/test/java/SagaDubboConsumerFilterTest.java b/omega/omega-transport/omega-transport-dubbo/src/test/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboConsumerFilterTest.java
similarity index 91%
rename from omega/omega-transport/omega-transport-dubbo/src/test/java/SagaDubboConsumerFilterTest.java
rename to omega/omega-transport/omega-transport-dubbo/src/test/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboConsumerFilterTest.java
index dc1875b..53049b2 100644
--- a/omega/omega-transport/omega-transport-dubbo/src/test/java/SagaDubboConsumerFilterTest.java
+++ b/omega/omega-transport/omega-transport-dubbo/src/test/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboConsumerFilterTest.java
@@ -1,4 +1,4 @@
-/*
+package org.apache.servicecomb.pack.omega.transport.dubbo;/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -19,9 +19,9 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
-import org.apache.servicecomb.saga.omega.context.IdGenerator;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
-import org.apache.servicecomb.saga.omega.transport.dubbo.SagaDubboConsumerFilter;
+import org.apache.servicecomb.pack.omega.context.IdGenerator;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.transport.dubbo.SagaDubboConsumerFilter;
import org.junit.Before;
import org.junit.Test;
diff --git a/omega/omega-transport/omega-transport-dubbo/src/test/java/SagaDubboProviderFilterTest.java b/omega/omega-transport/omega-transport-dubbo/src/test/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboProviderFilterTest.java
similarity index 92%
rename from omega/omega-transport/omega-transport-dubbo/src/test/java/SagaDubboProviderFilterTest.java
rename to omega/omega-transport/omega-transport-dubbo/src/test/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboProviderFilterTest.java
index 1d0e8ad..08ae0ce 100644
--- a/omega/omega-transport/omega-transport-dubbo/src/test/java/SagaDubboProviderFilterTest.java
+++ b/omega/omega-transport/omega-transport-dubbo/src/test/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboProviderFilterTest.java
@@ -1,4 +1,4 @@
-/*
+package org.apache.servicecomb.pack.omega.transport.dubbo;/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -17,9 +17,8 @@
import java.util.UUID;
-import org.apache.servicecomb.saga.omega.context.IdGenerator;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
-import org.apache.servicecomb.saga.omega.transport.dubbo.SagaDubboProviderFilter;
+import org.apache.servicecomb.pack.omega.context.IdGenerator;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
import org.junit.Before;
import org.junit.Test;
diff --git a/omega/omega-transport/omega-transport-feign/src/main/java/org/apache/servicecomb/saga/omega/transport/feign/FeignAutoConfiguration.java b/omega/omega-transport/omega-transport-feign/src/main/java/org/apache/servicecomb/pack/omega/transport/feign/FeignAutoConfiguration.java
similarity index 92%
rename from omega/omega-transport/omega-transport-feign/src/main/java/org/apache/servicecomb/saga/omega/transport/feign/FeignAutoConfiguration.java
rename to omega/omega-transport/omega-transport-feign/src/main/java/org/apache/servicecomb/pack/omega/transport/feign/FeignAutoConfiguration.java
index 0edc663..c76d665 100644
--- a/omega/omega-transport/omega-transport-feign/src/main/java/org/apache/servicecomb/saga/omega/transport/feign/FeignAutoConfiguration.java
+++ b/omega/omega-transport/omega-transport-feign/src/main/java/org/apache/servicecomb/pack/omega/transport/feign/FeignAutoConfiguration.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transport.feign;
+package org.apache.servicecomb.pack.omega.transport.feign;
import feign.RequestInterceptor;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.context.annotation.Bean;
diff --git a/omega/omega-transport/omega-transport-feign/src/main/java/org/apache/servicecomb/saga/omega/transport/feign/FeignClientRequestInterceptor.java b/omega/omega-transport/omega-transport-feign/src/main/java/org/apache/servicecomb/pack/omega/transport/feign/FeignClientRequestInterceptor.java
similarity index 88%
rename from omega/omega-transport/omega-transport-feign/src/main/java/org/apache/servicecomb/saga/omega/transport/feign/FeignClientRequestInterceptor.java
rename to omega/omega-transport/omega-transport-feign/src/main/java/org/apache/servicecomb/pack/omega/transport/feign/FeignClientRequestInterceptor.java
index c679ed0..774b05d 100644
--- a/omega/omega-transport/omega-transport-feign/src/main/java/org/apache/servicecomb/saga/omega/transport/feign/FeignClientRequestInterceptor.java
+++ b/omega/omega-transport/omega-transport-feign/src/main/java/org/apache/servicecomb/pack/omega/transport/feign/FeignClientRequestInterceptor.java
@@ -15,18 +15,18 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transport.feign;
+package org.apache.servicecomb.pack.omega.transport.feign;
import feign.RequestInterceptor;
import feign.RequestTemplate;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;
-import static org.apache.servicecomb.saga.omega.context.OmegaContext.GLOBAL_TX_ID_KEY;
-import static org.apache.servicecomb.saga.omega.context.OmegaContext.LOCAL_TX_ID_KEY;
+import static org.apache.servicecomb.pack.omega.context.OmegaContext.GLOBAL_TX_ID_KEY;
+import static org.apache.servicecomb.pack.omega.context.OmegaContext.LOCAL_TX_ID_KEY;
/**
* å¢žåŠ Feign拦截器，实现spring cloud下feignè°ƒç”¨ä¼ é€’å…¨å±€äº‹åŠ¡å’Œæœ¬åœ°äº‹åŠ¡ã€‚
diff --git a/omega/omega-transport/omega-transport-feign/src/test/java/org/apache/servicecomb/saga/omega/transport/feign/FeignAutoConfigurationTest.java b/omega/omega-transport/omega-transport-feign/src/test/java/org/apache/servicecomb/pack/omega/transport/feign/FeignAutoConfigurationTest.java
similarity index 93%
rename from omega/omega-transport/omega-transport-feign/src/test/java/org/apache/servicecomb/saga/omega/transport/feign/FeignAutoConfigurationTest.java
rename to omega/omega-transport/omega-transport-feign/src/test/java/org/apache/servicecomb/pack/omega/transport/feign/FeignAutoConfigurationTest.java
index 4fa35ac..cd2c9a0 100644
--- a/omega/omega-transport/omega-transport-feign/src/test/java/org/apache/servicecomb/saga/omega/transport/feign/FeignAutoConfigurationTest.java
+++ b/omega/omega-transport/omega-transport-feign/src/test/java/org/apache/servicecomb/pack/omega/transport/feign/FeignAutoConfigurationTest.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.servicecomb.saga.omega.transport.feign;
+package org.apache.servicecomb.pack.omega.transport.feign;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;
@@ -28,8 +28,8 @@ import java.util.UUID;
import feign.RequestInterceptor;
import feign.RequestTemplate;
-import org.apache.servicecomb.saga.omega.context.IdGenerator;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.context.IdGenerator;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
import org.hamcrest.Matchers;
import org.junit.Before;
import org.junit.Test;
diff --git a/omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/saga/omega/transport/resttemplate/RestTemplateConfig.java b/omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/RestTemplateConfig.java
similarity index 92%
rename from omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/saga/omega/transport/resttemplate/RestTemplateConfig.java
rename to omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/RestTemplateConfig.java
index 98bf70b..f97f0f3 100644
--- a/omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/saga/omega/transport/resttemplate/RestTemplateConfig.java
+++ b/omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/RestTemplateConfig.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.servicecomb.saga.omega.transport.resttemplate;
+package org.apache.servicecomb.pack.omega.transport.resttemplate;
import java.util.List;
@@ -26,7 +26,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.http.client.ClientHttpRequestInterceptor;
import org.springframework.web.client.RestTemplate;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
@Configuration
public class RestTemplateConfig {
diff --git a/omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/saga/omega/transport/resttemplate/TransactionClientHttpRequestInterceptor.java b/omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/TransactionClientHttpRequestInterceptor.java
similarity index 87%
rename from omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/saga/omega/transport/resttemplate/TransactionClientHttpRequestInterceptor.java
rename to omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/TransactionClientHttpRequestInterceptor.java
index 958be54..0562ad7 100644
--- a/omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/saga/omega/transport/resttemplate/TransactionClientHttpRequestInterceptor.java
+++ b/omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/TransactionClientHttpRequestInterceptor.java
@@ -16,18 +16,17 @@
*
*/
-package org.apache.servicecomb.saga.omega.transport.resttemplate;
+package org.apache.servicecomb.pack.omega.transport.resttemplate;
-import static org.apache.servicecomb.saga.omega.context.OmegaContext.GLOBAL_TX_ID_KEY;
-import static org.apache.servicecomb.saga.omega.context.OmegaContext.LOCAL_TX_ID_KEY;
+import static org.apache.servicecomb.pack.omega.context.OmegaContext.GLOBAL_TX_ID_KEY;
+import static org.apache.servicecomb.pack.omega.context.OmegaContext.LOCAL_TX_ID_KEY;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpRequest;
import org.springframework.http.client.ClientHttpRequestExecution;
import org.springframework.http.client.ClientHttpRequestInterceptor;
diff --git a/omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/saga/omega/transport/resttemplate/TransactionHandlerInterceptor.java b/omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/TransactionHandlerInterceptor.java
similarity index 89%
rename from omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/saga/omega/transport/resttemplate/TransactionHandlerInterceptor.java
rename to omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/TransactionHandlerInterceptor.java
index 50b8a0e..d4aa4ad 100644
--- a/omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/saga/omega/transport/resttemplate/TransactionHandlerInterceptor.java
+++ b/omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/TransactionHandlerInterceptor.java
@@ -18,17 +18,17 @@
*
*/
-package org.apache.servicecomb.saga.omega.transport.resttemplate;
+package org.apache.servicecomb.pack.omega.transport.resttemplate;
-import static org.apache.servicecomb.saga.omega.context.OmegaContext.GLOBAL_TX_ID_KEY;
-import static org.apache.servicecomb.saga.omega.context.OmegaContext.LOCAL_TX_ID_KEY;
+import static org.apache.servicecomb.pack.omega.context.OmegaContext.GLOBAL_TX_ID_KEY;
+import static org.apache.servicecomb.pack.omega.context.OmegaContext.LOCAL_TX_ID_KEY;
import java.lang.invoke.MethodHandles;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.servlet.HandlerInterceptor;
diff --git a/omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/saga/omega/transport/resttemplate/WebConfig.java b/omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/WebConfig.java
similarity index 93%
rename from omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/saga/omega/transport/resttemplate/WebConfig.java
rename to omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/WebConfig.java
index 3218d47..d7833d3 100644
--- a/omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/saga/omega/transport/resttemplate/WebConfig.java
+++ b/omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/WebConfig.java
@@ -18,11 +18,11 @@
*
*/
-package org.apache.servicecomb.saga.omega.transport.resttemplate;
+package org.apache.servicecomb.pack.omega.transport.resttemplate;
import java.lang.invoke.MethodHandles;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/omega/omega-transport/omega-transport-resttemplate/src/main/resources/META-INF/spring.factories b/omega/omega-transport/omega-transport-resttemplate/src/main/resources/META-INF/spring.factories
index 00a5c7c..e3fbe6f 100644
--- a/omega/omega-transport/omega-transport-resttemplate/src/main/resources/META-INF/spring.factories
+++ b/omega/omega-transport/omega-transport-resttemplate/src/main/resources/META-INF/spring.factories
@@ -15,5 +15,5 @@
## limitations under the License.
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
- org.apache.servicecomb.saga.omega.transport.resttemplate.WebConfig,\
- org.apache.servicecomb.saga.omega.transport.resttemplate.RestTemplateConfig
+ org.apache.servicecomb.pack.omega.transport.resttemplate.WebConfig,\
+ org.apache.servicecomb.pack.omega.transport.resttemplate.RestTemplateConfig
diff --git a/omega/omega-transport/omega-transport-resttemplate/src/test/java/org/apache/servicecomb/saga/omega/transport/resttemplate/TransactionClientHttpRequestInterceptorTest.java b/omega/omega-transport/omega-transport-resttemplate/src/test/java/org/apache/servicecomb/pack/omega/transport/resttemplate/TransactionClientHttpRequestInterceptorTest.java
similarity index 94%
rename from omega/omega-transport/omega-transport-resttemplate/src/test/java/org/apache/servicecomb/saga/omega/transport/resttemplate/TransactionClientHttpRequestInterceptorTest.java
rename to omega/omega-transport/omega-transport-resttemplate/src/test/java/org/apache/servicecomb/pack/omega/transport/resttemplate/TransactionClientHttpRequestInterceptorTest.java
index 14e288e..a305b12 100644
--- a/omega/omega-transport/omega-transport-resttemplate/src/test/java/org/apache/servicecomb/saga/omega/transport/resttemplate/TransactionClientHttpRequestInterceptorTest.java
+++ b/omega/omega-transport/omega-transport-resttemplate/src/test/java/org/apache/servicecomb/pack/omega/transport/resttemplate/TransactionClientHttpRequestInterceptorTest.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.servicecomb.saga.omega.transport.resttemplate;
+package org.apache.servicecomb.pack.omega.transport.resttemplate;
import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
import static org.hamcrest.Matchers.contains;
@@ -27,8 +27,8 @@ import static org.mockito.Mockito.when;
import java.io.IOException;
-import org.apache.servicecomb.saga.omega.context.IdGenerator;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.context.IdGenerator;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/omega/omega-transport/omega-transport-resttemplate/src/test/java/org/apache/servicecomb/saga/omega/transport/resttemplate/TransactionHandlerInterceptorTest.java b/omega/omega-transport/omega-transport-resttemplate/src/test/java/org/apache/servicecomb/pack/omega/transport/resttemplate/TransactionHandlerInterceptorTest.java
similarity index 93%
rename from omega/omega-transport/omega-transport-resttemplate/src/test/java/org/apache/servicecomb/saga/omega/transport/resttemplate/TransactionHandlerInterceptorTest.java
rename to omega/omega-transport/omega-transport-resttemplate/src/test/java/org/apache/servicecomb/pack/omega/transport/resttemplate/TransactionHandlerInterceptorTest.java
index 16cbe6d..2ebf4c1 100644
--- a/omega/omega-transport/omega-transport-resttemplate/src/test/java/org/apache/servicecomb/saga/omega/transport/resttemplate/TransactionHandlerInterceptorTest.java
+++ b/omega/omega-transport/omega-transport-resttemplate/src/test/java/org/apache/servicecomb/pack/omega/transport/resttemplate/TransactionHandlerInterceptorTest.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.servicecomb.saga.omega.transport.resttemplate;
+package org.apache.servicecomb.pack.omega.transport.resttemplate;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
@@ -30,8 +30,8 @@ import java.util.UUID;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.servicecomb.saga.omega.context.IdGenerator;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.context.IdGenerator;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
import org.junit.Before;
import org.junit.Test;
import org.springframework.web.servlet.HandlerInterceptor;
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/pack/omega/transport/servicecomb/SagaConsumerHandler.java
similarity index 90%
rename from omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/saga/omega/transport/servicecomb/SagaConsumerHandler.java
rename to omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/pack/omega/transport/servicecomb/SagaConsumerHandler.java
index 2269853..5a51a27 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/pack/omega/transport/servicecomb/SagaConsumerHandler.java
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transport.servicecomb;
+package org.apache.servicecomb.pack.omega.transport.servicecomb;
-import static org.apache.servicecomb.saga.omega.context.OmegaContext.GLOBAL_TX_ID_KEY;
-import static org.apache.servicecomb.saga.omega.context.OmegaContext.LOCAL_TX_ID_KEY;
+import static org.apache.servicecomb.pack.omega.context.OmegaContext.GLOBAL_TX_ID_KEY;
+import static org.apache.servicecomb.pack.omega.context.OmegaContext.LOCAL_TX_ID_KEY;
import java.lang.invoke.MethodHandles;
import org.apache.servicecomb.core.Handler;
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.foundation.common.utils.BeanUtils;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
import org.apache.servicecomb.swagger.invocation.AsyncResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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/pack/omega/transport/servicecomb/SagaProviderHandler.java
similarity index 90%
rename from omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/saga/omega/transport/servicecomb/SagaProviderHandler.java
rename to omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/pack/omega/transport/servicecomb/SagaProviderHandler.java
index 8dbeb54..e79d9e4 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/pack/omega/transport/servicecomb/SagaProviderHandler.java
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transport.servicecomb;
+package org.apache.servicecomb.pack.omega.transport.servicecomb;
-import static org.apache.servicecomb.saga.omega.context.OmegaContext.GLOBAL_TX_ID_KEY;
-import static org.apache.servicecomb.saga.omega.context.OmegaContext.LOCAL_TX_ID_KEY;
+import static org.apache.servicecomb.pack.omega.context.OmegaContext.GLOBAL_TX_ID_KEY;
+import static org.apache.servicecomb.pack.omega.context.OmegaContext.LOCAL_TX_ID_KEY;
import java.lang.invoke.MethodHandles;
import org.apache.servicecomb.core.Handler;
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.foundation.common.utils.BeanUtils;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
import org.apache.servicecomb.swagger.invocation.AsyncResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/omega/omega-transport/omega-transport-servicecomb/src/main/resources/config/cse.handler.xml b/omega/omega-transport/omega-transport-servicecomb/src/main/resources/config/cse.handler.xml
index 9515815..29bb572 100644
--- a/omega/omega-transport/omega-transport-servicecomb/src/main/resources/config/cse.handler.xml
+++ b/omega/omega-transport/omega-transport-servicecomb/src/main/resources/config/cse.handler.xml
@@ -17,7 +17,7 @@
<config>
<handler id="saga-consumer"
- class="org.apache.servicecomb.saga.omega.transport.servicecomb.SagaConsumerHandler" />
+ class="org.apache.servicecomb.pack.omega.transport.servicecomb.SagaConsumerHandler" />
<handler id="saga-provider"
- class="org.apache.servicecomb.saga.omega.transport.servicecomb.SagaProviderHandler" />
-</config>
\ No newline at end of file
+ class="org.apache.servicecomb.pack.omega.transport.servicecomb.SagaProviderHandler" />
+</config>
diff --git a/omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/saga/omega/transport/servicecomb/SagaConsumerHandlerTest.java b/omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/pack/omega/transport/servicecomb/SagaConsumerHandlerTest.java
similarity index 93%
rename from omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/saga/omega/transport/servicecomb/SagaConsumerHandlerTest.java
rename to omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/pack/omega/transport/servicecomb/SagaConsumerHandlerTest.java
index 18b57ac..db5bf0c 100644
--- a/omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/saga/omega/transport/servicecomb/SagaConsumerHandlerTest.java
+++ b/omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/pack/omega/transport/servicecomb/SagaConsumerHandlerTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transport.servicecomb;
+package org.apache.servicecomb.pack.omega.transport.servicecomb;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertThat;
@@ -27,8 +27,8 @@ import java.util.Map;
import java.util.UUID;
import org.apache.servicecomb.core.Invocation;
-import org.apache.servicecomb.saga.omega.context.IdGenerator;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.context.IdGenerator;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
import org.apache.servicecomb.swagger.invocation.AsyncResponse;
import org.junit.Before;
import org.junit.Test;
diff --git a/omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/saga/omega/transport/servicecomb/SagaProviderHandlerTest.java b/omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/pack/omega/transport/servicecomb/SagaProviderHandlerTest.java
similarity index 88%
rename from omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/saga/omega/transport/servicecomb/SagaProviderHandlerTest.java
rename to omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/pack/omega/transport/servicecomb/SagaProviderHandlerTest.java
index 41fc049..638076d 100644
--- a/omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/saga/omega/transport/servicecomb/SagaProviderHandlerTest.java
+++ b/omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/pack/omega/transport/servicecomb/SagaProviderHandlerTest.java
@@ -15,11 +15,10 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.transport.servicecomb;
+package org.apache.servicecomb.pack.omega.transport.servicecomb;
-import static java.util.Collections.emptyMap;
-import static org.apache.servicecomb.saga.omega.context.OmegaContext.GLOBAL_TX_ID_KEY;
-import static org.apache.servicecomb.saga.omega.context.OmegaContext.LOCAL_TX_ID_KEY;
+import static org.apache.servicecomb.pack.omega.context.OmegaContext.GLOBAL_TX_ID_KEY;
+import static org.apache.servicecomb.pack.omega.context.OmegaContext.LOCAL_TX_ID_KEY;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assert.assertThat;
@@ -32,8 +31,8 @@ import java.util.Map;
import java.util.UUID;
import org.apache.servicecomb.core.Invocation;
-import org.apache.servicecomb.saga.omega.context.IdGenerator;
-import org.apache.servicecomb.saga.omega.context.OmegaContext;
+import org.apache.servicecomb.pack.omega.context.IdGenerator;
+import org.apache.servicecomb.pack.omega.context.OmegaContext;
import org.apache.servicecomb.swagger.invocation.AsyncResponse;
import org.junit.Before;
import org.junit.Test;
diff --git a/persistence/persistence-jpa/src/main/java/org/apache/servicecomb/saga/persistence/jpa/EclipseLinkJpaConfiguration.java b/persistence/persistence-jpa/src/main/java/org/apache/servicecomb/pack/persistence/jpa/EclipseLinkJpaConfiguration.java
similarity index 97%
rename from persistence/persistence-jpa/src/main/java/org/apache/servicecomb/saga/persistence/jpa/EclipseLinkJpaConfiguration.java
rename to persistence/persistence-jpa/src/main/java/org/apache/servicecomb/pack/persistence/jpa/EclipseLinkJpaConfiguration.java
index da3f334..2c8da03 100644
--- a/persistence/persistence-jpa/src/main/java/org/apache/servicecomb/saga/persistence/jpa/EclipseLinkJpaConfiguration.java
+++ b/persistence/persistence-jpa/src/main/java/org/apache/servicecomb/pack/persistence/jpa/EclipseLinkJpaConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.persistence.jpa;
+package org.apache.servicecomb.pack.persistence.jpa;
import java.util.Collections;
import java.util.HashMap;
diff --git a/persistence/persistence-jpa/src/main/resources/META-INF/spring.factories b/persistence/persistence-jpa/src/main/resources/META-INF/spring.factories
index 1d6b850..f18c6a5 100644
--- a/persistence/persistence-jpa/src/main/resources/META-INF/spring.factories
+++ b/persistence/persistence-jpa/src/main/resources/META-INF/spring.factories
@@ -15,4 +15,4 @@
## limitations under the License.
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
- org.apache.servicecomb.saga.persistence.jpa.EclipseLinkJpaConfiguration
+ org.apache.servicecomb.pack.persistence.jpa.EclipseLinkJpaConfiguration
[servicecomb-pack] 05/13: SCB-976 Update the maven group to
org.apache.servicecomb.pack in the demo module
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/servicecomb-pack.git
commit fbae40c2451e08ae6969e9dd52481128c539ab2e
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Fri Dec 14 13:59:23 2018 +0800
SCB-976 Update the maven group to org.apache.servicecomb.pack in the demo module
---
.../acceptance-pack-dubbo-demo/pom.xml | 2 +-
.../acceptance-pack-spring-demo/pom.xml | 2 +-
.../acceptance-pack-tcc-spring-demo/pom.xml | 2 +-
acceptance-tests/pom.xml | 2 +-
demo/saga-dubbo-demo/service-api/pom.xml | 4 ++--
demo/saga-dubbo-demo/service-pub/pom.xml | 2 +-
demo/saga-dubbo-demo/servicec/pom.xml | 4 ++--
demo/saga-servicecomb-demo/pom.xml | 4 ++--
demo/saga-servicecomb-demo/scb-booking/pom.xml | 2 +-
demo/saga-servicecomb-demo/scb-car/pom.xml | 2 +-
demo/saga-servicecomb-demo/scb-hotel/pom.xml | 2 +-
demo/saga-spring-demo/pom.xml | 2 +-
demo/tcc-spring-demo/inventory/pom.xml | 4 ++--
demo/tcc-spring-demo/ordering/pom.xml | 2 +-
demo/tcc-spring-demo/payment/pom.xml | 4 ++--
demo/tcc-spring-demo/pom.xml | 6 ++---
distribution/pom.xml | 26 +++++++++++-----------
17 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml b/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml
index b64a0ba..e8d5868 100644
--- a/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml
+++ b/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml
@@ -21,7 +21,7 @@
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>
diff --git a/acceptance-tests/acceptance-pack-spring-demo/pom.xml b/acceptance-tests/acceptance-pack-spring-demo/pom.xml
index 87bfe9a..389d10f 100644
--- a/acceptance-tests/acceptance-pack-spring-demo/pom.xml
+++ b/acceptance-tests/acceptance-pack-spring-demo/pom.xml
@@ -21,7 +21,7 @@
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>
diff --git a/acceptance-tests/acceptance-pack-tcc-spring-demo/pom.xml b/acceptance-tests/acceptance-pack-tcc-spring-demo/pom.xml
index 1126e3c..f752a36 100644
--- a/acceptance-tests/acceptance-pack-tcc-spring-demo/pom.xml
+++ b/acceptance-tests/acceptance-pack-tcc-spring-demo/pom.xml
@@ -21,7 +21,7 @@
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>
diff --git a/acceptance-tests/pom.xml b/acceptance-tests/pom.xml
index d6dc00b..7cd2078 100644
--- a/acceptance-tests/pom.xml
+++ b/acceptance-tests/pom.xml
@@ -21,7 +21,7 @@
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>
diff --git a/demo/saga-dubbo-demo/service-api/pom.xml b/demo/saga-dubbo-demo/service-api/pom.xml
index 805422b..105d55f 100644
--- a/demo/saga-dubbo-demo/service-api/pom.xml
+++ b/demo/saga-dubbo-demo/service-api/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<dependencies>
<dependency>
- <groupId>org.apache.servicecomb.saga.demo</groupId>
+ <groupId>org.apache.servicecomb.pack.demo</groupId>
<artifactId>service-pub</artifactId>
<version>0.3.0-SNAPSHOT</version>
</dependency>
@@ -30,7 +30,7 @@
<parent>
<artifactId>saga-dubbo-demo</artifactId>
- <groupId>org.apache.servicecomb.saga.demo</groupId>
+ <groupId>org.apache.servicecomb.pack.demo</groupId>
<version>0.3.0-SNAPSHOT</version>
</parent>
diff --git a/demo/saga-dubbo-demo/service-pub/pom.xml b/demo/saga-dubbo-demo/service-pub/pom.xml
index b8ebb92..8dc184e 100644
--- a/demo/saga-dubbo-demo/service-pub/pom.xml
+++ b/demo/saga-dubbo-demo/service-pub/pom.xml
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>saga-dubbo-demo</artifactId>
- <groupId>org.apache.servicecomb.saga.demo</groupId>
+ <groupId>org.apache.servicecomb.pack.demo</groupId>
<version>0.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/demo/saga-dubbo-demo/servicec/pom.xml b/demo/saga-dubbo-demo/servicec/pom.xml
index e99dd98..d32c79b 100644
--- a/demo/saga-dubbo-demo/servicec/pom.xml
+++ b/demo/saga-dubbo-demo/servicec/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<dependencies>
<dependency>
- <groupId>org.apache.servicecomb.saga.demo</groupId>
+ <groupId>org.apache.servicecomb.pack.demo</groupId>
<artifactId>service-api</artifactId>
<version>0.3.0-SNAPSHOT</version>
<scope>compile</scope>
@@ -30,7 +30,7 @@
</dependencies>
<parent>
- <groupId>org.apache.servicecomb.saga.demo</groupId>
+ <groupId>org.apache.servicecomb.pack.demo</groupId>
<artifactId>saga-dubbo-demo</artifactId>
<version>0.3.0-SNAPSHOT</version>
</parent>
diff --git a/demo/saga-servicecomb-demo/pom.xml b/demo/saga-servicecomb-demo/pom.xml
index e72ce81..4b47f3d 100644
--- a/demo/saga-servicecomb-demo/pom.xml
+++ b/demo/saga-servicecomb-demo/pom.xml
@@ -71,11 +71,11 @@
<artifactId>hibernate-validator</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-spring-starter</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-transport-servicecomb</artifactId>
</dependency>
</dependencies>
diff --git a/demo/saga-servicecomb-demo/scb-booking/pom.xml b/demo/saga-servicecomb-demo/scb-booking/pom.xml
index 1858aae..8468418 100644
--- a/demo/saga-servicecomb-demo/scb-booking/pom.xml
+++ b/demo/saga-servicecomb-demo/scb-booking/pom.xml
@@ -21,7 +21,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>saga-servicecomb-demo</artifactId>
- <groupId>org.apache.servicecomb.saga.demo</groupId>
+ <groupId>org.apache.servicecomb.pack.demo</groupId>
<version>0.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/demo/saga-servicecomb-demo/scb-car/pom.xml b/demo/saga-servicecomb-demo/scb-car/pom.xml
index 1c32849..4746871 100644
--- a/demo/saga-servicecomb-demo/scb-car/pom.xml
+++ b/demo/saga-servicecomb-demo/scb-car/pom.xml
@@ -21,7 +21,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>saga-servicecomb-demo</artifactId>
- <groupId>org.apache.servicecomb.saga.demo</groupId>
+ <groupId>org.apache.servicecomb.pack.demo</groupId>
<version>0.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/demo/saga-servicecomb-demo/scb-hotel/pom.xml b/demo/saga-servicecomb-demo/scb-hotel/pom.xml
index 23424f2..fce548e 100644
--- a/demo/saga-servicecomb-demo/scb-hotel/pom.xml
+++ b/demo/saga-servicecomb-demo/scb-hotel/pom.xml
@@ -21,7 +21,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>saga-servicecomb-demo</artifactId>
- <groupId>org.apache.servicecomb.saga.demo</groupId>
+ <groupId>org.apache.servicecomb.pack.demo</groupId>
<version>0.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/demo/saga-spring-demo/pom.xml b/demo/saga-spring-demo/pom.xml
index ab5bece..ba31f5c 100644
--- a/demo/saga-spring-demo/pom.xml
+++ b/demo/saga-spring-demo/pom.xml
@@ -19,7 +19,7 @@
<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-demo</artifactId>
- <groupId>org.apache.servicecomb.saga.demo</groupId>
+ <groupId>org.apache.servicecomb.pack.demo</groupId>
<version>0.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/demo/tcc-spring-demo/inventory/pom.xml b/demo/tcc-spring-demo/inventory/pom.xml
index 7bd1d4f..f4b8a85 100644
--- a/demo/tcc-spring-demo/inventory/pom.xml
+++ b/demo/tcc-spring-demo/inventory/pom.xml
@@ -21,7 +21,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>tcc-spring-demo</artifactId>
- <groupId>org.apache.servicecomb.saga.demo</groupId>
+ <groupId>org.apache.servicecomb.pack.demo</groupId>
<version>0.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -47,7 +47,7 @@
</dependency>
<!-- Added the eclipse link JPA configuration-->
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>persistence-jpa</artifactId>
</dependency>
<!-- Added the driver of h2 -->
diff --git a/demo/tcc-spring-demo/ordering/pom.xml b/demo/tcc-spring-demo/ordering/pom.xml
index 4dae748..ceb8b00 100644
--- a/demo/tcc-spring-demo/ordering/pom.xml
+++ b/demo/tcc-spring-demo/ordering/pom.xml
@@ -21,7 +21,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>tcc-spring-demo</artifactId>
- <groupId>org.apache.servicecomb.saga.demo</groupId>
+ <groupId>org.apache.servicecomb.pack.demo</groupId>
<version>0.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/demo/tcc-spring-demo/payment/pom.xml b/demo/tcc-spring-demo/payment/pom.xml
index b8aa181..4fdf089 100644
--- a/demo/tcc-spring-demo/payment/pom.xml
+++ b/demo/tcc-spring-demo/payment/pom.xml
@@ -19,7 +19,7 @@
<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>tcc-spring-demo</artifactId>
- <groupId>org.apache.servicecomb.saga.demo</groupId>
+ <groupId>org.apache.servicecomb.pack.demo</groupId>
<version>0.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -45,7 +45,7 @@
</dependency>
<!-- Added the eclipse link JPA configuration-->
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>persistence-jpa</artifactId>
</dependency>
<!-- Added the driver of h2 -->
diff --git a/demo/tcc-spring-demo/pom.xml b/demo/tcc-spring-demo/pom.xml
index e7e7ec9..99fdfa0 100644
--- a/demo/tcc-spring-demo/pom.xml
+++ b/demo/tcc-spring-demo/pom.xml
@@ -19,7 +19,7 @@
<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-demo</artifactId>
- <groupId>org.apache.servicecomb.saga.demo</groupId>
+ <groupId>org.apache.servicecomb.pack.demo</groupId>
<version>0.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -49,11 +49,11 @@
</dependency>
<!-- Added the Omega dependencies -->
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-spring-starter</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-transport-resttemplate</artifactId>
</dependency>
</dependencies>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 7451170..dc68028 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -19,7 +19,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>saga</artifactId>
<version>0.3.0-SNAPSHOT</version>
</parent>
@@ -28,51 +28,51 @@
<packaging>pom</packaging>
<dependencies>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-context</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-transaction</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-spring-tx</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-transport-resttemplate</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-transport-dubbo</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-transport-feign</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-connector-grpc</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-spring-starter</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>omega-format</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>alpha-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>pack-contract-grpc</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicecomb.saga</groupId>
+ <groupId>org.apache.servicecomb.pack</groupId>
<artifactId>pack-common</artifactId>
</dependency>
</dependencies>
[servicecomb-pack] 10/13: SCB-976 Rename the package name of
integration tests and accept tests
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/servicecomb-pack.git
commit cfeb5e00a6304cd595140be7ce794aa3ed3ba83a
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Fri Dec 14 16:27:09 2018 +0800
SCB-976 Rename the package name of integration tests and accept tests
---
acceptance-tests/acceptance-pack-dubbo-demo/pom.xml | 2 +-
.../acceptance/dubbodemo/DubboDemoStepdefs.java | 2 +-
.../{saga => pack}/acceptance/dubbodemo/RunCucumberIT.java | 2 +-
acceptance-tests/acceptance-pack-spring-demo/pom.xml | 2 +-
.../org/apache/servicecomb/{saga => pack}/PackStepdefs.java | 2 +-
.../org/apache/servicecomb/{saga => pack}/RunCucumberIT.java | 2 +-
acceptance-tests/acceptance-pack-tcc-spring-demo/pom.xml | 2 +-
.../org/apache/servicecomb/{saga => pack}/PackStepdefs.java | 2 +-
.../org/apache/servicecomb/{saga => pack}/RunCucumberIT.java | 2 +-
acceptance-tests/pom.xml | 2 +-
integration-tests/pack-tests/pom.xml | 2 +-
.../integration}/tests/CommandEnvelopeRepository.java | 2 +-
.../pack => pack/integration}/tests/GreetingApplication.java | 4 ++--
.../pack => pack/integration}/tests/GreetingController.java | 2 +-
.../pack => pack/integration}/tests/GreetingService.java | 2 +-
.../integration/pack => pack/integration}/tests/PackIT.java | 12 ++++++------
.../integration}/tests/TxEventEnvelopeRepository.java | 2 +-
17 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml b/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml
index e8d5868..f256fe3 100644
--- a/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml
+++ b/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml
@@ -25,7 +25,7 @@
<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/acceptance-tests/acceptance-pack-dubbo-demo/src/test/java/org/apache/servicecomb/saga/acceptance/dubbodemo/DubboDemoStepdefs.java b/acceptance-tests/acceptance-pack-dubbo-demo/src/test/java/org/apache/servicecomb/pack/acceptance/dubbodemo/DubboDemoStepdefs.java
similarity index 99%
rename from acceptance-tests/acceptance-pack-dubbo-demo/src/test/java/org/apache/servicecomb/saga/acceptance/dubbodemo/DubboDemoStepdefs.java
rename to acceptance-tests/acceptance-pack-dubbo-demo/src/test/java/org/apache/servicecomb/pack/acceptance/dubbodemo/DubboDemoStepdefs.java
index af7b044..810073f 100644
--- a/acceptance-tests/acceptance-pack-dubbo-demo/src/test/java/org/apache/servicecomb/saga/acceptance/dubbodemo/DubboDemoStepdefs.java
+++ b/acceptance-tests/acceptance-pack-dubbo-demo/src/test/java/org/apache/servicecomb/pack/acceptance/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/acceptance-tests/acceptance-pack-dubbo-demo/src/test/java/org/apache/servicecomb/saga/acceptance/dubbodemo/RunCucumberIT.java b/acceptance-tests/acceptance-pack-dubbo-demo/src/test/java/org/apache/servicecomb/pack/acceptance/dubbodemo/RunCucumberIT.java
similarity index 94%
rename from acceptance-tests/acceptance-pack-dubbo-demo/src/test/java/org/apache/servicecomb/saga/acceptance/dubbodemo/RunCucumberIT.java
rename to acceptance-tests/acceptance-pack-dubbo-demo/src/test/java/org/apache/servicecomb/pack/acceptance/dubbodemo/RunCucumberIT.java
index cab33be..d1131b7 100644
--- a/acceptance-tests/acceptance-pack-dubbo-demo/src/test/java/org/apache/servicecomb/saga/acceptance/dubbodemo/RunCucumberIT.java
+++ b/acceptance-tests/acceptance-pack-dubbo-demo/src/test/java/org/apache/servicecomb/pack/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
index 389d10f..e81aab9 100644
--- a/acceptance-tests/acceptance-pack-spring-demo/pom.xml
+++ b/acceptance-tests/acceptance-pack-spring-demo/pom.xml
@@ -27,7 +27,7 @@
<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/acceptance-tests/acceptance-pack-spring-demo/src/test/java/org/apache/servicecomb/saga/PackStepdefs.java b/acceptance-tests/acceptance-pack-spring-demo/src/test/java/org/apache/servicecomb/pack/PackStepdefs.java
similarity index 99%
rename from acceptance-tests/acceptance-pack-spring-demo/src/test/java/org/apache/servicecomb/saga/PackStepdefs.java
rename to acceptance-tests/acceptance-pack-spring-demo/src/test/java/org/apache/servicecomb/pack/PackStepdefs.java
index fd84819..711edd2 100644
--- a/acceptance-tests/acceptance-pack-spring-demo/src/test/java/org/apache/servicecomb/saga/PackStepdefs.java
+++ b/acceptance-tests/acceptance-pack-spring-demo/src/test/java/org/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/acceptance-tests/acceptance-pack-spring-demo/src/test/java/org/apache/servicecomb/saga/RunCucumberIT.java b/acceptance-tests/acceptance-pack-spring-demo/src/test/java/org/apache/servicecomb/pack/RunCucumberIT.java
similarity index 96%
rename from acceptance-tests/acceptance-pack-spring-demo/src/test/java/org/apache/servicecomb/saga/RunCucumberIT.java
rename to acceptance-tests/acceptance-pack-spring-demo/src/test/java/org/apache/servicecomb/pack/RunCucumberIT.java
index d4fc9ee..c8415ce 100644
--- a/acceptance-tests/acceptance-pack-spring-demo/src/test/java/org/apache/servicecomb/saga/RunCucumberIT.java
+++ b/acceptance-tests/acceptance-pack-spring-demo/src/test/java/org/apache/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-tcc-spring-demo/pom.xml b/acceptance-tests/acceptance-pack-tcc-spring-demo/pom.xml
index f752a36..2503b8a 100644
--- a/acceptance-tests/acceptance-pack-tcc-spring-demo/pom.xml
+++ b/acceptance-tests/acceptance-pack-tcc-spring-demo/pom.xml
@@ -27,7 +27,7 @@
<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/acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/java/org/apache/servicecomb/saga/PackStepdefs.java b/acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/java/org/apache/servicecomb/pack/PackStepdefs.java
similarity index 99%
rename from acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/java/org/apache/servicecomb/saga/PackStepdefs.java
rename to acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/java/org/apache/servicecomb/pack/PackStepdefs.java
index 7c56eab..74493e9 100644
--- a/acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/java/org/apache/servicecomb/saga/PackStepdefs.java
+++ b/acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/java/org/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/acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/java/org/apache/servicecomb/saga/RunCucumberIT.java b/acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/java/org/apache/servicecomb/pack/RunCucumberIT.java
similarity index 96%
rename from acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/java/org/apache/servicecomb/saga/RunCucumberIT.java
rename to acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/java/org/apache/servicecomb/pack/RunCucumberIT.java
index d4fc9ee..c8415ce 100644
--- a/acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/java/org/apache/servicecomb/saga/RunCucumberIT.java
+++ b/acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/java/org/apache/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
index 7cd2078..dd3534a 100644
--- a/acceptance-tests/pom.xml
+++ b/acceptance-tests/pom.xml
@@ -27,7 +27,7 @@
<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/integration-tests/pack-tests/pom.xml b/integration-tests/pack-tests/pom.xml
index 2f2ca9c..dc7d1d9 100644
--- a/integration-tests/pack-tests/pom.xml
+++ b/integration-tests/pack-tests/pom.xml
@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>pack-tests</artifactId>
- <name>Pack::Integration Tests::Pack Tests</name>
+ <name>Pack::Integration Tests</name>
<dependencyManagement>
diff --git a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/CommandEnvelopeRepository.java b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/CommandEnvelopeRepository.java
similarity index 94%
rename from integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/CommandEnvelopeRepository.java
rename to integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/CommandEnvelopeRepository.java
index 778665f..b8733d9 100644
--- a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/CommandEnvelopeRepository.java
+++ b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/CommandEnvelopeRepository.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.integration.pack.tests;
+package org.apache.servicecomb.pack.integration.tests;
import org.apache.servicecomb.pack.alpha.core.Command;
import org.springframework.data.repository.CrudRepository;
diff --git a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/GreetingApplication.java b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/GreetingApplication.java
similarity index 92%
rename from integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/GreetingApplication.java
rename to integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/GreetingApplication.java
index 1cbfa8e..7bae0b4 100644
--- a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/GreetingApplication.java
+++ b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/GreetingApplication.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.integration.pack.tests;
+package org.apache.servicecomb.pack.integration.tests;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -28,7 +28,7 @@ import org.springframework.context.annotation.Bean;
@EnableOmega
@SpringBootApplication
-@EntityScan(basePackages = "org.apache.servicecomb.saga.alpha")
+@EntityScan(basePackages = "org.apache.servicecomb.pack.alpha")
public class GreetingApplication {
public static void main(String[] args) {
SpringApplication.run(GreetingApplication.class, args);
diff --git a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/GreetingController.java b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/GreetingController.java
similarity index 98%
rename from integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/GreetingController.java
rename to integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/GreetingController.java
index 27b6938..e4f2612 100644
--- a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/GreetingController.java
+++ b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/GreetingController.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.integration.pack.tests;
+package org.apache.servicecomb.pack.integration.tests;
import org.apache.servicecomb.pack.omega.context.annotations.SagaStart;
import org.apache.servicecomb.pack.omega.transaction.annotations.Compensable;
diff --git a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/GreetingService.java b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/GreetingService.java
similarity index 97%
rename from integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/GreetingService.java
rename to integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/GreetingService.java
index c96c766..07e0d61 100644
--- a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/GreetingService.java
+++ b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/GreetingService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.integration.pack.tests;
+package org.apache.servicecomb.pack.integration.tests;
import java.util.Queue;
diff --git a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/PackIT.java b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/PackIT.java
similarity index 97%
rename from integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/PackIT.java
rename to integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/PackIT.java
index 84eedf9..5422ce2 100644
--- a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/PackIT.java
+++ b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/PackIT.java
@@ -15,10 +15,9 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.integration.pack.tests;
+package org.apache.servicecomb.pack.integration.tests;
import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.apache.servicecomb.saga.integration.pack.tests.GreetingController.TRESPASSER;
import static org.awaitility.Awaitility.await;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
@@ -33,6 +32,7 @@ import java.util.Queue;
import org.apache.servicecomb.pack.alpha.core.TxEvent;
import org.apache.servicecomb.pack.omega.context.OmegaContext;
+import org.hamcrest.Matchers;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -141,7 +141,7 @@ public class PackIT {
public void compensatesFailedGlobalTransaction() throws Exception {
ResponseEntity<String> entity = restTemplate.getForEntity("/greet?name={name}",
String.class,
- TRESPASSER);
+ GreetingController.TRESPASSER);
assertThat(entity.getStatusCode(), is(INTERNAL_SERVER_ERROR));
@@ -178,7 +178,7 @@ public class PackIT {
event = events.get(6);
checkedLastTwoEvents(globalTxId, txStartedEvent1, event);
- assertThat(compensatedMessages, contains("Goodbye, " + TRESPASSER));
+ assertThat(compensatedMessages, Matchers.contains("Goodbye, " + GreetingController.TRESPASSER));
}
private void checkedLastTwoEvents(String globalTxId, TxEvent txStartedEvent1, TxEvent event) {
@@ -285,7 +285,7 @@ public class PackIT {
// retries 3 times and then compensate
ResponseEntity<String> entity = restTemplate.getForEntity("/open?name={name}&retries={retries}",
String.class,
- TRESPASSER,
+ GreetingController.TRESPASSER,
5);
assertThat(entity.getStatusCode(), is(INTERNAL_SERVER_ERROR));
@@ -312,6 +312,6 @@ public class PackIT {
assertThat(events.get(9).type(), is("TxAbortedEvent"));
assertThat(events.get(10).type(), is("TxCompensatedEvent"));
- assertThat(compensatedMessages, contains("Goodbye, " + TRESPASSER));
+ assertThat(compensatedMessages, Matchers.contains("Goodbye, " + GreetingController.TRESPASSER));
}
}
diff --git a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/TxEventEnvelopeRepository.java b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/TxEventEnvelopeRepository.java
similarity index 95%
rename from integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/TxEventEnvelopeRepository.java
rename to integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/TxEventEnvelopeRepository.java
index 432fc63..6484e2f 100644
--- a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/TxEventEnvelopeRepository.java
+++ b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/TxEventEnvelopeRepository.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.integration.pack.tests;
+package org.apache.servicecomb.pack.integration.tests;
import java.util.List;
[servicecomb-pack] 13/13: SCB-976 Renamed the package name of
tcc-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/servicecomb-pack.git
commit a89c7cd8b416c9b281fdbe28644cb6b7e2e78f91
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Mon Dec 17 17:34:15 2018 +0800
SCB-976 Renamed the package name of tcc-spring-demo
---
.../{saga/demo/pack => pack/demo}/inventory/InventoryService.java | 2 +-
.../servicecomb/{saga/demo/pack => pack/demo}/inventory/Product.java | 2 +-
.../{saga/demo/pack => pack/demo}/inventory/ProductController.java | 2 +-
.../{saga/demo/pack => pack/demo}/inventory/ProductDao.java | 2 +-
.../{saga/demo/pack => pack/demo}/inventory/ProductOrder.java | 2 +-
.../demo/pack => pack/demo}/inventory/TccInventoryApplication.java | 2 +-
.../{saga/demo/pack => pack/demo}/inventory/InventoryServiceTest.java | 2 +-
.../demo/pack => pack/demo}/inventory/ProductControllerTest.java | 2 +-
.../org/apache/servicecomb/pack/demo/inventory}/TestApplication.java | 2 +-
.../{saga/demo/pack => pack/demo}/ordering/OrderingController.java | 2 +-
.../demo/pack => pack/demo}/ordering/TccOrderingApplication.java | 2 +-
.../servicecomb/{saga/demo/pack => pack/demo}/payment/Account.java | 2 +-
.../servicecomb/{saga/demo/pack => pack/demo}/payment/AccountDao.java | 2 +-
.../servicecomb/{saga/demo/pack => pack/demo}/payment/Payment.java | 2 +-
.../{saga/demo/pack => pack/demo}/payment/PaymentController.java | 4 +---
.../{saga/demo/pack => pack/demo}/payment/PaymentService.java | 2 +-
.../{saga/demo/pack => pack/demo}/payment/TccPaymentApplication.java | 2 +-
.../{saga/demo/pack => pack/demo}/payment/PaymentControllerTest.java | 2 +-
.../{saga/demo/pack => pack/demo}/payment/PaymentServiceTest.java | 2 +-
.../org/apache/servicecomb/pack/demo/payment}/TestApplication.java | 2 +-
20 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/InventoryService.java b/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/pack/demo/inventory/InventoryService.java
similarity index 97%
rename from demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/InventoryService.java
rename to demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/pack/demo/inventory/InventoryService.java
index d4d057b..8b5fcaf 100644
--- a/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/InventoryService.java
+++ b/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/pack/demo/inventory/InventoryService.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.pack.inventory;
+package org.apache.servicecomb.pack.demo.inventory;
import java.util.Collection;
import java.util.Map;
diff --git a/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/Product.java b/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/pack/demo/inventory/Product.java
similarity index 96%
rename from demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/Product.java
rename to demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/pack/demo/inventory/Product.java
index d8804f5..c6aba5a 100644
--- a/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/Product.java
+++ b/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/pack/demo/inventory/Product.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.pack.inventory;
+package org.apache.servicecomb.pack.demo.inventory;
import java.io.Serializable;
import javax.persistence.Entity;
diff --git a/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/ProductController.java b/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/pack/demo/inventory/ProductController.java
similarity index 97%
rename from demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/ProductController.java
rename to demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/pack/demo/inventory/ProductController.java
index e55ca52..fbcadbe 100644
--- a/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/ProductController.java
+++ b/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/pack/demo/inventory/ProductController.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.pack.inventory;
+package org.apache.servicecomb.pack.demo.inventory;
import java.util.ArrayList;
import java.util.List;
diff --git a/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/ProductDao.java b/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/pack/demo/inventory/ProductDao.java
similarity index 95%
rename from demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/ProductDao.java
rename to demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/pack/demo/inventory/ProductDao.java
index 7a93664..a74fe5a 100644
--- a/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/ProductDao.java
+++ b/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/pack/demo/inventory/ProductDao.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.pack.inventory;
+package org.apache.servicecomb.pack.demo.inventory;
import org.springframework.data.jpa.repository.JpaRepository;
diff --git a/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/ProductOrder.java b/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/pack/demo/inventory/ProductOrder.java
similarity index 97%
rename from demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/ProductOrder.java
rename to demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/pack/demo/inventory/ProductOrder.java
index 5ef6863..e6d37f7 100644
--- a/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/ProductOrder.java
+++ b/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/pack/demo/inventory/ProductOrder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.pack.inventory;
+package org.apache.servicecomb.pack.demo.inventory;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
diff --git a/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/TccInventoryApplication.java b/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/pack/demo/inventory/TccInventoryApplication.java
similarity index 96%
rename from demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/TccInventoryApplication.java
rename to demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/pack/demo/inventory/TccInventoryApplication.java
index 64afe30..1c9b9d8 100644
--- a/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/saga/demo/pack/inventory/TccInventoryApplication.java
+++ b/demo/tcc-spring-demo/inventory/src/main/java/org/apache/servicecomb/pack/demo/inventory/TccInventoryApplication.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.pack.inventory;
+package org.apache.servicecomb.pack.demo.inventory;
import org.apache.servicecomb.pack.omega.spring.EnableOmega;
import org.springframework.boot.CommandLineRunner;
diff --git a/demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/saga/demo/pack/inventory/InventoryServiceTest.java b/demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/pack/demo/inventory/InventoryServiceTest.java
similarity index 98%
rename from demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/saga/demo/pack/inventory/InventoryServiceTest.java
rename to demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/pack/demo/inventory/InventoryServiceTest.java
index 1f49734..2962992 100644
--- a/demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/saga/demo/pack/inventory/InventoryServiceTest.java
+++ b/demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/pack/demo/inventory/InventoryServiceTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.pack.inventory;
+package org.apache.servicecomb.pack.demo.inventory;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
diff --git a/demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/saga/demo/pack/inventory/ProductControllerTest.java b/demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/pack/demo/inventory/ProductControllerTest.java
similarity index 98%
rename from demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/saga/demo/pack/inventory/ProductControllerTest.java
rename to demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/pack/demo/inventory/ProductControllerTest.java
index 6490ad9..c8441cf 100644
--- a/demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/saga/demo/pack/inventory/ProductControllerTest.java
+++ b/demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/pack/demo/inventory/ProductControllerTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.pack.inventory;
+package org.apache.servicecomb.pack.demo.inventory;
import static java.util.Collections.singletonList;
import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
diff --git a/demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/saga/demo/pack/payment/TestApplication.java b/demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/pack/demo/inventory/TestApplication.java
similarity index 94%
rename from demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/saga/demo/pack/payment/TestApplication.java
rename to demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/pack/demo/inventory/TestApplication.java
index 13803a0..55469f5 100644
--- a/demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/saga/demo/pack/payment/TestApplication.java
+++ b/demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/pack/demo/inventory/TestApplication.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.pack.payment;
+package org.apache.servicecomb.pack.demo.inventory;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/saga/demo/pack/ordering/OrderingController.java b/demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/pack/demo/ordering/OrderingController.java
similarity index 97%
rename from demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/saga/demo/pack/ordering/OrderingController.java
rename to demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/pack/demo/ordering/OrderingController.java
index c5e9ea6..1deb792 100644
--- a/demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/saga/demo/pack/ordering/OrderingController.java
+++ b/demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/pack/demo/ordering/OrderingController.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.pack.ordering;
+package org.apache.servicecomb.pack.demo.ordering;
import org.apache.servicecomb.pack.omega.context.annotations.TccStart;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/saga/demo/pack/ordering/TccOrderingApplication.java b/demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/pack/demo/ordering/TccOrderingApplication.java
similarity index 95%
rename from demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/saga/demo/pack/ordering/TccOrderingApplication.java
rename to demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/pack/demo/ordering/TccOrderingApplication.java
index f482e42..7d42c8c 100644
--- a/demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/saga/demo/pack/ordering/TccOrderingApplication.java
+++ b/demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/pack/demo/ordering/TccOrderingApplication.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.pack.ordering;
+package org.apache.servicecomb.pack.demo.ordering;
import org.apache.servicecomb.pack.omega.spring.EnableOmega;
import org.springframework.boot.SpringApplication;
diff --git a/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/Account.java b/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/pack/demo/payment/Account.java
similarity index 97%
rename from demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/Account.java
rename to demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/pack/demo/payment/Account.java
index 3e9b21a..30aef63 100644
--- a/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/Account.java
+++ b/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/pack/demo/payment/Account.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.pack.payment;
+package org.apache.servicecomb.pack.demo.payment;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
diff --git a/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/AccountDao.java b/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/pack/demo/payment/AccountDao.java
similarity index 95%
rename from demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/AccountDao.java
rename to demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/pack/demo/payment/AccountDao.java
index a5efc08..d2569ee 100644
--- a/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/AccountDao.java
+++ b/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/pack/demo/payment/AccountDao.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.pack.payment;
+package org.apache.servicecomb.pack.demo.payment;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
diff --git a/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/Payment.java b/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/pack/demo/payment/Payment.java
similarity index 97%
rename from demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/Payment.java
rename to demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/pack/demo/payment/Payment.java
index 17f31f9..5605810 100644
--- a/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/Payment.java
+++ b/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/pack/demo/payment/Payment.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.pack.payment;
+package org.apache.servicecomb.pack.demo.payment;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
diff --git a/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentController.java b/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/pack/demo/payment/PaymentController.java
similarity index 92%
rename from demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentController.java
rename to demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/pack/demo/payment/PaymentController.java
index 3f74ed5..45a0dbb 100644
--- a/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentController.java
+++ b/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/pack/demo/payment/PaymentController.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.pack.payment;
+package org.apache.servicecomb.pack.demo.payment;
import java.util.ArrayList;
import java.util.List;
@@ -22,12 +22,10 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@Controller
diff --git a/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentService.java b/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/pack/demo/payment/PaymentService.java
similarity index 98%
rename from demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentService.java
rename to demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/pack/demo/payment/PaymentService.java
index 2fb1ec2..33024c2 100644
--- a/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentService.java
+++ b/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/pack/demo/payment/PaymentService.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.pack.payment;
+package org.apache.servicecomb.pack.demo.payment;
import java.util.Collection;
import java.util.Map;
diff --git a/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/TccPaymentApplication.java b/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/pack/demo/payment/TccPaymentApplication.java
similarity index 96%
rename from demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/TccPaymentApplication.java
rename to demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/pack/demo/payment/TccPaymentApplication.java
index fa5720b..f66af54 100644
--- a/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/saga/demo/pack/payment/TccPaymentApplication.java
+++ b/demo/tcc-spring-demo/payment/src/main/java/org/apache/servicecomb/pack/demo/payment/TccPaymentApplication.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.pack.payment;
+package org.apache.servicecomb.pack.demo.payment;
import org.apache.servicecomb.pack.omega.spring.EnableOmega;
import org.springframework.boot.CommandLineRunner;
diff --git a/demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentControllerTest.java b/demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/pack/demo/payment/PaymentControllerTest.java
similarity index 98%
rename from demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentControllerTest.java
rename to demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/pack/demo/payment/PaymentControllerTest.java
index eb8b158..6e102e2 100644
--- a/demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentControllerTest.java
+++ b/demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/pack/demo/payment/PaymentControllerTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.pack.payment;
+package org.apache.servicecomb.pack.demo.payment;
import static java.util.Collections.singletonList;
import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
diff --git a/demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentServiceTest.java b/demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/pack/demo/payment/PaymentServiceTest.java
similarity index 98%
rename from demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentServiceTest.java
rename to demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/pack/demo/payment/PaymentServiceTest.java
index 9807aa1..3634ed0 100644
--- a/demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/saga/demo/pack/payment/PaymentServiceTest.java
+++ b/demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/pack/demo/payment/PaymentServiceTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.pack.payment;
+package org.apache.servicecomb.pack.demo.payment;
import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/saga/demo/pack/inventory/TestApplication.java b/demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/pack/demo/payment/TestApplication.java
similarity index 94%
rename from demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/saga/demo/pack/inventory/TestApplication.java
rename to demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/pack/demo/payment/TestApplication.java
index 7a28136..3596381 100644
--- a/demo/tcc-spring-demo/inventory/src/test/java/org/apache/servicecomb/saga/demo/pack/inventory/TestApplication.java
+++ b/demo/tcc-spring-demo/payment/src/test/java/org/apache/servicecomb/pack/demo/payment/TestApplication.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.pack.inventory;
+package org.apache.servicecomb.pack.demo.payment;
import org.springframework.boot.autoconfigure.SpringBootApplication;
[servicecomb-pack] 07/13: SCB-976 Renamed the grpc package name
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/servicecomb-pack.git
commit 7a680810ab06bc053459ebee685b2055013a55b8
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Fri Dec 14 14:14:04 2018 +0800
SCB-976 Renamed the grpc package name
---
.../saga/alpha/server/GrpcOmegaCallback.java | 2 +-
.../saga/alpha/server/GrpcTxEventEndpointImpl.java | 10 +++++-----
.../saga/alpha/server/tcc/GrpcTccEventService.java | 16 ++++++++--------
.../server/tcc/callback/GrpcOmegaTccCallback.java | 2 +-
.../server/tcc/callback/OmegaCallbacksRegistry.java | 4 ++--
.../saga/alpha/server/tcc/jpa/EventConverter.java | 8 ++++----
.../saga/alpha/server/AlphaIntegrationTest.java | 14 +++++++-------
.../alpha/server/tcc/AlphaTccServerTestBase.java | 20 ++++++++++----------
.../saga/alpha/server/tcc/TccCallbackEngineTest.java | 2 +-
.../tcc/TccCoordinateCommandStreamObserver.java | 2 +-
.../server/tcc/service/TccTxEventServiceTest.java | 4 ++--
.../grpc/saga/GrpcCompensateStreamObserver.java | 2 +-
.../grpc/saga/GrpcSagaClientMessageSender.java | 14 +++++++-------
.../grpc/tcc/GrpcCoordinateStreamObserver.java | 2 +-
.../grpc/tcc/GrpcTccClientMessageSender.java | 18 +++++++++---------
.../grpc/saga/SagaLoadBalancedSenderTestBase.java | 10 +++++-----
.../grpc/tcc/GrpcTccClientMessageSenderTest.java | 16 ++++++++--------
.../connector/grpc/tcc/MyTccEventServiceImpl.java | 16 ++++++++--------
.../connector/grpc/tcc/TccLoadBalanceSenderTest.java | 2 +-
.../src/main/proto/GrpcCommon.proto | 2 +-
.../src/main/proto/GrpcTccEvent.proto | 2 +-
.../src/main/proto/GrpcTxEvent.proto | 2 +-
22 files changed, 85 insertions(+), 85 deletions(-)
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcOmegaCallback.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcOmegaCallback.java
index a54fa66..c477e41 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcOmegaCallback.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcOmegaCallback.java
@@ -22,7 +22,7 @@ package org.apache.servicecomb.saga.alpha.server;
import org.apache.servicecomb.saga.alpha.core.OmegaCallback;
import org.apache.servicecomb.saga.alpha.core.TxEvent;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcCompensateCommand;
+import org.apache.servicecomb.pack.contract.grpc.GrpcCompensateCommand;
import com.google.protobuf.ByteString;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcTxEventEndpointImpl.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcTxEventEndpointImpl.java
index 677fa87..72a72f1 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcTxEventEndpointImpl.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcTxEventEndpointImpl.java
@@ -31,11 +31,11 @@ import kamon.annotation.Trace;
import org.apache.servicecomb.saga.alpha.core.OmegaCallback;
import org.apache.servicecomb.saga.alpha.core.TxConsistentService;
import org.apache.servicecomb.saga.alpha.core.TxEvent;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcAck;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcCompensateCommand;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcServiceConfig;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTxEvent;
-import org.apache.servicecomb.saga.pack.contract.grpc.TxEventServiceGrpc.TxEventServiceImplBase;
+import org.apache.servicecomb.pack.contract.grpc.GrpcAck;
+import org.apache.servicecomb.pack.contract.grpc.GrpcCompensateCommand;
+import org.apache.servicecomb.pack.contract.grpc.GrpcServiceConfig;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTxEvent;
+import org.apache.servicecomb.pack.contract.grpc.TxEventServiceGrpc.TxEventServiceImplBase;
import io.grpc.stub.StreamObserver;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/GrpcTccEventService.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/GrpcTccEventService.java
index 9c8840c..d2e555e 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/GrpcTccEventService.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/GrpcTccEventService.java
@@ -23,14 +23,14 @@ import org.apache.servicecomb.saga.alpha.server.tcc.callback.OmegaCallback;
import org.apache.servicecomb.saga.alpha.server.tcc.callback.OmegaCallbacksRegistry;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.EventConverter;
import org.apache.servicecomb.saga.alpha.server.tcc.service.TccTxEventService;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcAck;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcServiceConfig;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccCoordinateCommand;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccCoordinatedEvent;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccParticipatedEvent;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccTransactionEndedEvent;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccTransactionStartedEvent;
-import org.apache.servicecomb.saga.pack.contract.grpc.TccEventServiceGrpc;
+import org.apache.servicecomb.pack.contract.grpc.GrpcAck;
+import org.apache.servicecomb.pack.contract.grpc.GrpcServiceConfig;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTccCoordinateCommand;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTccCoordinatedEvent;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTccParticipatedEvent;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTccTransactionEndedEvent;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTccTransactionStartedEvent;
+import org.apache.servicecomb.pack.contract.grpc.TccEventServiceGrpc;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/GrpcOmegaTccCallback.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/GrpcOmegaTccCallback.java
index 7113136..e155c71 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/GrpcOmegaTccCallback.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/GrpcOmegaTccCallback.java
@@ -20,7 +20,7 @@ package org.apache.servicecomb.saga.alpha.server.tcc.callback;
import io.grpc.stub.StreamObserver;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.ParticipatedEvent;
import org.apache.servicecomb.pack.common.TransactionStatus;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccCoordinateCommand;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTccCoordinateCommand;
/**
* Grpc omega callback for TCC workflow.
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/OmegaCallbacksRegistry.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/OmegaCallbacksRegistry.java
index 3b87e7d..bf8bc21 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/OmegaCallbacksRegistry.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/OmegaCallbacksRegistry.java
@@ -26,8 +26,8 @@ import java.util.concurrent.ConcurrentHashMap;
import org.apache.servicecomb.saga.alpha.core.AlphaException;
import org.apache.servicecomb.saga.alpha.server.tcc.callback.GrpcOmegaTccCallback;
import org.apache.servicecomb.saga.alpha.server.tcc.callback.OmegaCallback;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcServiceConfig;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccCoordinateCommand;
+import org.apache.servicecomb.pack.contract.grpc.GrpcServiceConfig;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTccCoordinateCommand;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/EventConverter.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/EventConverter.java
index ac54baa..d8cd0d4 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/EventConverter.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/jpa/EventConverter.java
@@ -18,10 +18,10 @@
package org.apache.servicecomb.saga.alpha.server.tcc.jpa;
import org.apache.servicecomb.pack.common.TransactionStatus;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccCoordinatedEvent;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccParticipatedEvent;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccTransactionEndedEvent;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccTransactionStartedEvent;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTccCoordinatedEvent;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTccParticipatedEvent;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTccTransactionEndedEvent;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTccTransactionStartedEvent;
public class EventConverter {
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/AlphaIntegrationTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/AlphaIntegrationTest.java
index 001c423..04c51df 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/AlphaIntegrationTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/AlphaIntegrationTest.java
@@ -53,13 +53,13 @@ import org.apache.servicecomb.saga.alpha.core.TxEventRepository;
import org.apache.servicecomb.saga.alpha.core.TxTimeout;
import org.apache.servicecomb.saga.alpha.core.TxTimeoutRepository;
import org.apache.servicecomb.pack.common.EventType;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcAck;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcCompensateCommand;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcServiceConfig;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTxEvent;
-import org.apache.servicecomb.saga.pack.contract.grpc.TxEventServiceGrpc;
-import org.apache.servicecomb.saga.pack.contract.grpc.TxEventServiceGrpc.TxEventServiceBlockingStub;
-import org.apache.servicecomb.saga.pack.contract.grpc.TxEventServiceGrpc.TxEventServiceStub;
+import org.apache.servicecomb.pack.contract.grpc.GrpcAck;
+import org.apache.servicecomb.pack.contract.grpc.GrpcCompensateCommand;
+import org.apache.servicecomb.pack.contract.grpc.GrpcServiceConfig;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTxEvent;
+import org.apache.servicecomb.pack.contract.grpc.TxEventServiceGrpc;
+import org.apache.servicecomb.pack.contract.grpc.TxEventServiceGrpc.TxEventServiceBlockingStub;
+import org.apache.servicecomb.pack.contract.grpc.TxEventServiceGrpc.TxEventServiceStub;
import org.hamcrest.core.Is;
import org.junit.After;
import org.junit.AfterClass;
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/AlphaTccServerTestBase.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/AlphaTccServerTestBase.java
index c41dec1..dc41182 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/AlphaTccServerTestBase.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/AlphaTccServerTestBase.java
@@ -39,16 +39,16 @@ import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxType;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.EventConverter;
import org.apache.servicecomb.saga.alpha.server.tcc.service.TccTxEventRepository;
import org.apache.servicecomb.pack.common.TransactionStatus;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcAck;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcServiceConfig;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccCoordinateCommand;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccCoordinatedEvent;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccParticipatedEvent;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccTransactionEndedEvent;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccTransactionStartedEvent;
-import org.apache.servicecomb.saga.pack.contract.grpc.TccEventServiceGrpc;
-import org.apache.servicecomb.saga.pack.contract.grpc.TccEventServiceGrpc.TccEventServiceBlockingStub;
-import org.apache.servicecomb.saga.pack.contract.grpc.TccEventServiceGrpc.TccEventServiceStub;
+import org.apache.servicecomb.pack.contract.grpc.GrpcAck;
+import org.apache.servicecomb.pack.contract.grpc.GrpcServiceConfig;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTccCoordinateCommand;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTccCoordinatedEvent;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTccParticipatedEvent;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTccTransactionEndedEvent;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTccTransactionStartedEvent;
+import org.apache.servicecomb.pack.contract.grpc.TccEventServiceGrpc;
+import org.apache.servicecomb.pack.contract.grpc.TccEventServiceGrpc.TccEventServiceBlockingStub;
+import org.apache.servicecomb.pack.contract.grpc.TccEventServiceGrpc.TccEventServiceStub;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Test;
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccCallbackEngineTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccCallbackEngineTest.java
index 0ba428b..c4f51b0 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccCallbackEngineTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccCallbackEngineTest.java
@@ -34,7 +34,7 @@ import org.apache.servicecomb.saga.alpha.server.tcc.jpa.ParticipatedEvent;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxType;
import org.apache.servicecomb.saga.alpha.server.tcc.service.TccTxEventService;
import org.apache.servicecomb.pack.common.TransactionStatus;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcServiceConfig;
+import org.apache.servicecomb.pack.contract.grpc.GrpcServiceConfig;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccCoordinateCommandStreamObserver.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccCoordinateCommandStreamObserver.java
index 5c4143a..22e687e 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccCoordinateCommandStreamObserver.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccCoordinateCommandStreamObserver.java
@@ -20,7 +20,7 @@ package org.apache.servicecomb.saga.alpha.server.tcc;
import io.grpc.stub.StreamObserver;
import java.util.Queue;
import java.util.function.Consumer;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccCoordinateCommand;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTccCoordinateCommand;
public class TccCoordinateCommandStreamObserver implements StreamObserver<GrpcTccCoordinateCommand> {
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventServiceTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventServiceTest.java
index 5fe970d..5ece6e4 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventServiceTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventServiceTest.java
@@ -39,8 +39,8 @@ import org.apache.servicecomb.saga.alpha.server.tcc.jpa.ParticipatedEventReposit
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxEvent;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxType;
import org.apache.servicecomb.pack.common.TransactionStatus;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcServiceConfig;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccCoordinateCommand;
+import org.apache.servicecomb.pack.contract.grpc.GrpcServiceConfig;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTccCoordinateCommand;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/GrpcCompensateStreamObserver.java b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/GrpcCompensateStreamObserver.java
index cdaec10..9b227a5 100644
--- a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/GrpcCompensateStreamObserver.java
+++ b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/GrpcCompensateStreamObserver.java
@@ -24,7 +24,7 @@ import org.apache.servicecomb.saga.omega.connector.grpc.core.ReconnectStreamObse
import org.apache.servicecomb.saga.omega.transaction.MessageDeserializer;
import org.apache.servicecomb.saga.omega.transaction.MessageHandler;
import org.apache.servicecomb.saga.omega.transaction.MessageSender;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcCompensateCommand;
+import org.apache.servicecomb.pack.contract.grpc.GrpcCompensateCommand;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/GrpcSagaClientMessageSender.java b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/GrpcSagaClientMessageSender.java
index 5770920..98c3772 100644
--- a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/GrpcSagaClientMessageSender.java
+++ b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/GrpcSagaClientMessageSender.java
@@ -27,13 +27,13 @@ import org.apache.servicecomb.saga.omega.transaction.MessageHandler;
import org.apache.servicecomb.saga.omega.transaction.MessageSerializer;
import org.apache.servicecomb.saga.omega.transaction.SagaMessageSender;
import org.apache.servicecomb.saga.omega.transaction.TxEvent;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcAck;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcServiceConfig;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTxEvent;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTxEvent.Builder;
-import org.apache.servicecomb.saga.pack.contract.grpc.TxEventServiceGrpc;
-import org.apache.servicecomb.saga.pack.contract.grpc.TxEventServiceGrpc.TxEventServiceBlockingStub;
-import org.apache.servicecomb.saga.pack.contract.grpc.TxEventServiceGrpc.TxEventServiceStub;
+import org.apache.servicecomb.pack.contract.grpc.GrpcAck;
+import org.apache.servicecomb.pack.contract.grpc.GrpcServiceConfig;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTxEvent;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTxEvent.Builder;
+import org.apache.servicecomb.pack.contract.grpc.TxEventServiceGrpc;
+import org.apache.servicecomb.pack.contract.grpc.TxEventServiceGrpc.TxEventServiceBlockingStub;
+import org.apache.servicecomb.pack.contract.grpc.TxEventServiceGrpc.TxEventServiceStub;
public class GrpcSagaClientMessageSender implements SagaMessageSender {
private final String target;
diff --git a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/GrpcCoordinateStreamObserver.java b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/GrpcCoordinateStreamObserver.java
index e2aec97..8cc8c49 100644
--- a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/GrpcCoordinateStreamObserver.java
+++ b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/GrpcCoordinateStreamObserver.java
@@ -22,7 +22,7 @@ import org.apache.servicecomb.saga.omega.connector.grpc.core.LoadBalanceContext;
import org.apache.servicecomb.saga.omega.connector.grpc.core.ReconnectStreamObserver;
import org.apache.servicecomb.saga.omega.transaction.MessageSender;
import org.apache.servicecomb.saga.omega.transaction.tcc.TccMessageHandler;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccCoordinateCommand;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTccCoordinateCommand;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/GrpcTccClientMessageSender.java b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/GrpcTccClientMessageSender.java
index c0020f0..4ea4b9f 100644
--- a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/GrpcTccClientMessageSender.java
+++ b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/GrpcTccClientMessageSender.java
@@ -27,15 +27,15 @@ import org.apache.servicecomb.saga.omega.transaction.tcc.events.CoordinatedEvent
import org.apache.servicecomb.saga.omega.transaction.tcc.events.ParticipatedEvent;
import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccEndedEvent;
import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccStartedEvent;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcAck;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcServiceConfig;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccCoordinatedEvent;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccParticipatedEvent;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccTransactionEndedEvent;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccTransactionStartedEvent;
-import org.apache.servicecomb.saga.pack.contract.grpc.TccEventServiceGrpc;
-import org.apache.servicecomb.saga.pack.contract.grpc.TccEventServiceGrpc.TccEventServiceBlockingStub;
-import org.apache.servicecomb.saga.pack.contract.grpc.TccEventServiceGrpc.TccEventServiceStub;
+import org.apache.servicecomb.pack.contract.grpc.GrpcAck;
+import org.apache.servicecomb.pack.contract.grpc.GrpcServiceConfig;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTccCoordinatedEvent;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTccParticipatedEvent;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTccTransactionEndedEvent;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTccTransactionStartedEvent;
+import org.apache.servicecomb.pack.contract.grpc.TccEventServiceGrpc;
+import org.apache.servicecomb.pack.contract.grpc.TccEventServiceGrpc.TccEventServiceBlockingStub;
+import org.apache.servicecomb.pack.contract.grpc.TccEventServiceGrpc.TccEventServiceStub;
public class GrpcTccClientMessageSender implements TccMessageSender {
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalancedSenderTestBase.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalancedSenderTestBase.java
index 376e59f..ad936b2 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalancedSenderTestBase.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalancedSenderTestBase.java
@@ -32,11 +32,11 @@ import org.apache.servicecomb.saga.omega.transaction.MessageDeserializer;
import org.apache.servicecomb.saga.omega.transaction.MessageHandler;
import org.apache.servicecomb.saga.omega.transaction.MessageSerializer;
import org.apache.servicecomb.saga.omega.transaction.TxEvent;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcAck;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcCompensateCommand;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcServiceConfig;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTxEvent;
-import org.apache.servicecomb.saga.pack.contract.grpc.TxEventServiceGrpc.TxEventServiceImplBase;
+import org.apache.servicecomb.pack.contract.grpc.GrpcAck;
+import org.apache.servicecomb.pack.contract.grpc.GrpcCompensateCommand;
+import org.apache.servicecomb.pack.contract.grpc.GrpcServiceConfig;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTxEvent;
+import org.apache.servicecomb.pack.contract.grpc.TxEventServiceGrpc.TxEventServiceImplBase;
import org.junit.After;
import org.junit.AfterClass;
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/GrpcTccClientMessageSenderTest.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/GrpcTccClientMessageSenderTest.java
index a6cbcf3..0bea0c3 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/GrpcTccClientMessageSenderTest.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/GrpcTccClientMessageSenderTest.java
@@ -31,14 +31,14 @@ import org.apache.servicecomb.saga.omega.transaction.tcc.events.CoordinatedEvent
import org.apache.servicecomb.saga.omega.transaction.tcc.events.ParticipatedEvent;
import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccEndedEvent;
import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccStartedEvent;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcAck;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcServiceConfig;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccCoordinateCommand;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccCoordinatedEvent;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccParticipatedEvent;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccTransactionEndedEvent;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccTransactionStartedEvent;
-import org.apache.servicecomb.saga.pack.contract.grpc.TccEventServiceGrpc.TccEventServiceImplBase;
+import org.apache.servicecomb.pack.contract.grpc.GrpcAck;
+import org.apache.servicecomb.pack.contract.grpc.GrpcServiceConfig;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTccCoordinateCommand;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTccCoordinatedEvent;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTccParticipatedEvent;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTccTransactionEndedEvent;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTccTransactionStartedEvent;
+import org.apache.servicecomb.pack.contract.grpc.TccEventServiceGrpc.TccEventServiceImplBase;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/MyTccEventServiceImpl.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/MyTccEventServiceImpl.java
index f2e10cb..2c64e5a 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/MyTccEventServiceImpl.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/MyTccEventServiceImpl.java
@@ -22,14 +22,14 @@ import static org.junit.Assert.fail;
import io.grpc.stub.StreamObserver;
import java.lang.invoke.MethodHandles;
import java.util.Queue;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcAck;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcServiceConfig;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccCoordinateCommand;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccCoordinatedEvent;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccParticipatedEvent;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccTransactionEndedEvent;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccTransactionStartedEvent;
-import org.apache.servicecomb.saga.pack.contract.grpc.TccEventServiceGrpc;
+import org.apache.servicecomb.pack.contract.grpc.GrpcAck;
+import org.apache.servicecomb.pack.contract.grpc.GrpcServiceConfig;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTccCoordinateCommand;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTccCoordinatedEvent;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTccParticipatedEvent;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTccTransactionEndedEvent;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTccTransactionStartedEvent;
+import org.apache.servicecomb.pack.contract.grpc.TccEventServiceGrpc;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java
index 00d6af2..06a4653 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java
@@ -60,7 +60,7 @@ import org.apache.servicecomb.saga.omega.transaction.tcc.events.CoordinatedEvent
import org.apache.servicecomb.saga.omega.transaction.tcc.events.ParticipatedEvent;
import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccEndedEvent;
import org.apache.servicecomb.saga.omega.transaction.tcc.events.TccStartedEvent;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccParticipatedEvent;
+import org.apache.servicecomb.pack.contract.grpc.GrpcTccParticipatedEvent;
import org.hamcrest.core.Is;
import org.junit.After;
import org.junit.AfterClass;
diff --git a/pack-contracts/pack-contract-grpc/src/main/proto/GrpcCommon.proto b/pack-contracts/pack-contract-grpc/src/main/proto/GrpcCommon.proto
index 40a8db7..07177ef 100644
--- a/pack-contracts/pack-contract-grpc/src/main/proto/GrpcCommon.proto
+++ b/pack-contracts/pack-contract-grpc/src/main/proto/GrpcCommon.proto
@@ -18,7 +18,7 @@
syntax = "proto3";
option java_multiple_files = true;
-option java_package = "org.apache.servicecomb.saga.pack.contract.grpc";
+option java_package = "org.apache.servicecomb.pack.contract.grpc";
// Define the common structs which could be use for TccEventService and SagaEventService
diff --git a/pack-contracts/pack-contract-grpc/src/main/proto/GrpcTccEvent.proto b/pack-contracts/pack-contract-grpc/src/main/proto/GrpcTccEvent.proto
index 7977b7a..20edad4 100644
--- a/pack-contracts/pack-contract-grpc/src/main/proto/GrpcTccEvent.proto
+++ b/pack-contracts/pack-contract-grpc/src/main/proto/GrpcTccEvent.proto
@@ -18,7 +18,7 @@
syntax = "proto3";
option java_multiple_files = true;
-option java_package = "org.apache.servicecomb.saga.pack.contract.grpc";
+option java_package = "org.apache.servicecomb.pack.contract.grpc";
option java_outer_classname = "TccEventProto";
import "GrpcCommon.proto";
diff --git a/pack-contracts/pack-contract-grpc/src/main/proto/GrpcTxEvent.proto b/pack-contracts/pack-contract-grpc/src/main/proto/GrpcTxEvent.proto
index f037b4f..7c7764e 100644
--- a/pack-contracts/pack-contract-grpc/src/main/proto/GrpcTxEvent.proto
+++ b/pack-contracts/pack-contract-grpc/src/main/proto/GrpcTxEvent.proto
@@ -18,7 +18,7 @@
syntax = "proto3";
option java_multiple_files = true;
-option java_package = "org.apache.servicecomb.saga.pack.contract.grpc";
+option java_package = "org.apache.servicecomb.pack.contract.grpc";
option java_outer_classname = "TxEventProto";
import "GrpcCommon.proto";
[servicecomb-pack] 12/13: SCB-976 Tried to fix the travis build
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/servicecomb-pack.git
commit 04e1e655421fc1fa34cc3ed08693c3195236dca2
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Sat Dec 15 23:01:41 2018 +0800
SCB-976 Tried to fix the travis build
---
scripts/test.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/test.sh b/scripts/test.sh
index 1949891..46fe4f9 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -23,6 +23,6 @@ then
else
echo "Running the unit tests and integration tests here!"
mvn clean install -Pjacoco -Pdocker -P${SPRING_BOOT_PROFILE} coveralls:report
- mvn clean verify -f saga-demo -Pdemo -Pdocker -P${SPRING_BOOT_PROFILE} -Ddocker.useColor=false -Ddocker.showLogs
+ mvn clean verify -f demo -Pdemo -Pdocker -P${SPRING_BOOT_PROFILE} -Ddocker.useColor=false -Ddocker.showLogs
mvn clean verify -f acceptance-tests -Pdemo -Pdocker -P${SPRING_BOOT_PROFILE} -Ddocker.useColor=false -Ddocker.showLogs
fi
[servicecomb-pack] 11/13: SCB-976 Updated the package names of 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/servicecomb-pack.git
commit b56f7e0797f20ed3375f0d8e4fe6a1b4ac89acbe
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Fri Dec 14 16:41:49 2018 +0800
SCB-976 Updated the package names of demo
---
.../src/test/resources/booking_exception.btm | 2 +-
.../src/test/resources/booking_timeout.btm | 4 ++--
.../servicecomb/{saga => pack}/demo/dubbo/api/IService.java | 4 ++--
.../servicecomb/{saga => pack}/demo/dubbo/api/IServiceA.java | 2 +-
.../servicecomb/{saga => pack}/demo/dubbo/api/IServiceB.java | 2 +-
.../servicecomb/{saga => pack}/demo/dubbo/api/IServiceC.java | 2 +-
.../{saga => pack}/demo/dubbo/pub/AbsService.java | 2 +-
.../{saga => pack}/demo/dubbo/pub/IInvokeCode.java | 2 +-
.../{saga => pack}/demo/dubbo/pub/InvokeContext.java | 2 +-
.../servicecomb/{saga => pack}/demo/dubbo/pub/ServiceVO.java | 2 +-
.../{saga => pack}/demo/dubbo/servicea/ApplicationA.java | 2 +-
.../{saga => pack}/demo/dubbo/servicea/ServiceA.java | 12 ++++++------
.../demo/dubbo/servicea/web/DubboDemoController.java | 11 +++++------
.../demo/dubbo/servicea/web/MvcConfigurer.java | 4 ++--
.../servicea/src/main/resources/dubbo-context.xml | 10 +++++-----
.../{saga => pack}/demo/dubbo/serviceb/ApplicationB.java | 2 +-
.../{saga => pack}/demo/dubbo/serviceb/ServiceB.java | 10 +++++-----
.../serviceb/src/main/resources/dubbo-context.xml | 8 ++++----
.../{saga => pack}/demo/dubbo/servicec/ApplicationC.java | 2 +-
.../{saga => pack}/demo/dubbo/servicec/ServiceC.java | 8 ++++----
.../servicec/src/main/resources/dubbo-context.xml | 6 +++---
.../{saga => pack}/demo/scb/booking/BookingApplication.java | 2 +-
.../{saga => pack}/demo/scb/booking/BookingController.java | 2 +-
.../{saga => pack}/demo/scb/car/CarApplication.java | 2 +-
.../servicecomb/{saga => pack}/demo/scb/car/CarBooking.java | 2 +-
.../{saga => pack}/demo/scb/car/CarBookingController.java | 2 +-
.../{saga => pack}/demo/scb/car/CarBookingService.java | 2 +-
.../{saga => pack}/demo/scb/hotel/HotelApplication.java | 2 +-
.../{saga => pack}/demo/scb/hotel/HotelBooking.java | 2 +-
.../demo/scb/hotel/HotelBookingController.java | 2 +-
.../{saga => pack}/demo/scb/hotel/HotelBookingService.java | 2 +-
.../apache/servicecomb/pack/demo/booking}/Application.java | 2 +-
.../demo/pack => pack/demo}/booking/BookingController.java | 2 +-
.../demo/pack => pack/demo}/booking/MyConfiguration.java | 2 +-
.../org/apache/servicecomb/pack/demo/car}/Application.java | 2 +-
.../{saga/demo/pack => pack/demo}/car/CarBooking.java | 2 +-
.../demo/pack => pack/demo}/car/CarBookingController.java | 2 +-
.../{saga/demo/pack => pack/demo}/car/CarBookingService.java | 2 +-
.../org/apache/servicecomb/pack/demo/hotel}/Application.java | 2 +-
.../{saga/demo/pack => pack/demo}/hotel/HotelBooking.java | 2 +-
.../pack => pack/demo}/hotel/HotelBookingController.java | 2 +-
.../demo/pack => pack/demo}/hotel/HotelBookingService.java | 2 +-
42 files changed, 70 insertions(+), 71 deletions(-)
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
index 074bb46..5afea45 100644
--- 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
index 2deab51..829e7ba 100644
--- 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,7 +19,7 @@
###############################################################
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
@@ -27,7 +27,7 @@ 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/demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/saga/demo/dubbo/api/IService.java b/demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/pack/demo/dubbo/api/IService.java
similarity index 89%
rename from demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/saga/demo/dubbo/api/IService.java
rename to demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/pack/demo/dubbo/api/IService.java
index 523d4ab..3f2ef36 100644
--- a/demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/saga/demo/dubbo/api/IService.java
+++ b/demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/pack/demo/dubbo/api/IService.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.dubbo.api;
+package org.apache.servicecomb.pack.demo.dubbo.api;
-import org.apache.servicecomb.saga.demo.dubbo.pub.InvokeContext;
+import org.apache.servicecomb.pack.demo.dubbo.pub.InvokeContext;
public interface IService {
Object run(InvokeContext invokeContext) throws Exception;
diff --git a/demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/saga/demo/dubbo/api/IServiceA.java b/demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/pack/demo/dubbo/api/IServiceA.java
similarity index 94%
rename from demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/saga/demo/dubbo/api/IServiceA.java
rename to demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/pack/demo/dubbo/api/IServiceA.java
index 21b9ff7..361e7d1 100644
--- a/demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/saga/demo/dubbo/api/IServiceA.java
+++ b/demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/pack/demo/dubbo/api/IServiceA.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.dubbo.api;
+package org.apache.servicecomb.pack.demo.dubbo.api;
public interface IServiceA extends IService {
}
diff --git a/demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/saga/demo/dubbo/api/IServiceB.java b/demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/pack/demo/dubbo/api/IServiceB.java
similarity index 94%
rename from demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/saga/demo/dubbo/api/IServiceB.java
rename to demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/pack/demo/dubbo/api/IServiceB.java
index 83d5382..64935b6 100644
--- a/demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/saga/demo/dubbo/api/IServiceB.java
+++ b/demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/pack/demo/dubbo/api/IServiceB.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.dubbo.api;
+package org.apache.servicecomb.pack.demo.dubbo.api;
public interface IServiceB extends IService {
}
diff --git a/demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/saga/demo/dubbo/api/IServiceC.java b/demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/pack/demo/dubbo/api/IServiceC.java
similarity index 94%
rename from demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/saga/demo/dubbo/api/IServiceC.java
rename to demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/pack/demo/dubbo/api/IServiceC.java
index 91bd18f..ae61300 100644
--- a/demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/saga/demo/dubbo/api/IServiceC.java
+++ b/demo/saga-dubbo-demo/service-api/src/main/java/org/apache/servicecomb/pack/demo/dubbo/api/IServiceC.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.dubbo.api;
+package org.apache.servicecomb.pack.demo.dubbo.api;
public interface IServiceC extends IService {
}
diff --git a/demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/saga/demo/dubbo/pub/AbsService.java b/demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/pack/demo/dubbo/pub/AbsService.java
similarity index 96%
rename from demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/saga/demo/dubbo/pub/AbsService.java
rename to demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/pack/demo/dubbo/pub/AbsService.java
index c2082de..758cebd 100644
--- a/demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/saga/demo/dubbo/pub/AbsService.java
+++ b/demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/pack/demo/dubbo/pub/AbsService.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.dubbo.pub;
+package org.apache.servicecomb.pack.demo.dubbo.pub;
import org.springframework.jdbc.core.JdbcTemplate;
diff --git a/demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/saga/demo/dubbo/pub/IInvokeCode.java b/demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/pack/demo/dubbo/pub/IInvokeCode.java
similarity index 96%
rename from demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/saga/demo/dubbo/pub/IInvokeCode.java
rename to demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/pack/demo/dubbo/pub/IInvokeCode.java
index 1b94ffd..64a2166 100644
--- a/demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/saga/demo/dubbo/pub/IInvokeCode.java
+++ b/demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/pack/demo/dubbo/pub/IInvokeCode.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.dubbo.pub;
+package org.apache.servicecomb.pack.demo.dubbo.pub;
/**
* a invoke code describe a test scenario
diff --git a/demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/saga/demo/dubbo/pub/InvokeContext.java b/demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/pack/demo/dubbo/pub/InvokeContext.java
similarity index 97%
rename from demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/saga/demo/dubbo/pub/InvokeContext.java
rename to demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/pack/demo/dubbo/pub/InvokeContext.java
index 513aca3..6c484cb 100644
--- a/demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/saga/demo/dubbo/pub/InvokeContext.java
+++ b/demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/pack/demo/dubbo/pub/InvokeContext.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.dubbo.pub;
+package org.apache.servicecomb.pack.demo.dubbo.pub;
public class InvokeContext implements java.io.Serializable {
diff --git a/demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/saga/demo/dubbo/pub/ServiceVO.java b/demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/pack/demo/dubbo/pub/ServiceVO.java
similarity index 96%
rename from demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/saga/demo/dubbo/pub/ServiceVO.java
rename to demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/pack/demo/dubbo/pub/ServiceVO.java
index bae3371..2b0da06 100644
--- a/demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/saga/demo/dubbo/pub/ServiceVO.java
+++ b/demo/saga-dubbo-demo/service-pub/src/main/java/org/apache/servicecomb/pack/demo/dubbo/pub/ServiceVO.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.dubbo.pub;
+package org.apache.servicecomb.pack.demo.dubbo.pub;
public class ServiceVO {
diff --git a/demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/ApplicationA.java b/demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/pack/demo/dubbo/servicea/ApplicationA.java
similarity index 95%
rename from demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/ApplicationA.java
rename to demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/pack/demo/dubbo/servicea/ApplicationA.java
index c8714e8..4c9c667 100644
--- a/demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/ApplicationA.java
+++ b/demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/pack/demo/dubbo/servicea/ApplicationA.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.dubbo.servicea;
+package org.apache.servicecomb.pack.demo.dubbo.servicea;
import org.apache.servicecomb.pack.omega.spring.EnableOmega;
import org.springframework.boot.SpringApplication;
diff --git a/demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/ServiceA.java b/demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/pack/demo/dubbo/servicea/ServiceA.java
similarity index 86%
rename from demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/ServiceA.java
rename to demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/pack/demo/dubbo/servicea/ServiceA.java
index c1a69cd..848825c 100644
--- a/demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/ServiceA.java
+++ b/demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/pack/demo/dubbo/servicea/ServiceA.java
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.dubbo.servicea;
+package org.apache.servicecomb.pack.demo.dubbo.servicea;
import java.lang.invoke.MethodHandles;
-import org.apache.servicecomb.saga.demo.dubbo.api.IServiceA;
-import org.apache.servicecomb.saga.demo.dubbo.api.IServiceB;
-import org.apache.servicecomb.saga.demo.dubbo.api.IServiceC;
-import org.apache.servicecomb.saga.demo.dubbo.pub.AbsService;
-import org.apache.servicecomb.saga.demo.dubbo.pub.InvokeContext;
+import org.apache.servicecomb.pack.demo.dubbo.api.IServiceA;
+import org.apache.servicecomb.pack.demo.dubbo.api.IServiceB;
+import org.apache.servicecomb.pack.demo.dubbo.api.IServiceC;
+import org.apache.servicecomb.pack.demo.dubbo.pub.AbsService;
+import org.apache.servicecomb.pack.demo.dubbo.pub.InvokeContext;
import org.apache.servicecomb.pack.omega.context.annotations.SagaStart;
import org.apache.servicecomb.pack.omega.transaction.annotations.Compensable;
import org.slf4j.Logger;
diff --git a/demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/web/DubboDemoController.java b/demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/pack/demo/dubbo/servicea/web/DubboDemoController.java
similarity index 95%
rename from demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/web/DubboDemoController.java
rename to demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/pack/demo/dubbo/servicea/web/DubboDemoController.java
index ef9981a..dc9f494 100644
--- a/demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/web/DubboDemoController.java
+++ b/demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/pack/demo/dubbo/servicea/web/DubboDemoController.java
@@ -15,16 +15,15 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.dubbo.servicea.web;
+package org.apache.servicecomb.pack.demo.dubbo.servicea.web;
-import org.apache.servicecomb.saga.demo.dubbo.api.IServiceA;
-import org.apache.servicecomb.saga.demo.dubbo.pub.IInvokeCode;
-import org.apache.servicecomb.saga.demo.dubbo.pub.InvokeContext;
-import org.apache.servicecomb.saga.demo.dubbo.pub.ServiceVO;
+import org.apache.servicecomb.pack.demo.dubbo.api.IServiceA;
+import org.apache.servicecomb.pack.demo.dubbo.pub.IInvokeCode;
+import org.apache.servicecomb.pack.demo.dubbo.pub.InvokeContext;
+import org.apache.servicecomb.pack.demo.dubbo.pub.ServiceVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RestController;
diff --git a/demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/web/MvcConfigurer.java b/demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/pack/demo/dubbo/servicea/web/MvcConfigurer.java
similarity index 96%
rename from demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/web/MvcConfigurer.java
rename to demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/pack/demo/dubbo/servicea/web/MvcConfigurer.java
index d815f60..9a4d77e 100644
--- a/demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicea/web/MvcConfigurer.java
+++ b/demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/pack/demo/dubbo/servicea/web/MvcConfigurer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.dubbo.servicea.web;
+package org.apache.servicecomb.pack.demo.dubbo.servicea.web;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.Ordered;
@@ -36,4 +36,4 @@ public class MvcConfigurer extends WebMvcConfigurerAdapter {
super.configurePathMatch(configurer);
configurer.setUseSuffixPatternMatch(false);
}
-}
\ No newline at end of file
+}
diff --git a/demo/saga-dubbo-demo/servicea/src/main/resources/dubbo-context.xml b/demo/saga-dubbo-demo/servicea/src/main/resources/dubbo-context.xml
index 16a5b63..66356cd 100644
--- a/demo/saga-dubbo-demo/servicea/src/main/resources/dubbo-context.xml
+++ b/demo/saga-dubbo-demo/servicea/src/main/resources/dubbo-context.xml
@@ -24,8 +24,8 @@
<!--localhost:2181-->
<dubbo:registry address="zookeeper://${zookeeper.url}?client=zkclient"/>
<dubbo:protocol name="dubbo" port="20881"/>
- <dubbo:service interface="org.apache.servicecomb.saga.demo.dubbo.api.IServiceA" ref="servicea"/>
- <bean id="servicea" class="org.apache.servicecomb.saga.demo.dubbo.servicea.ServiceA"/>
- <dubbo:reference id="serviceb" interface="org.apache.servicecomb.saga.demo.dubbo.api.IServiceB"/>
- <dubbo:reference id="servicec" interface="org.apache.servicecomb.saga.demo.dubbo.api.IServiceC"/>
-</beans>
\ No newline at end of file
+ <dubbo:service interface="org.apache.servicecomb.pack.demo.dubbo.api.IServiceA" ref="servicea"/>
+ <bean id="servicea" class="org.apache.servicecomb.pack.demo.dubbo.servicea.ServiceA"/>
+ <dubbo:reference id="serviceb" interface="org.apache.servicecomb.pack.demo.dubbo.api.IServiceB"/>
+ <dubbo:reference id="servicec" interface="org.apache.servicecomb.pack.demo.dubbo.api.IServiceC"/>
+</beans>
diff --git a/demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/saga/demo/dubbo/serviceb/ApplicationB.java b/demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/pack/demo/dubbo/serviceb/ApplicationB.java
similarity index 95%
rename from demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/saga/demo/dubbo/serviceb/ApplicationB.java
rename to demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/pack/demo/dubbo/serviceb/ApplicationB.java
index ccfcdaf..737f9cf 100644
--- a/demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/saga/demo/dubbo/serviceb/ApplicationB.java
+++ b/demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/pack/demo/dubbo/serviceb/ApplicationB.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.dubbo.serviceb;
+package org.apache.servicecomb.pack.demo.dubbo.serviceb;
import org.apache.servicecomb.pack.omega.spring.EnableOmega;
import org.springframework.boot.SpringApplication;
diff --git a/demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/saga/demo/dubbo/serviceb/ServiceB.java b/demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/pack/demo/dubbo/serviceb/ServiceB.java
similarity index 86%
rename from demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/saga/demo/dubbo/serviceb/ServiceB.java
rename to demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/pack/demo/dubbo/serviceb/ServiceB.java
index 85c409f..ce68e75 100644
--- a/demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/saga/demo/dubbo/serviceb/ServiceB.java
+++ b/demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/pack/demo/dubbo/serviceb/ServiceB.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.dubbo.serviceb;
+package org.apache.servicecomb.pack.demo.dubbo.serviceb;
import java.lang.invoke.MethodHandles;
-import org.apache.servicecomb.saga.demo.dubbo.api.IServiceB;
-import org.apache.servicecomb.saga.demo.dubbo.api.IServiceC;
-import org.apache.servicecomb.saga.demo.dubbo.pub.AbsService;
-import org.apache.servicecomb.saga.demo.dubbo.pub.InvokeContext;
+import org.apache.servicecomb.pack.demo.dubbo.api.IServiceB;
+import org.apache.servicecomb.pack.demo.dubbo.api.IServiceC;
+import org.apache.servicecomb.pack.demo.dubbo.pub.AbsService;
+import org.apache.servicecomb.pack.demo.dubbo.pub.InvokeContext;
import org.apache.servicecomb.pack.omega.transaction.annotations.Compensable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/demo/saga-dubbo-demo/serviceb/src/main/resources/dubbo-context.xml b/demo/saga-dubbo-demo/serviceb/src/main/resources/dubbo-context.xml
index 43a629c..120588b 100644
--- a/demo/saga-dubbo-demo/serviceb/src/main/resources/dubbo-context.xml
+++ b/demo/saga-dubbo-demo/serviceb/src/main/resources/dubbo-context.xml
@@ -24,7 +24,7 @@
<!--localhost:2181-->
<dubbo:registry address="zookeeper://${zookeeper.url}?client=zkclient"/>
<dubbo:protocol name="dubbo" port="20882"/>
- <dubbo:service interface="org.apache.servicecomb.saga.demo.dubbo.api.IServiceB" ref="serviceb"/>
- <bean id="serviceb" class="org.apache.servicecomb.saga.demo.dubbo.serviceb.ServiceB"/>
- <dubbo:reference id="servicec" interface="org.apache.servicecomb.saga.demo.dubbo.api.IServiceC"/>
-</beans>
\ No newline at end of file
+ <dubbo:service interface="org.apache.servicecomb.pack.demo.dubbo.api.IServiceB" ref="serviceb"/>
+ <bean id="serviceb" class="org.apache.servicecomb.pack.demo.dubbo.serviceb.ServiceB"/>
+ <dubbo:reference id="servicec" interface="org.apache.servicecomb.pack.demo.dubbo.api.IServiceC"/>
+</beans>
diff --git a/demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicec/ApplicationC.java b/demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/pack/demo/dubbo/servicec/ApplicationC.java
similarity index 95%
rename from demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicec/ApplicationC.java
rename to demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/pack/demo/dubbo/servicec/ApplicationC.java
index add67e3..701a1cb 100644
--- a/demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicec/ApplicationC.java
+++ b/demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/pack/demo/dubbo/servicec/ApplicationC.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.dubbo.servicec;
+package org.apache.servicecomb.pack.demo.dubbo.servicec;
import org.apache.servicecomb.pack.omega.spring.EnableOmega;
import org.springframework.boot.SpringApplication;
diff --git a/demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicec/ServiceC.java b/demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/pack/demo/dubbo/servicec/ServiceC.java
similarity index 88%
rename from demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicec/ServiceC.java
rename to demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/pack/demo/dubbo/servicec/ServiceC.java
index 102139c..7218d9d 100644
--- a/demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/saga/demo/dubbo/servicec/ServiceC.java
+++ b/demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/pack/demo/dubbo/servicec/ServiceC.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.dubbo.servicec;
+package org.apache.servicecomb.pack.demo.dubbo.servicec;
import java.lang.invoke.MethodHandles;
-import org.apache.servicecomb.saga.demo.dubbo.api.IServiceC;
-import org.apache.servicecomb.saga.demo.dubbo.pub.AbsService;
-import org.apache.servicecomb.saga.demo.dubbo.pub.InvokeContext;
+import org.apache.servicecomb.pack.demo.dubbo.api.IServiceC;
+import org.apache.servicecomb.pack.demo.dubbo.pub.AbsService;
+import org.apache.servicecomb.pack.demo.dubbo.pub.InvokeContext;
import org.apache.servicecomb.pack.omega.transaction.annotations.Compensable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/demo/saga-dubbo-demo/servicec/src/main/resources/dubbo-context.xml b/demo/saga-dubbo-demo/servicec/src/main/resources/dubbo-context.xml
index 1eb1ffc..f0846c9 100644
--- a/demo/saga-dubbo-demo/servicec/src/main/resources/dubbo-context.xml
+++ b/demo/saga-dubbo-demo/servicec/src/main/resources/dubbo-context.xml
@@ -23,6 +23,6 @@
<!--localhost:2181-->
<dubbo:registry address="zookeeper://${zookeeper.url}?client=zkclient"/>
<dubbo:protocol name="dubbo" port="20883"/>
- <dubbo:service interface="org.apache.servicecomb.saga.demo.dubbo.api.IServiceC" ref="servicec"/>
- <bean id="servicec" class="org.apache.servicecomb.saga.demo.dubbo.servicec.ServiceC"/>
-</beans>
\ No newline at end of file
+ <dubbo:service interface="org.apache.servicecomb.pack.demo.dubbo.api.IServiceC" ref="servicec"/>
+ <bean id="servicec" class="org.apache.servicecomb.pack.demo.dubbo.servicec.ServiceC"/>
+</beans>
diff --git a/demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/saga/demo/scb/booking/BookingApplication.java b/demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/pack/demo/scb/booking/BookingApplication.java
similarity index 95%
rename from demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/saga/demo/scb/booking/BookingApplication.java
rename to demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/pack/demo/scb/booking/BookingApplication.java
index c4ee655..a74933e 100644
--- a/demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/saga/demo/scb/booking/BookingApplication.java
+++ b/demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/pack/demo/scb/booking/BookingApplication.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.scb.booking;
+package org.apache.servicecomb.pack.demo.scb.booking;
import org.apache.servicecomb.pack.omega.spring.EnableOmega;
import org.apache.servicecomb.springboot.starter.provider.EnableServiceComb;
diff --git a/demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/saga/demo/scb/booking/BookingController.java b/demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/pack/demo/scb/booking/BookingController.java
similarity index 97%
rename from demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/saga/demo/scb/booking/BookingController.java
rename to demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/pack/demo/scb/booking/BookingController.java
index d24512b..737d889 100644
--- a/demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/saga/demo/scb/booking/BookingController.java
+++ b/demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/pack/demo/scb/booking/BookingController.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.scb.booking;
+package org.apache.servicecomb.pack.demo.scb.booking;
import org.apache.servicecomb.provider.rest.common.RestSchema;
import org.apache.servicecomb.provider.springmvc.reference.RestTemplateBuilder;
diff --git a/demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarApplication.java b/demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/pack/demo/scb/car/CarApplication.java
similarity index 96%
rename from demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarApplication.java
rename to demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/pack/demo/scb/car/CarApplication.java
index d6366f9..8ffe0d3 100644
--- a/demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarApplication.java
+++ b/demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/pack/demo/scb/car/CarApplication.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.scb.car;
+package org.apache.servicecomb.pack.demo.scb.car;
import org.apache.servicecomb.pack.omega.spring.EnableOmega;
import org.apache.servicecomb.springboot.starter.provider.EnableServiceComb;
diff --git a/demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarBooking.java b/demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/pack/demo/scb/car/CarBooking.java
similarity index 97%
rename from demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarBooking.java
rename to demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/pack/demo/scb/car/CarBooking.java
index 497f278..9ca4ec3 100644
--- a/demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarBooking.java
+++ b/demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/pack/demo/scb/car/CarBooking.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.scb.car;
+package org.apache.servicecomb.pack.demo.scb.car;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
diff --git a/demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarBookingController.java b/demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/pack/demo/scb/car/CarBookingController.java
similarity index 97%
rename from demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarBookingController.java
rename to demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/pack/demo/scb/car/CarBookingController.java
index 35ff146..9426fd3 100644
--- a/demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarBookingController.java
+++ b/demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/pack/demo/scb/car/CarBookingController.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.scb.car;
+package org.apache.servicecomb.pack.demo.scb.car;
import java.util.ArrayList;
import java.util.List;
diff --git a/demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarBookingService.java b/demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/pack/demo/scb/car/CarBookingService.java
similarity index 96%
rename from demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarBookingService.java
rename to demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/pack/demo/scb/car/CarBookingService.java
index 9a8a257..b080453 100644
--- a/demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/saga/demo/scb/car/CarBookingService.java
+++ b/demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/pack/demo/scb/car/CarBookingService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.scb.car;
+package org.apache.servicecomb.pack.demo.scb.car;
import java.util.Collection;
import java.util.Map;
diff --git a/demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelApplication.java b/demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/pack/demo/scb/hotel/HotelApplication.java
similarity index 96%
rename from demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelApplication.java
rename to demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/pack/demo/scb/hotel/HotelApplication.java
index 3738444..b145108 100644
--- a/demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelApplication.java
+++ b/demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/pack/demo/scb/hotel/HotelApplication.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.scb.hotel;
+package org.apache.servicecomb.pack.demo.scb.hotel;
import org.apache.servicecomb.pack.omega.spring.EnableOmega;
import org.apache.servicecomb.springboot.starter.provider.EnableServiceComb;
diff --git a/demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelBooking.java b/demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/pack/demo/scb/hotel/HotelBooking.java
similarity index 97%
rename from demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelBooking.java
rename to demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/pack/demo/scb/hotel/HotelBooking.java
index b183a79..d0c489f 100644
--- a/demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelBooking.java
+++ b/demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/pack/demo/scb/hotel/HotelBooking.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.scb.hotel;
+package org.apache.servicecomb.pack.demo.scb.hotel;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
diff --git a/demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelBookingController.java b/demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/pack/demo/scb/hotel/HotelBookingController.java
similarity index 97%
rename from demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelBookingController.java
rename to demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/pack/demo/scb/hotel/HotelBookingController.java
index d7d3cd3..eed7a38 100644
--- a/demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelBookingController.java
+++ b/demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/pack/demo/scb/hotel/HotelBookingController.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.scb.hotel;
+package org.apache.servicecomb.pack.demo.scb.hotel;
import java.util.ArrayList;
import java.util.List;
diff --git a/demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelBookingService.java b/demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/pack/demo/scb/hotel/HotelBookingService.java
similarity index 97%
rename from demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelBookingService.java
rename to demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/pack/demo/scb/hotel/HotelBookingService.java
index 6164ee7..bf05183 100644
--- a/demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/saga/demo/scb/hotel/HotelBookingService.java
+++ b/demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/pack/demo/scb/hotel/HotelBookingService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.scb.hotel;
+package org.apache.servicecomb.pack.demo.scb.hotel;
import java.util.Collection;
import java.util.Map;
diff --git a/demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/Application.java b/demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/pack/demo/booking/Application.java
similarity index 95%
rename from demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/Application.java
rename to demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/pack/demo/booking/Application.java
index 17dee59..03ce0b7 100644
--- a/demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/Application.java
+++ b/demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/pack/demo/booking/Application.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.pack.car;
+package org.apache.servicecomb.pack.demo.booking;
import org.apache.servicecomb.pack.omega.spring.EnableOmega;
import org.springframework.boot.SpringApplication;
diff --git a/demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/BookingController.java b/demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/pack/demo/booking/BookingController.java
similarity index 97%
rename from demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/BookingController.java
rename to demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/pack/demo/booking/BookingController.java
index fd7d94f..4481c2a 100644
--- a/demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/BookingController.java
+++ b/demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/pack/demo/booking/BookingController.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.pack.booking;
+package org.apache.servicecomb.pack.demo.booking;
import org.apache.servicecomb.pack.omega.context.annotations.SagaStart;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/MyConfiguration.java b/demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/pack/demo/booking/MyConfiguration.java
similarity index 96%
rename from demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/MyConfiguration.java
rename to demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/pack/demo/booking/MyConfiguration.java
index 0fc5e09..504d8ce 100644
--- a/demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/MyConfiguration.java
+++ b/demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/pack/demo/booking/MyConfiguration.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.pack.booking;
+package org.apache.servicecomb.pack.demo.booking;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/Application.java b/demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/pack/demo/car/Application.java
similarity index 95%
rename from demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/Application.java
rename to demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/pack/demo/car/Application.java
index 27bbdc2..fc0e47b 100644
--- a/demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/Application.java
+++ b/demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/pack/demo/car/Application.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.pack.hotel;
+package org.apache.servicecomb.pack.demo.car;
import org.apache.servicecomb.pack.omega.spring.EnableOmega;
import org.springframework.boot.SpringApplication;
diff --git a/demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBooking.java b/demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/pack/demo/car/CarBooking.java
similarity index 97%
rename from demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBooking.java
rename to demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/pack/demo/car/CarBooking.java
index 94f40d4..8911d32 100644
--- a/demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBooking.java
+++ b/demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/pack/demo/car/CarBooking.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.pack.car;
+package org.apache.servicecomb.pack.demo.car;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
diff --git a/demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingController.java b/demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/pack/demo/car/CarBookingController.java
similarity index 97%
rename from demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingController.java
rename to demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/pack/demo/car/CarBookingController.java
index 9db37b3..35c59aa 100644
--- a/demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingController.java
+++ b/demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/pack/demo/car/CarBookingController.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.pack.car;
+package org.apache.servicecomb.pack.demo.car;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.CrossOrigin;
diff --git a/demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingService.java b/demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/pack/demo/car/CarBookingService.java
similarity index 96%
rename from demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingService.java
rename to demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/pack/demo/car/CarBookingService.java
index abc233e..a0a6c31 100644
--- a/demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/saga/demo/pack/car/CarBookingService.java
+++ b/demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/pack/demo/car/CarBookingService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.pack.car;
+package org.apache.servicecomb.pack.demo.car;
import org.apache.servicecomb.pack.omega.transaction.annotations.Compensable;
import org.springframework.stereotype.Service;
diff --git a/demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/Application.java b/demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/pack/demo/hotel/Application.java
similarity index 95%
rename from demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/Application.java
rename to demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/pack/demo/hotel/Application.java
index 0a5fdf9..1bb9d10 100644
--- a/demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/saga/demo/pack/booking/Application.java
+++ b/demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/pack/demo/hotel/Application.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.pack.booking;
+package org.apache.servicecomb.pack.demo.hotel;
import org.apache.servicecomb.pack.omega.spring.EnableOmega;
import org.springframework.boot.SpringApplication;
diff --git a/demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBooking.java b/demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/pack/demo/hotel/HotelBooking.java
similarity index 97%
rename from demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBooking.java
rename to demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/pack/demo/hotel/HotelBooking.java
index e621b23..f6d3c15 100644
--- a/demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBooking.java
+++ b/demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/pack/demo/hotel/HotelBooking.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.pack.hotel;
+package org.apache.servicecomb.pack.demo.hotel;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
diff --git a/demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingController.java b/demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/pack/demo/hotel/HotelBookingController.java
similarity index 97%
rename from demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingController.java
rename to demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/pack/demo/hotel/HotelBookingController.java
index 6582819..4c095a3 100644
--- a/demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingController.java
+++ b/demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/pack/demo/hotel/HotelBookingController.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.pack.hotel;
+package org.apache.servicecomb.pack.demo.hotel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.CrossOrigin;
diff --git a/demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingService.java b/demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/pack/demo/hotel/HotelBookingService.java
similarity index 96%
rename from demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingService.java
rename to demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/pack/demo/hotel/HotelBookingService.java
index 74a89cd..395ecbd 100644
--- a/demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/saga/demo/pack/hotel/HotelBookingService.java
+++ b/demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/pack/demo/hotel/HotelBookingService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.demo.pack.hotel;
+package org.apache.servicecomb.pack.demo.hotel;
import org.apache.servicecomb.pack.omega.transaction.annotations.Compensable;
import org.springframework.stereotype.Service;