This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch SCB-692 in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git
commit 991b618273fa2566d707ad10812edc8d7621ee7d Author: Willem Jiang <[email protected]> AuthorDate: Wed Jul 25 15:15:37 2018 +0800 SCB-692 Keep fixing the build error --- .../java/org/apache/servicecomb/saga/spring/SagaController.java | 4 ++-- .../apache/servicecomb/saga/spring/SagaExecutionQueryService.java | 2 +- .../java/org/apache/servicecomb/saga/spring/GreetingController.java | 2 +- .../apache/servicecomb/saga/spring/SagaServiceDiscoveryTest.java | 6 ++---- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/saga-spring/src/main/java/org/apache/servicecomb/saga/spring/SagaController.java b/saga-spring/src/main/java/org/apache/servicecomb/saga/spring/SagaController.java index 1a73b7b..5271f95 100644 --- a/saga-spring/src/main/java/org/apache/servicecomb/saga/spring/SagaController.java +++ b/saga-spring/src/main/java/org/apache/servicecomb/saga/spring/SagaController.java @@ -46,10 +46,10 @@ import org.springframework.web.bind.annotation.RequestParam; import com.fasterxml.jackson.annotation.JsonAutoDetect; -import io.servicecomb.provider.rest.common.RestSchema; +import org.apache.servicecomb.provider.rest.common.RestSchema; import org.apache.servicecomb.saga.core.SagaException; import org.apache.servicecomb.saga.core.application.SagaExecutionComponent; -import io.servicecomb.swagger.invocation.exception.InvocationException; +import org.apache.servicecomb.swagger.invocation.exception.InvocationException; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; import kamon.annotation.EnableKamon; diff --git a/saga-spring/src/main/java/org/apache/servicecomb/saga/spring/SagaExecutionQueryService.java b/saga-spring/src/main/java/org/apache/servicecomb/saga/spring/SagaExecutionQueryService.java index 15f8cc5..356131b 100644 --- a/saga-spring/src/main/java/org/apache/servicecomb/saga/spring/SagaExecutionQueryService.java +++ b/saga-spring/src/main/java/org/apache/servicecomb/saga/spring/SagaExecutionQueryService.java @@ -56,7 +56,7 @@ import org.apache.servicecomb.saga.core.TransactionEndedEvent; import org.apache.servicecomb.saga.core.application.interpreter.FromJsonFormat; import org.apache.servicecomb.saga.core.dag.GraphBuilder; -import io.servicecomb.swagger.invocation.exception.InvocationException; +import org.apache.servicecomb.swagger.invocation.exception.InvocationException; @Service public class SagaExecutionQueryService { diff --git a/saga-spring/src/test/java/org/apache/servicecomb/saga/spring/GreetingController.java b/saga-spring/src/test/java/org/apache/servicecomb/saga/spring/GreetingController.java index 0710c01..4d9cab0 100644 --- a/saga-spring/src/test/java/org/apache/servicecomb/saga/spring/GreetingController.java +++ b/saga-spring/src/test/java/org/apache/servicecomb/saga/spring/GreetingController.java @@ -25,7 +25,7 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestAttribute; import org.springframework.web.bind.annotation.RequestMapping; -import io.servicecomb.provider.rest.common.RestSchema; +import org.apache.servicecomb.provider.rest.common.RestSchema; @Controller @RequestMapping("/rest") diff --git a/saga-spring/src/test/java/org/apache/servicecomb/saga/spring/SagaServiceDiscoveryTest.java b/saga-spring/src/test/java/org/apache/servicecomb/saga/spring/SagaServiceDiscoveryTest.java index 7ca683c..92aaf4a 100644 --- a/saga-spring/src/test/java/org/apache/servicecomb/saga/spring/SagaServiceDiscoveryTest.java +++ b/saga-spring/src/test/java/org/apache/servicecomb/saga/spring/SagaServiceDiscoveryTest.java @@ -19,7 +19,7 @@ package org.apache.servicecomb.saga.spring; import static io.restassured.RestAssured.given; import static io.restassured.http.ContentType.TEXT; -import static io.servicecomb.serviceregistry.client.LocalServiceRegistryClientImpl.LOCAL_REGISTRY_FILE_KEY; +import static org.apache.servicecomb.serviceregistry.client.LocalServiceRegistryClientImpl.LOCAL_REGISTRY_FILE_KEY; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; @@ -83,9 +83,7 @@ public class SagaServiceDiscoveryTest { } private static void setUpLocalRegistry() { - ClassLoader loader = Thread.currentThread().getContextClassLoader(); - URL resource = loader.getResource("registry.yaml"); - System.setProperty(LOCAL_REGISTRY_FILE_KEY, resource.getPath()); + System.setProperty(LOCAL_REGISTRY_FILE_KEY,"notExistJustForceLocal"); } @Test
