Merge pull request #660 from dengliming/SCB-1880
[SCB-1880] Remove the EnableOmega annotation
diff --git a/demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/pack/demo/dubbo/servicea/ApplicationA.java b/demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/pack/demo/dubbo/servicea/ApplicationA.java
index 4c9c667..d3772b2 100644
--- a/demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/pack/demo/dubbo/servicea/ApplicationA.java
+++ b/demo/saga-dubbo-demo/servicea/src/main/java/org/apache/servicecomb/pack/demo/dubbo/servicea/ApplicationA.java
@@ -16,13 +16,11 @@
*/
package org.apache.servicecomb.pack.demo.dubbo.servicea;
-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;
@SpringBootApplication
-@EnableOmega
@ImportResource({"dubbo-context.xml", "jdbc.xml"})
public class ApplicationA {
public static void main(String[] args) {
diff --git a/demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/pack/demo/dubbo/serviceb/ApplicationB.java b/demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/pack/demo/dubbo/serviceb/ApplicationB.java
index 737f9cf..95fb6a6 100644
--- a/demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/pack/demo/dubbo/serviceb/ApplicationB.java
+++ b/demo/saga-dubbo-demo/serviceb/src/main/java/org/apache/servicecomb/pack/demo/dubbo/serviceb/ApplicationB.java
@@ -17,13 +17,11 @@
package org.apache.servicecomb.pack.demo.dubbo.serviceb;
-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;
@SpringBootApplication
-@EnableOmega
@ImportResource({"dubbo-context.xml", "jdbc.xml"})
public class ApplicationB {
public static void main(String[] args) {
diff --git a/demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/pack/demo/dubbo/servicec/ApplicationC.java b/demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/pack/demo/dubbo/servicec/ApplicationC.java
index 701a1cb..5ccb2c8 100644
--- a/demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/pack/demo/dubbo/servicec/ApplicationC.java
+++ b/demo/saga-dubbo-demo/servicec/src/main/java/org/apache/servicecomb/pack/demo/dubbo/servicec/ApplicationC.java
@@ -16,13 +16,11 @@
*/
package org.apache.servicecomb.pack.demo.dubbo.servicec;
-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;
@SpringBootApplication
-@EnableOmega
@ImportResource({"dubbo-context.xml", "jdbc.xml"})
public class ApplicationC {
public static void main(String[] args) {
diff --git a/demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/pack/demo/scb/booking/BookingApplication.java b/demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/pack/demo/scb/booking/BookingApplication.java
index a74933e..a7abffb 100644
--- a/demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/pack/demo/scb/booking/BookingApplication.java
+++ b/demo/saga-servicecomb-demo/scb-booking/src/main/java/org/apache/servicecomb/pack/demo/scb/booking/BookingApplication.java
@@ -17,14 +17,12 @@
package org.apache.servicecomb.pack.demo.scb.booking;
-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;
@SpringBootApplication
@EnableServiceComb
-@EnableOmega
public class BookingApplication {
public static void main(String[] args) {
SpringApplication.run(BookingApplication.class, args);
diff --git a/demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/pack/demo/scb/car/CarApplication.java b/demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/pack/demo/scb/car/CarApplication.java
index 8ffe0d3..b96c42f 100644
--- a/demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/pack/demo/scb/car/CarApplication.java
+++ b/demo/saga-servicecomb-demo/scb-car/src/main/java/org/apache/servicecomb/pack/demo/scb/car/CarApplication.java
@@ -17,14 +17,12 @@
package org.apache.servicecomb.pack.demo.scb.car;
-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;
@SpringBootApplication
@EnableServiceComb
-@EnableOmega
public class CarApplication {
public static void main(String[] args) {
SpringApplication.run(CarApplication.class, args);
diff --git a/demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/pack/demo/scb/hotel/HotelApplication.java b/demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/pack/demo/scb/hotel/HotelApplication.java
index b145108..69b5a7d 100644
--- a/demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/pack/demo/scb/hotel/HotelApplication.java
+++ b/demo/saga-servicecomb-demo/scb-hotel/src/main/java/org/apache/servicecomb/pack/demo/scb/hotel/HotelApplication.java
@@ -17,14 +17,12 @@
package org.apache.servicecomb.pack.demo.scb.hotel;
-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;
@SpringBootApplication
@EnableServiceComb
-@EnableOmega
public class HotelApplication {
public static void main(String[] args) {
SpringApplication.run(HotelApplication.class, args);
diff --git a/demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/pack/demo/booking/Application.java b/demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/pack/demo/booking/Application.java
index 03ce0b7..572c403 100644
--- a/demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/pack/demo/booking/Application.java
+++ b/demo/saga-spring-demo/booking/src/main/java/org/apache/servicecomb/pack/demo/booking/Application.java
@@ -17,12 +17,10 @@
package org.apache.servicecomb.pack.demo.booking;
-import org.apache.servicecomb.pack.omega.spring.EnableOmega;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
-@EnableOmega
public class Application {
public static void main(String[] args) {
SpringApplication.run(Application.class, args);
diff --git a/demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/pack/demo/car/Application.java b/demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/pack/demo/car/Application.java
index fc0e47b..5c7fe0e 100644
--- a/demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/pack/demo/car/Application.java
+++ b/demo/saga-spring-demo/car/src/main/java/org/apache/servicecomb/pack/demo/car/Application.java
@@ -17,12 +17,10 @@
package org.apache.servicecomb.pack.demo.car;
-import org.apache.servicecomb.pack.omega.spring.EnableOmega;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
-@EnableOmega
public class Application {
public static void main(String[] args) {
SpringApplication.run(Application.class, args);
diff --git a/demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/pack/demo/hotel/Application.java b/demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/pack/demo/hotel/Application.java
index 1bb9d10..0b2a540 100644
--- a/demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/pack/demo/hotel/Application.java
+++ b/demo/saga-spring-demo/hotel/src/main/java/org/apache/servicecomb/pack/demo/hotel/Application.java
@@ -17,12 +17,10 @@
package org.apache.servicecomb.pack.demo.hotel;
-import org.apache.servicecomb.pack.omega.spring.EnableOmega;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
-@EnableOmega
public class Application {
public static void main(String[] args) {
SpringApplication.run(Application.class, args);
diff --git a/demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/pack/demo/ordering/TccOrderingApplication.java b/demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/pack/demo/ordering/TccOrderingApplication.java
index 7d42c8c..22abc63 100644
--- a/demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/pack/demo/ordering/TccOrderingApplication.java
+++ b/demo/tcc-spring-demo/ordering/src/main/java/org/apache/servicecomb/pack/demo/ordering/TccOrderingApplication.java
@@ -17,12 +17,10 @@
package org.apache.servicecomb.pack.demo.ordering;
-import org.apache.servicecomb.pack.omega.spring.EnableOmega;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
-@EnableOmega
public class TccOrderingApplication {
public static void main(String[] args) {
SpringApplication.run(TccOrderingApplication.class, args);
diff --git a/integration-tests/explicit-transaction-context-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/explicitcontext/GreetingApplication.java b/integration-tests/explicit-transaction-context-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/explicitcontext/GreetingApplication.java
index 080fdfa..4149d87 100644
--- a/integration-tests/explicit-transaction-context-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/explicitcontext/GreetingApplication.java
+++ b/integration-tests/explicit-transaction-context-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/explicitcontext/GreetingApplication.java
@@ -20,7 +20,6 @@
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
-import org.apache.servicecomb.pack.omega.spring.EnableOmega;
import org.apache.servicecomb.pack.omega.transport.resttemplate.RestTemplateConfig;
import org.apache.servicecomb.pack.omega.transport.resttemplate.WebConfig;
import org.springframework.boot.SpringApplication;
@@ -28,10 +27,8 @@
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.context.annotation.Bean;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.web.client.RestTemplate;
-@EnableOmega
@SpringBootApplication(exclude = {WebConfig.class, RestTemplateConfig.class})
@EntityScan(basePackages = "org.apache.servicecomb.pack.alpha")
public class GreetingApplication {
diff --git a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/resttemplate/GreetingApplication.java b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/resttemplate/GreetingApplication.java
index cf5bd7d..a336574 100644
--- a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/resttemplate/GreetingApplication.java
+++ b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/resttemplate/GreetingApplication.java
@@ -20,13 +20,11 @@
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
-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;
import org.springframework.context.annotation.Bean;
-@EnableOmega
@SpringBootApplication
@EntityScan(basePackages = "org.apache.servicecomb.pack.alpha")
public class GreetingApplication {
diff --git a/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/EnableOmega.java b/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/EnableOmega.java
deleted file mode 100644
index 1db88ca..0000000
--- a/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/EnableOmega.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.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.pack.omega.transaction.spring.TransactionAspectConfig;
-
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-/**
- * Indicates create the OmegaContext and inject it into the interceptors
- * to pass the transactions id across the application.
- * @see OmegaContext
- * @deprecated Use configuration omega.enabled, default value is true
- */
-@Deprecated
-public @interface EnableOmega {
-}
