From 46c1a40e6cb283f7d42270b877401d584d168494 Mon Sep 17 00:00:00 2001
From: Geora Barsky <georab@amdocs.com>
Date: Fri, 22 Sep 2017 12:47:03 -0400
Subject: [PATCH] Sniro Emulator - Move to different location

Change location of sniro emulator project from intgration/test/mock to integration/test/mocks/sniroemulator

Change-Id: I808525d0d8ec23e785a5f06b7ba43a003a00d6fc
JIRA-ID: INT-215
Signed-off-by: Geora Barsky <georab@amdocs.com>
---
 test/{mock => mocks/sniroemulator}/pom.xml                          | 6 +++---
 test/{mock => mocks/sniroemulator}/src/main/docker/Dockerfile       | 2 +-
 .../sniroemulator}/src/main/docker/docker-entrypoint.sh             | 0
 .../onap/integration/test/mocks/sniroemulator}/MockApplication.java | 4 ++--
 .../test/mocks/sniroemulator}/extension/WebhookDefinition.java      | 2 +-
 .../integration/test/mocks/sniroemulator}/extension/Webhooks.java   | 2 +-
 .../sniroemulator}/src/main/resources/application.properties        | 0
 .../integration/test/mocks/sniroemulator}/MockApplicationTests.java | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)
 rename test/{mock => mocks/sniroemulator}/pom.xml (96%)
 rename test/{mock => mocks/sniroemulator}/src/main/docker/Dockerfile (73%)
 rename test/{mock => mocks/sniroemulator}/src/main/docker/docker-entrypoint.sh (100%)
 rename test/{mock/src/main/java/org/onap/integration/test/mock => mocks/sniroemulator/src/main/java/org/onap/integration/test/mocks/sniroemulator}/MockApplication.java (97%)
 rename test/{mock/src/main/java/org/onap/integration/test/mock => mocks/sniroemulator/src/main/java/org/onap/integration/test/mocks/sniroemulator}/extension/WebhookDefinition.java (97%)
 rename test/{mock/src/main/java/org/onap/integration/test/mock => mocks/sniroemulator/src/main/java/org/onap/integration/test/mocks/sniroemulator}/extension/Webhooks.java (98%)
 rename test/{mock => mocks/sniroemulator}/src/main/resources/application.properties (100%)
 rename test/{mock/src/test/java/org/onap/integration/test/mock => mocks/sniroemulator/src/test/java/org/onap/integration/test/mocks/sniroemulator}/MockApplicationTests.java (84%)

diff --git a/test/mock/pom.xml b/test/mocks/sniroemulator/pom.xml
similarity index 96%
rename from test/mock/pom.xml
rename to test/mocks/sniroemulator/pom.xml
index 56aad78f2..7faff9356 100644
--- a/test/mock/pom.xml
+++ b/test/mocks/sniroemulator/pom.xml
@@ -4,10 +4,10 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.integration</groupId>
-    <artifactId>mock</artifactId>
+    <artifactId>sniroemulator</artifactId>
     <version>1.0-SNAPSHOT</version>
-    <name>mock</name>
-    <description>onap emulator project based on  Spring Boot</description>
+    <name>sniroemulator</name>
+    <description>onap sniro emulator project based on  Spring Boot</description>
 
 <parent>
     <groupId>org.springframework.boot</groupId>
diff --git a/test/mock/src/main/docker/Dockerfile b/test/mocks/sniroemulator/src/main/docker/Dockerfile
similarity index 73%
rename from test/mock/src/main/docker/Dockerfile
rename to test/mocks/sniroemulator/src/main/docker/Dockerfile
index b1bf4d93c..05f3a5a2b 100644
--- a/test/mock/src/main/docker/Dockerfile
+++ b/test/mocks/sniroemulator/src/main/docker/Dockerfile
@@ -4,7 +4,7 @@ MAINTAINER Geora Barsky <georab@amdocs.com>
 
 RUN mkdir -p /var/wiremock/lib/ 
 
-ADD mock.jar /var/wiremock/lib/app.jar
+ADD sniroemulator.jar /var/wiremock/lib/app.jar
 
 WORKDIR /home/wiremock
 
diff --git a/test/mock/src/main/docker/docker-entrypoint.sh b/test/mocks/sniroemulator/src/main/docker/docker-entrypoint.sh
similarity index 100%
rename from test/mock/src/main/docker/docker-entrypoint.sh
rename to test/mocks/sniroemulator/src/main/docker/docker-entrypoint.sh
diff --git a/test/mock/src/main/java/org/onap/integration/test/mock/MockApplication.java b/test/mocks/sniroemulator/src/main/java/org/onap/integration/test/mocks/sniroemulator/MockApplication.java
similarity index 97%
rename from test/mock/src/main/java/org/onap/integration/test/mock/MockApplication.java
rename to test/mocks/sniroemulator/src/main/java/org/onap/integration/test/mocks/sniroemulator/MockApplication.java
index 115cb252a..5e47c7ca0 100644
--- a/test/mock/src/main/java/org/onap/integration/test/mock/MockApplication.java
+++ b/test/mocks/sniroemulator/src/main/java/org/onap/integration/test/mocks/sniroemulator/MockApplication.java
@@ -1,4 +1,4 @@
-package org.onap.integration.test.mock;
+package org.onap.integration.test.mocks.sniroemulator;
 
 import static com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder.responseDefinition;
 import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl;
@@ -71,7 +71,7 @@ public class MockApplication {
 		mappingsFileSource.createIfNecessary();
 		
 		// Register extension
-		options.extensions("org.onap.integration.test.mock.extension.Webhooks");
+		options.extensions("org.onap.integration.test.mocks.sniroemulator.extension.Webhooks");
 		// Register notifier
         options.notifier(new ConsoleNotifier(true));   
         wireMockServer = new WireMockServer(options);
diff --git a/test/mock/src/main/java/org/onap/integration/test/mock/extension/WebhookDefinition.java b/test/mocks/sniroemulator/src/main/java/org/onap/integration/test/mocks/sniroemulator/extension/WebhookDefinition.java
similarity index 97%
rename from test/mock/src/main/java/org/onap/integration/test/mock/extension/WebhookDefinition.java
rename to test/mocks/sniroemulator/src/main/java/org/onap/integration/test/mocks/sniroemulator/extension/WebhookDefinition.java
index dff99fd41..cccf06018 100644
--- a/test/mock/src/main/java/org/onap/integration/test/mock/extension/WebhookDefinition.java
+++ b/test/mocks/sniroemulator/src/main/java/org/onap/integration/test/mocks/sniroemulator/extension/WebhookDefinition.java
@@ -1,4 +1,4 @@
-package org.onap.integration.test.mock.extension;
+package org.onap.integration.test.mocks.sniroemulator.extension;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/test/mock/src/main/java/org/onap/integration/test/mock/extension/Webhooks.java b/test/mocks/sniroemulator/src/main/java/org/onap/integration/test/mocks/sniroemulator/extension/Webhooks.java
similarity index 98%
rename from test/mock/src/main/java/org/onap/integration/test/mock/extension/Webhooks.java
rename to test/mocks/sniroemulator/src/main/java/org/onap/integration/test/mocks/sniroemulator/extension/Webhooks.java
index cb17ba658..12d52f4d4 100644
--- a/test/mock/src/main/java/org/onap/integration/test/mock/extension/Webhooks.java
+++ b/test/mocks/sniroemulator/src/main/java/org/onap/integration/test/mocks/sniroemulator/extension/Webhooks.java
@@ -1,4 +1,4 @@
-package org.onap.integration.test.mock.extension;
+package org.onap.integration.test.mocks.sniroemulator.extension;
 
 import com.github.tomakehurst.wiremock.common.Notifier;
 import com.github.tomakehurst.wiremock.core.Admin;
diff --git a/test/mock/src/main/resources/application.properties b/test/mocks/sniroemulator/src/main/resources/application.properties
similarity index 100%
rename from test/mock/src/main/resources/application.properties
rename to test/mocks/sniroemulator/src/main/resources/application.properties
diff --git a/test/mock/src/test/java/org/onap/integration/test/mock/MockApplicationTests.java b/test/mocks/sniroemulator/src/test/java/org/onap/integration/test/mocks/sniroemulator/MockApplicationTests.java
similarity index 84%
rename from test/mock/src/test/java/org/onap/integration/test/mock/MockApplicationTests.java
rename to test/mocks/sniroemulator/src/test/java/org/onap/integration/test/mocks/sniroemulator/MockApplicationTests.java
index 8d2a04625..a5911cbdb 100644
--- a/test/mock/src/test/java/org/onap/integration/test/mock/MockApplicationTests.java
+++ b/test/mocks/sniroemulator/src/test/java/org/onap/integration/test/mocks/sniroemulator/MockApplicationTests.java
@@ -1,4 +1,4 @@
-package org.onap.integration.test.mock;
+package org.onap.integration.test.mocks.sniroemulator;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-- 
2.16.6