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/14 06:51:37 UTC
[servicecomb-pack] branch SCB-976 updated (18053b6 -> 017fb1c)
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a change to branch SCB-976
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git.
from 18053b6 SCB-976 Update the maven group to org.apache.servicecomb.pack in the demo module
new 32e8af6 SCB-976 Renamed the package name in the pack-common
new 1f41088 SCB-976 Renamed the grpc package name
new 017fb1c SCB-976 Renamed the package name of omega modules
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../servicecomb/saga/alpha/core/EventScanner.java | 8 ++---
.../saga/alpha/core/TxConsistentService.java | 6 ++--
.../saga/alpha/core/TxEventRepository.java | 2 +-
.../alpha/core/CompositeOmegaCallbackTest.java | 4 +--
.../saga/alpha/core/TxConsistentServiceTest.java | 14 ++++----
.../servicecomb/saga/alpha/core/TxEventMaker.java | 2 +-
.../saga/alpha/server/GrpcOmegaCallback.java | 2 +-
.../saga/alpha/server/GrpcTxEventEndpointImpl.java | 10 +++---
.../saga/alpha/server/SpringTxEventRepository.java | 2 +-
.../saga/alpha/server/tcc/GrpcTccEventService.java | 16 ++++-----
.../server/tcc/callback/GrpcOmegaTccCallback.java | 4 +--
.../alpha/server/tcc/callback/OmegaCallback.java | 2 +-
.../server/tcc/callback/OmegaCallbackWrapper.java | 2 +-
.../tcc/callback/OmegaCallbacksRegistry.java | 4 +--
.../server/tcc/callback/TccCallbackEngine.java | 2 +-
.../saga/alpha/server/tcc/jpa/EventConverter.java | 10 +++---
.../server/tcc/service/TccTxEventService.java | 4 +--
.../alpha/server/AlphaEventControllerTest.java | 2 +-
.../saga/alpha/server/AlphaIntegrationTest.java | 28 +++++++--------
.../saga/SagaTransactionsControllerTest.java | 14 ++++----
.../server/tcc/AlphaTccEventControllerTest.java | 3 +-
.../alpha/server/tcc/AlphaTccServerTestBase.java | 22 ++++++------
.../alpha/server/tcc/TccCallbackEngineTest.java | 4 +--
.../tcc/TccCoordinateCommandStreamObserver.java | 2 +-
.../tcc/service/MemoryEventRegistryTest.java | 2 +-
.../server/tcc/service/TccTxEventServiceTest.java | 6 ++--
.../service/TccTxEventServiceTransactionTest.java | 2 +-
.../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 | 14 ++++----
.../grpc/saga/GrpcSagaClientMessageSender.java | 32 ++++++++---------
.../grpc/saga/RetryableMessageSender.java | 14 ++++----
.../connector/grpc/saga/SagaLoadBalanceSender.java | 19 +++++-----
.../grpc/tcc/GrpcCoordinateStreamObserver.java | 13 +++----
.../grpc/tcc/GrpcTccClientMessageSender.java | 39 ++++++++++----------
.../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 | 25 ++++++-------
.../grpc/tcc/GrpcTccClientMessageSenderTest.java | 35 +++++++++---------
.../connector/grpc/tcc/MyTccEventServiceImpl.java | 18 +++++-----
.../grpc/tcc/TccLoadBalanceSenderTest.java | 40 ++++++++++-----------
.../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 | 20 +++++------
.../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 | 4 +--
.../omega/transaction/SagaMessageSender.java | 2 +-
.../transaction/SagaStartAnnotationProcessor.java | 4 +--
.../omega/transaction/SagaStartAspect.java | 8 ++---
.../omega/transaction/SagaStartedEvent.java | 4 +--
.../omega/transaction/TransactionAspect.java | 8 ++---
.../omega/transaction/TxAbortedEvent.java | 4 +--
.../omega/transaction/TxCompensatedEvent.java | 4 +--
.../omega/transaction/TxEndedEvent.java | 4 +--
.../{saga => pack}/omega/transaction/TxEvent.java | 4 +--
.../omega/transaction/TxStartedEvent.java | 4 +--
.../omega/transaction/annotations/Compensable.java | 2 +-
.../omega/transaction/annotations/Participate.java | 2 +-
.../transaction/tcc/CoordinateMessageHandler.java | 10 +++---
.../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 | 12 +++----
.../tcc/TccStartAnnotationProcessor.java | 14 ++++----
.../omega/transaction/tcc/TccStartAspect.java | 10 +++---
.../transaction/tcc/events/CoordinatedEvent.java | 4 +--
.../transaction/tcc/events/ParticipatedEvent.java | 4 +--
.../transaction/tcc/events/TccEndedEvent.java | 4 +--
.../transaction/tcc/events/TccStartedEvent.java | 2 +-
.../transaction/CompensableInterceptorTest.java | 8 ++---
.../CompensationMessageHandlerTest.java | 6 ++--
.../omega/transaction/DefaultRecoveryTest.java | 10 +++---
.../omega/transaction/ForwardRecoveryTest.java | 10 +++---
.../SagaStartAnnotationProcessorTest.java | 8 ++---
.../omega/transaction/SagaStartAspectTest.java | 10 +++---
.../omega/transaction/TransactionAspectTest.java | 10 +++---
.../tcc/CoordinateMessageHandlerTest.java | 18 +++++-----
.../transaction/tcc/TccParticipatorAspectTest.java | 20 +++++------
.../tcc/TccStartAnnotationProcessorTest.java | 20 +++++------
.../omega/transaction/tcc/TccStartAspectTest.java | 20 +++++------
.../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 +++---
.../{saga => pack}/common/EventType.java | 2 +-
.../{saga => pack}/common/TransactionStatus.java | 2 +-
.../src/main/proto/GrpcCommon.proto | 2 +-
.../src/main/proto/GrpcTccEvent.proto | 2 +-
.../src/main/proto/GrpcTxEvent.proto | 2 +-
.../jpa/EclipseLinkJpaConfiguration.java | 2 +-
.../src/main/resources/META-INF/spring.factories | 2 +-
199 files changed, 696 insertions(+), 711 deletions(-)
rename omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/{saga => pack}/omega/connector/grpc/AlphaClusterConfig.java (94%)
rename omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/{saga => pack}/omega/connector/grpc/core/FastestSender.java (92%)
rename omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/{saga => pack}/omega/connector/grpc/core/GrpcOnErrorHandler.java (94%)
rename omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/{saga => pack}/omega/connector/grpc/core/LoadBalanceContext.java (94%)
rename omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/{saga => pack}/omega/connector/grpc/core/LoadBalanceContextBuilder.java (93%)
rename omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/{saga => pack}/omega/connector/grpc/core/LoadBalanceSenderAdapter.java (92%)
rename omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/{saga => pack}/omega/connector/grpc/core/MessageSenderPicker.java (92%)
rename omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/{saga => pack}/omega/connector/grpc/core/PendingTaskRunner.java (96%)
rename omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/{saga => pack}/omega/connector/grpc/core/PushBackReconnectRunnable.java (95%)
rename omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/{saga => pack}/omega/connector/grpc/core/ReconnectStreamObserver.java (88%)
rename omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/{saga => pack}/omega/connector/grpc/core/SenderExecutor.java (87%)
rename omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/{saga => pack}/omega/connector/grpc/core/TransactionType.java (93%)
rename omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/{saga => pack}/omega/connector/grpc/saga/GrpcCompensateStreamObserver.java (82%)
rename omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/{saga => pack}/omega/connector/grpc/saga/GrpcSagaClientMessageSender.java (76%)
rename omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/{saga => pack}/omega/connector/grpc/saga/RetryableMessageSender.java (80%)
rename omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/{saga => pack}/omega/connector/grpc/saga/SagaLoadBalanceSender.java (75%)
rename omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/{saga => pack}/omega/connector/grpc/tcc/GrpcCoordinateStreamObserver.java (82%)
rename omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/{saga => pack}/omega/connector/grpc/tcc/GrpcTccClientMessageSender.java (79%)
rename omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/{saga => pack}/omega/connector/grpc/tcc/TccLoadBalanceSender.java (83%)
rename omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/{saga => pack}/omega/connector/grpc/LoadBalanceContextBuilderTest.java (91%)
rename omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/{saga => pack}/omega/connector/grpc/LoadBalanceSenderTestBase.java (96%)
rename omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/{saga => pack}/omega/connector/grpc/PushBackReconnectRunnableTest.java (94%)
rename omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/{saga => pack}/omega/connector/grpc/saga/RetryableMessageSenderTest.java (84%)
rename omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/{saga => pack}/omega/connector/grpc/saga/SagaLoadBalanceSenderWithTLSTest.java (92%)
rename omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/{saga => pack}/omega/connector/grpc/saga/SagaLoadBalancedSenderTest.java (92%)
rename omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/{saga => pack}/omega/connector/grpc/saga/SagaLoadBalancedSenderTestBase.java (86%)
rename omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/{saga => pack}/omega/connector/grpc/tcc/GrpcTccClientMessageSenderTest.java (88%)
rename omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/{saga => pack}/omega/connector/grpc/tcc/MyTccEventServiceImpl.java (85%)
rename omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/{saga => pack}/omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java (90%)
rename omega/omega-context/src/main/java/org/apache/servicecomb/{saga => pack}/omega/context/CallbackContext.java (98%)
rename omega/omega-context/src/main/java/org/apache/servicecomb/{saga => pack}/omega/context/IdGenerator.java (94%)
rename omega/omega-context/src/main/java/org/apache/servicecomb/{saga => pack}/omega/context/OmegaContext.java (95%)
rename omega/omega-context/src/main/java/org/apache/servicecomb/{saga => pack}/omega/context/ServiceConfig.java (96%)
rename omega/omega-context/src/main/java/org/apache/servicecomb/{saga => pack}/omega/context/UniqueIdGenerator.java (95%)
rename omega/omega-context/src/main/java/org/apache/servicecomb/{saga => pack}/omega/context/annotations/SagaStart.java (95%)
rename omega/omega-context/src/main/java/org/apache/servicecomb/{saga => pack}/omega/context/annotations/TccStart.java (95%)
rename omega/omega-context/src/test/java/org/apache/servicecomb/{saga => pack}/omega/context/OmegaContextTest.java (98%)
rename omega/omega-context/src/test/java/org/apache/servicecomb/{saga => pack}/omega/context/UniqueIdGeneratorTest.java (97%)
rename omega/omega-format/src/main/java/org/apache/servicecomb/{saga => pack}/omega/format/KryoMessageFormat.java (94%)
rename omega/omega-format/src/main/java/org/apache/servicecomb/{saga => pack}/omega/format/MessageFormat.java (83%)
rename omega/omega-format/src/test/java/org/apache/servicecomb/{saga => pack}/omega/format/KryoMessageFormatTest.java (96%)
rename omega/omega-format/src/test/java/org/apache/servicecomb/{saga => pack}/omega/format/MessageFormatTestBase.java (96%)
rename omega/omega-spring-starter/src/main/java/org/apache/servicecomb/{saga => pack}/omega/spring/EnableOmega.java (87%)
rename omega/omega-spring-starter/src/main/java/org/apache/servicecomb/{saga => pack}/omega/spring/OmegaSpringConfig.java (80%)
rename omega/omega-spring-tx/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/spring/CallbackType.java (94%)
rename omega/omega-spring-tx/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/spring/CompensableAnnotationProcessor.java (91%)
rename omega/omega-spring-tx/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/spring/CompensableMethodCheckingCallback.java (89%)
rename omega/omega-spring-tx/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/spring/ExecutorFieldCallback.java (96%)
rename omega/omega-spring-tx/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/spring/MethodCheckingCallback.java (95%)
rename omega/omega-spring-tx/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/spring/ParticipateAnnotationProcessor.java (91%)
rename omega/omega-spring-tx/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/spring/ParticipateMethodCheckingCallback.java (88%)
rename omega/omega-spring-tx/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/spring/TransactionAspectConfig.java (77%)
rename omega/omega-spring-tx/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/spring/annotations/OmegaContextAware.java (94%)
rename omega/omega-spring-tx/src/test/java/org/apache/servicecomb/{saga => pack}/omega/transaction/spring/CompensableAnnotationCheckingTest.java (97%)
rename omega/omega-spring-tx/src/test/java/org/apache/servicecomb/{saga => pack}/omega/transaction/spring/MessageConfig.java (80%)
rename omega/omega-spring-tx/src/test/java/org/apache/servicecomb/{saga => pack}/omega/transaction/spring/MisconfiguredAnnotation.java (89%)
rename omega/omega-spring-tx/src/test/java/org/apache/servicecomb/{saga => pack}/omega/transaction/spring/MisconfiguredRetriesService.java (89%)
rename omega/omega-spring-tx/src/test/java/org/apache/servicecomb/{saga => pack}/omega/transaction/spring/MisconfiguredService.java (89%)
rename omega/omega-spring-tx/src/test/java/org/apache/servicecomb/{saga => pack}/omega/transaction/spring/TccInterceptorTest.java (88%)
rename omega/omega-spring-tx/src/test/java/org/apache/servicecomb/{saga => pack}/omega/transaction/spring/TccUserService.java (94%)
rename omega/omega-spring-tx/src/test/java/org/apache/servicecomb/{saga => pack}/omega/transaction/spring/TccUserServiceMain.java (89%)
rename omega/omega-spring-tx/src/test/java/org/apache/servicecomb/{saga => pack}/omega/transaction/spring/TransactionInterceptionTest.java (95%)
rename omega/omega-spring-tx/src/test/java/org/apache/servicecomb/{saga => pack}/omega/transaction/spring/TransactionTestMain.java (94%)
rename omega/omega-spring-tx/src/test/java/org/apache/servicecomb/{saga => pack}/omega/transaction/spring/TransactionalUserService.java (95%)
rename omega/omega-spring-tx/src/test/java/org/apache/servicecomb/{saga => pack}/omega/transaction/spring/User.java (96%)
rename omega/omega-spring-tx/src/test/java/org/apache/servicecomb/{saga => pack}/omega/transaction/spring/UserRepository.java (93%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/AlphaResponse.java (94%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/CompensableInterceptor.java (94%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/CompensationMessageHandler.java (92%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/DefaultRecovery.java (95%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/EventAwareInterceptor.java (95%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/ForwardRecovery.java (94%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/MessageDeserializer.java (94%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/MessageHandler.java (94%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/MessageSender.java (94%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/MessageSerializer.java (94%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/NoOpEventAwareInterceptor.java (96%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/OmegaException.java (94%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/RecoveryPolicy.java (85%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/RecoveryPolicyFactory.java (96%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/SagaEndedEvent.java (90%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/SagaMessageSender.java (94%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/SagaStartAnnotationProcessor.java (94%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/SagaStartAspect.java (91%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/SagaStartedEvent.java (91%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/TransactionAspect.java (90%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/TxAbortedEvent.java (93%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/TxCompensatedEvent.java (90%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/TxEndedEvent.java (90%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/TxEvent.java (96%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/TxStartedEvent.java (91%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/annotations/Compensable.java (97%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/annotations/Participate.java (97%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/tcc/CoordinateMessageHandler.java (86%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/tcc/DefaultParametersContext.java (95%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/tcc/ParametersContext.java (94%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/tcc/TccEventService.java (77%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/tcc/TccMessageHandler.java (94%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/tcc/TccMessageSender.java (73%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/tcc/TccParticipatorAspect.java (90%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/tcc/TccStartAnnotationProcessor.java (82%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/tcc/TccStartAspect.java (89%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/tcc/events/CoordinatedEvent.java (93%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/tcc/events/ParticipatedEvent.java (94%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/tcc/events/TccEndedEvent.java (92%)
rename omega/omega-transaction/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transaction/tcc/events/TccStartedEvent.java (95%)
rename omega/omega-transaction/src/test/java/org/apache/servicecomb/{saga => pack}/omega/transaction/CompensableInterceptorTest.java (94%)
rename omega/omega-transaction/src/test/java/org/apache/servicecomb/{saga => pack}/omega/transaction/CompensationMessageHandlerTest.java (94%)
rename omega/omega-transaction/src/test/java/org/apache/servicecomb/{saga => pack}/omega/transaction/DefaultRecoveryTest.java (95%)
rename omega/omega-transaction/src/test/java/org/apache/servicecomb/{saga => pack}/omega/transaction/ForwardRecoveryTest.java (95%)
rename omega/omega-transaction/src/test/java/org/apache/servicecomb/{saga => pack}/omega/transaction/SagaStartAnnotationProcessorTest.java (94%)
rename omega/omega-transaction/src/test/java/org/apache/servicecomb/{saga => pack}/omega/transaction/SagaStartAspectTest.java (93%)
rename omega/omega-transaction/src/test/java/org/apache/servicecomb/{saga => pack}/omega/transaction/TransactionAspectTest.java (96%)
rename omega/omega-transaction/src/test/java/org/apache/servicecomb/{saga => pack}/omega/transaction/tcc/CoordinateMessageHandlerTest.java (85%)
rename omega/omega-transaction/src/test/java/org/apache/servicecomb/{saga => pack}/omega/transaction/tcc/TccParticipatorAspectTest.java (90%)
rename omega/omega-transaction/src/test/java/org/apache/servicecomb/{saga => pack}/omega/transaction/tcc/TccStartAnnotationProcessorTest.java (88%)
rename omega/omega-transaction/src/test/java/org/apache/servicecomb/{saga => pack}/omega/transaction/tcc/TccStartAspectTest.java (89%)
rename omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transport/dubbo/SagaDubboConsumerFilter.java (88%)
rename omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transport/dubbo/SagaDubboProviderFilter.java (88%)
rename omega/omega-transport/omega-transport-dubbo/src/test/java/{ => org/apache/servicecomb/pack/omega/transport/dubbo}/SagaDubboConsumerFilterTest.java (91%)
rename omega/omega-transport/omega-transport-dubbo/src/test/java/{ => org/apache/servicecomb/pack/omega/transport/dubbo}/SagaDubboProviderFilterTest.java (92%)
rename omega/omega-transport/omega-transport-feign/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transport/feign/FeignAutoConfiguration.java (92%)
rename omega/omega-transport/omega-transport-feign/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transport/feign/FeignClientRequestInterceptor.java (88%)
rename omega/omega-transport/omega-transport-feign/src/test/java/org/apache/servicecomb/{saga => pack}/omega/transport/feign/FeignAutoConfigurationTest.java (93%)
rename omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transport/resttemplate/RestTemplateConfig.java (92%)
rename omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transport/resttemplate/TransactionClientHttpRequestInterceptor.java (87%)
rename omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transport/resttemplate/TransactionHandlerInterceptor.java (89%)
rename omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transport/resttemplate/WebConfig.java (93%)
rename omega/omega-transport/omega-transport-resttemplate/src/test/java/org/apache/servicecomb/{saga => pack}/omega/transport/resttemplate/TransactionClientHttpRequestInterceptorTest.java (94%)
rename omega/omega-transport/omega-transport-resttemplate/src/test/java/org/apache/servicecomb/{saga => pack}/omega/transport/resttemplate/TransactionHandlerInterceptorTest.java (93%)
rename omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transport/servicecomb/SagaConsumerHandler.java (90%)
rename omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/{saga => pack}/omega/transport/servicecomb/SagaProviderHandler.java (90%)
rename omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/{saga => pack}/omega/transport/servicecomb/SagaConsumerHandlerTest.java (93%)
rename omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/{saga => pack}/omega/transport/servicecomb/SagaProviderHandlerTest.java (88%)
rename pack-common/src/main/java/org/apache/servicecomb/{saga => pack}/common/EventType.java (95%)
rename pack-common/src/main/java/org/apache/servicecomb/{saga => pack}/common/TransactionStatus.java (95%)
rename persistence/persistence-jpa/src/main/java/org/apache/servicecomb/{saga => pack}/persistence/jpa/EclipseLinkJpaConfiguration.java (97%)
[servicecomb-pack] 03/03: 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 SCB-976
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
commit 017fb1c4bd6209ef739c79a550a30898de33985d
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] 02/03: 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 SCB-976
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
commit 1f41088b8ab1aed1ba9632b7a3be166c85d27d61
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] 01/03: 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 SCB-976
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
commit 32e8af6b9067fd5f64f522e711d35aa3bb6ca958
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,