From: Ofir Sonsino Date: Wed, 22 Aug 2018 17:58:19 +0000 (+0000) Subject: Merge "Fix missing table when running docker" X-Git-Tag: 3.0.0~31 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=df5c2a05532cfb04dc3b08205145e38cecf0ed65;hp=0a5870988cc87a4edcf46d01ae3286ccfc8319d8;p=vid.git Merge "Fix missing table when running docker" --- diff --git a/vid-ext-services-simulator/README.txt b/vid-ext-services-simulator/README.txt index 71a4e351d..033210309 100644 --- a/vid-ext-services-simulator/README.txt +++ b/vid-ext-services-simulator/README.txt @@ -254,7 +254,7 @@ Running - sunny flow: GET /vidSimulator/scheduler/testApiGet HTTP/1.1 Host: localhost:7080 Content-Type: application/json - X-Simulator-Id: pavelId + X-Simulator-Id: pavelIdGet Cache-Control: no-cache Response: diff --git a/vid-ext-services-simulator/src/main/java/org/openecomp/simulator/controller/SimulatorController.java b/vid-ext-services-simulator/src/main/java/org/onap/simulator/controller/SimulatorController.java similarity index 98% rename from vid-ext-services-simulator/src/main/java/org/openecomp/simulator/controller/SimulatorController.java rename to vid-ext-services-simulator/src/main/java/org/onap/simulator/controller/SimulatorController.java index c8b4083dc..b67c98ee9 100644 --- a/vid-ext-services-simulator/src/main/java/org/openecomp/simulator/controller/SimulatorController.java +++ b/vid-ext-services-simulator/src/main/java/org/onap/simulator/controller/SimulatorController.java @@ -1,4 +1,4 @@ -package org.openecomp.simulator.controller; +package org.onap.simulator.controller; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; @@ -10,8 +10,8 @@ import static org.mockserver.model.HttpRequest.request; import static org.mockserver.model.HttpResponse.response; import org.mockserver.model.JsonBody; -import org.openecomp.simulator.errorHandling.VidSimulatorException; -import org.openecomp.simulator.model.SimulatorRequestResponseExpectation; +import org.onap.simulator.errorHandling.VidSimulatorException; +import org.onap.simulator.model.SimulatorRequestResponseExpectation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.io.ClassPathResource; diff --git a/vid-ext-services-simulator/src/main/java/org/openecomp/simulator/errorHandling/VidSimulatorException.java b/vid-ext-services-simulator/src/main/java/org/onap/simulator/errorHandling/VidSimulatorException.java similarity index 74% rename from vid-ext-services-simulator/src/main/java/org/openecomp/simulator/errorHandling/VidSimulatorException.java rename to vid-ext-services-simulator/src/main/java/org/onap/simulator/errorHandling/VidSimulatorException.java index 3a67f26c2..0da482549 100644 --- a/vid-ext-services-simulator/src/main/java/org/openecomp/simulator/errorHandling/VidSimulatorException.java +++ b/vid-ext-services-simulator/src/main/java/org/onap/simulator/errorHandling/VidSimulatorException.java @@ -1,4 +1,4 @@ -package org.openecomp.simulator.errorHandling; +package org.onap.simulator.errorHandling; public class VidSimulatorException extends Exception { diff --git a/vid-ext-services-simulator/src/main/java/org/openecomp/simulator/model/Misc.java b/vid-ext-services-simulator/src/main/java/org/onap/simulator/model/Misc.java similarity index 94% rename from vid-ext-services-simulator/src/main/java/org/openecomp/simulator/model/Misc.java rename to vid-ext-services-simulator/src/main/java/org/onap/simulator/model/Misc.java index 03cb498a7..f5750dd78 100644 --- a/vid-ext-services-simulator/src/main/java/org/openecomp/simulator/model/Misc.java +++ b/vid-ext-services-simulator/src/main/java/org/onap/simulator/model/Misc.java @@ -1,4 +1,4 @@ -package org.openecomp.simulator.model; +package org.onap.simulator.model; public class Misc { private Integer numberOfTimes; diff --git a/vid-ext-services-simulator/src/main/java/org/openecomp/simulator/model/SimulatorRequest.java b/vid-ext-services-simulator/src/main/java/org/onap/simulator/model/SimulatorRequest.java similarity index 97% rename from vid-ext-services-simulator/src/main/java/org/openecomp/simulator/model/SimulatorRequest.java rename to vid-ext-services-simulator/src/main/java/org/onap/simulator/model/SimulatorRequest.java index 6c619b399..9e298b916 100644 --- a/vid-ext-services-simulator/src/main/java/org/openecomp/simulator/model/SimulatorRequest.java +++ b/vid-ext-services-simulator/src/main/java/org/onap/simulator/model/SimulatorRequest.java @@ -1,4 +1,4 @@ -package org.openecomp.simulator.model; +package org.onap.simulator.model; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.JsonNode; diff --git a/vid-ext-services-simulator/src/main/java/org/openecomp/simulator/model/SimulatorRequestResponseExpectation.java b/vid-ext-services-simulator/src/main/java/org/onap/simulator/model/SimulatorRequestResponseExpectation.java similarity index 97% rename from vid-ext-services-simulator/src/main/java/org/openecomp/simulator/model/SimulatorRequestResponseExpectation.java rename to vid-ext-services-simulator/src/main/java/org/onap/simulator/model/SimulatorRequestResponseExpectation.java index 566de5c6a..a7d3a9b7b 100644 --- a/vid-ext-services-simulator/src/main/java/org/openecomp/simulator/model/SimulatorRequestResponseExpectation.java +++ b/vid-ext-services-simulator/src/main/java/org/onap/simulator/model/SimulatorRequestResponseExpectation.java @@ -1,4 +1,4 @@ -package org.openecomp.simulator.model; +package org.onap.simulator.model; import com.fasterxml.jackson.annotation.JsonInclude; import org.slf4j.Logger; diff --git a/vid-ext-services-simulator/src/main/java/org/openecomp/simulator/model/SimulatorResponse.java b/vid-ext-services-simulator/src/main/java/org/onap/simulator/model/SimulatorResponse.java similarity index 97% rename from vid-ext-services-simulator/src/main/java/org/openecomp/simulator/model/SimulatorResponse.java rename to vid-ext-services-simulator/src/main/java/org/onap/simulator/model/SimulatorResponse.java index 799075771..4836185f9 100644 --- a/vid-ext-services-simulator/src/main/java/org/openecomp/simulator/model/SimulatorResponse.java +++ b/vid-ext-services-simulator/src/main/java/org/onap/simulator/model/SimulatorResponse.java @@ -1,4 +1,4 @@ -package org.openecomp.simulator.model; +package org.onap.simulator.model; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.JsonNode; diff --git a/vid-ext-services-simulator/src/main/java/org/openecomp/simulator/service/TranslatorService.java b/vid-ext-services-simulator/src/main/java/org/onap/simulator/service/TranslatorService.java similarity index 84% rename from vid-ext-services-simulator/src/main/java/org/openecomp/simulator/service/TranslatorService.java rename to vid-ext-services-simulator/src/main/java/org/onap/simulator/service/TranslatorService.java index f675d39fe..3894e90db 100644 --- a/vid-ext-services-simulator/src/main/java/org/openecomp/simulator/service/TranslatorService.java +++ b/vid-ext-services-simulator/src/main/java/org/onap/simulator/service/TranslatorService.java @@ -1,8 +1,8 @@ -//package org.openecomp.simulator.service; +//package org.onap.simulator.service; // //import org.mockserver.model.HttpRequest; //import org.mockserver.model.HttpResponse; -//import org.openecomp.simulator.model.ExpectationModel; +//import org.onap.simulator.model.ExpectationModel; //import org.springframework.stereotype.Component; // //import static org.mockserver.model.HttpRequest.request; diff --git a/vid-ext-services-simulator/src/main/webapp/WEB-INF/rest-servlet.xml b/vid-ext-services-simulator/src/main/webapp/WEB-INF/rest-servlet.xml index 6d06fea1e..30c31285b 100644 --- a/vid-ext-services-simulator/src/main/webapp/WEB-INF/rest-servlet.xml +++ b/vid-ext-services-simulator/src/main/webapp/WEB-INF/rest-servlet.xml @@ -9,5 +9,5 @@ + base-package="org.onap.simulator" /> \ No newline at end of file