From 5be3b78cd2fdef0aa053107d4c936878dbf35c75 Mon Sep 17 00:00:00 2001 From: Varun Gudisena Date: Thu, 31 Aug 2017 10:55:18 -0500 Subject: [PATCH] Revert package name changes Reverted package name changes to avoid any potential issues. Renamed maven group id only. Issue-id: DMAAP-74 Change-Id: Iba0602915e28e14e018aa7b8e8261668135b5410 Signed-off-by: Varun Gudisena --- pom.xml | 17 +---------------- src/main/config/mmagent.config | 2 +- src/main/config/mmagent.config_old | 2 +- src/main/config/template.lrm.xml | 2 +- .../att}/nsa/dmaapMMAgent/MirrorMakerAgent.java | 16 ++++++++-------- .../att}/nsa/dmaapMMAgent/dao/CreateMirrorMaker.java | 2 +- .../att}/nsa/dmaapMMAgent/dao/DeleteMirrorMaker.java | 2 +- .../att}/nsa/dmaapMMAgent/dao/ListMirrorMaker.java | 2 +- .../att}/nsa/dmaapMMAgent/dao/MirrorMaker.java | 2 +- .../att}/nsa/dmaapMMAgent/dao/UpdateMirrorMaker.java | 2 +- .../att}/nsa/dmaapMMAgent/dao/UpdateWhiteList.java | 2 +- .../dmaapMMAgent/utils/MirrorMakerProcessHandler.java | 5 +++-- .../att}/nsa/dmaapMMAgent/AppTest.java | 2 +- 13 files changed, 22 insertions(+), 36 deletions(-) rename src/main/java/{org/onap/dmaap/messagerouter/mirroragent => com/att}/nsa/dmaapMMAgent/MirrorMakerAgent.java (96%) rename src/main/java/{org/onap/dmaap/messagerouter/mirroragent => com/att}/nsa/dmaapMMAgent/dao/CreateMirrorMaker.java (95%) rename src/main/java/{org/onap/dmaap/messagerouter/mirroragent => com/att}/nsa/dmaapMMAgent/dao/DeleteMirrorMaker.java (95%) rename src/main/java/{org/onap/dmaap/messagerouter/mirroragent => com/att}/nsa/dmaapMMAgent/dao/ListMirrorMaker.java (96%) rename src/main/java/{org/onap/dmaap/messagerouter/mirroragent => com/att}/nsa/dmaapMMAgent/dao/MirrorMaker.java (96%) rename src/main/java/{org/onap/dmaap/messagerouter/mirroragent => com/att}/nsa/dmaapMMAgent/dao/UpdateMirrorMaker.java (95%) rename src/main/java/{org/onap/dmaap/messagerouter/mirroragent => com/att}/nsa/dmaapMMAgent/dao/UpdateWhiteList.java (95%) rename src/main/java/{org/onap/dmaap/messagerouter/mirroragent => com/att}/nsa/dmaapMMAgent/utils/MirrorMakerProcessHandler.java (97%) rename src/test/java/{org/onap/dmaap/messagerouter/mirroragent => com/att}/nsa/dmaapMMAgent/AppTest.java (96%) diff --git a/pom.xml b/pom.xml index 1cb4120..cc1cb45 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,6 @@ dmaapMMAgent Mirror Maker Agent - Repliaction agent - https://github.com/att/dmaap-framework UTF-8 @@ -131,7 +130,7 @@ true - org.onap.dmaap.messagerouter.mirroragent.nsa.dmaapMMAgent.MirrorMakerAgent + com.att.nsa.dmaapMMAgent.MirrorMakerAgent @@ -146,20 +145,6 @@ - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - - sign-artifacts - verify - - sign - - - - diff --git a/src/main/config/mmagent.config b/src/main/config/mmagent.config index 9e43eae..1d978c1 100644 --- a/src/main/config/mmagent.config +++ b/src/main/config/mmagent.config @@ -1,7 +1,7 @@ #kafkahome=C:/dev/att/kafka_2.10-0.8.2.1 kafkahome=/opt/ topicURL=http://172.18.0.1:3904 -#topicname=org.onap.dmaap.messagerouter.mirroragent.agenttest +#topicname=com.att.agenttest topicname=org.openecomp.dmaapBC.mmatopic mechid=dgl@openecomp.org password=ecomp_admin \ No newline at end of file diff --git a/src/main/config/mmagent.config_old b/src/main/config/mmagent.config_old index a0b80df..840ecca 100644 --- a/src/main/config/mmagent.config_old +++ b/src/main/config/mmagent.config_old @@ -1,5 +1,5 @@ kafkahome=/opt/app/dmaap/msgrtr/kafka topicURL=http://:3904 -topicname=org.onap.dmaap.messagerouter.mirroragent.agenttest +topicname=com.att.agenttest mechid= password= \ No newline at end of file diff --git a/src/main/config/template.lrm.xml b/src/main/config/template.lrm.xml index a36cf2c..5b7403c 100644 --- a/src/main/config/template.lrm.xml +++ b/src/main/config/template.lrm.xml @@ -96,7 +96,7 @@ start.class - org.onap.dmaap.messagerouter.mirroragent.nsa.dmaapMMAgent.MirrorMakerAgent + com.att.nsa.dmaapMMAgent.MirrorMakerAgent stdout.redirect diff --git a/src/main/java/org/onap/dmaap/messagerouter/mirroragent/nsa/dmaapMMAgent/MirrorMakerAgent.java b/src/main/java/com/att/nsa/dmaapMMAgent/MirrorMakerAgent.java similarity index 96% rename from src/main/java/org/onap/dmaap/messagerouter/mirroragent/nsa/dmaapMMAgent/MirrorMakerAgent.java rename to src/main/java/com/att/nsa/dmaapMMAgent/MirrorMakerAgent.java index b6644b6..705a9c2 100644 --- a/src/main/java/org/onap/dmaap/messagerouter/mirroragent/nsa/dmaapMMAgent/MirrorMakerAgent.java +++ b/src/main/java/com/att/nsa/dmaapMMAgent/MirrorMakerAgent.java @@ -20,7 +20,7 @@ * *******************************************************************************/ -package org.onap.dmaap.messagerouter.mirroragent.nsa.dmaapMMAgent; +package com.att.nsa.dmaapMMAgent; import java.io.BufferedReader; import java.io.DataOutputStream; @@ -38,14 +38,14 @@ import java.util.Properties; import org.apache.log4j.Logger; import org.jasypt.util.text.BasicTextEncryptor; -import org.onap.dmaap.messagerouter.mirroragent.nsa.dmaapMMAgent.dao.CreateMirrorMaker; -import org.onap.dmaap.messagerouter.mirroragent.nsa.dmaapMMAgent.dao.DeleteMirrorMaker; -import org.onap.dmaap.messagerouter.mirroragent.nsa.dmaapMMAgent.dao.ListMirrorMaker; -import org.onap.dmaap.messagerouter.mirroragent.nsa.dmaapMMAgent.dao.MirrorMaker; -import org.onap.dmaap.messagerouter.mirroragent.nsa.dmaapMMAgent.dao.UpdateMirrorMaker; -import org.onap.dmaap.messagerouter.mirroragent.nsa.dmaapMMAgent.dao.UpdateWhiteList; -import org.onap.dmaap.messagerouter.mirroragent.nsa.dmaapMMAgent.utils.MirrorMakerProcessHandler; +import com.att.nsa.dmaapMMAgent.dao.CreateMirrorMaker; +import com.att.nsa.dmaapMMAgent.dao.DeleteMirrorMaker; +import com.att.nsa.dmaapMMAgent.dao.ListMirrorMaker; +import com.att.nsa.dmaapMMAgent.dao.MirrorMaker; +import com.att.nsa.dmaapMMAgent.dao.UpdateMirrorMaker; +import com.att.nsa.dmaapMMAgent.dao.UpdateWhiteList; +import com.att.nsa.dmaapMMAgent.utils.MirrorMakerProcessHandler; import com.google.gson.Gson; import com.google.gson.internal.LinkedTreeMap; import com.sun.org.apache.xerces.internal.impl.dtd.models.CMAny; diff --git a/src/main/java/org/onap/dmaap/messagerouter/mirroragent/nsa/dmaapMMAgent/dao/CreateMirrorMaker.java b/src/main/java/com/att/nsa/dmaapMMAgent/dao/CreateMirrorMaker.java similarity index 95% rename from src/main/java/org/onap/dmaap/messagerouter/mirroragent/nsa/dmaapMMAgent/dao/CreateMirrorMaker.java rename to src/main/java/com/att/nsa/dmaapMMAgent/dao/CreateMirrorMaker.java index bf1207a..7094ba4 100644 --- a/src/main/java/org/onap/dmaap/messagerouter/mirroragent/nsa/dmaapMMAgent/dao/CreateMirrorMaker.java +++ b/src/main/java/com/att/nsa/dmaapMMAgent/dao/CreateMirrorMaker.java @@ -20,7 +20,7 @@ * *******************************************************************************/ -package org.onap.dmaap.messagerouter.mirroragent.nsa.dmaapMMAgent.dao; +package com.att.nsa.dmaapMMAgent.dao; public class CreateMirrorMaker { String messageID; diff --git a/src/main/java/org/onap/dmaap/messagerouter/mirroragent/nsa/dmaapMMAgent/dao/DeleteMirrorMaker.java b/src/main/java/com/att/nsa/dmaapMMAgent/dao/DeleteMirrorMaker.java similarity index 95% rename from src/main/java/org/onap/dmaap/messagerouter/mirroragent/nsa/dmaapMMAgent/dao/DeleteMirrorMaker.java rename to src/main/java/com/att/nsa/dmaapMMAgent/dao/DeleteMirrorMaker.java index dcabff6..68ef2e2 100644 --- a/src/main/java/org/onap/dmaap/messagerouter/mirroragent/nsa/dmaapMMAgent/dao/DeleteMirrorMaker.java +++ b/src/main/java/com/att/nsa/dmaapMMAgent/dao/DeleteMirrorMaker.java @@ -20,7 +20,7 @@ * *******************************************************************************/ -package org.onap.dmaap.messagerouter.mirroragent.nsa.dmaapMMAgent.dao; +package com.att.nsa.dmaapMMAgent.dao; public class DeleteMirrorMaker { String messageID; diff --git a/src/main/java/org/onap/dmaap/messagerouter/mirroragent/nsa/dmaapMMAgent/dao/ListMirrorMaker.java b/src/main/java/com/att/nsa/dmaapMMAgent/dao/ListMirrorMaker.java similarity index 96% rename from src/main/java/org/onap/dmaap/messagerouter/mirroragent/nsa/dmaapMMAgent/dao/ListMirrorMaker.java rename to src/main/java/com/att/nsa/dmaapMMAgent/dao/ListMirrorMaker.java index 56953be..7ca1658 100644 --- a/src/main/java/org/onap/dmaap/messagerouter/mirroragent/nsa/dmaapMMAgent/dao/ListMirrorMaker.java +++ b/src/main/java/com/att/nsa/dmaapMMAgent/dao/ListMirrorMaker.java @@ -20,7 +20,7 @@ * *******************************************************************************/ -package org.onap.dmaap.messagerouter.mirroragent.nsa.dmaapMMAgent.dao; +package com.att.nsa.dmaapMMAgent.dao; import java.util.ArrayList; diff --git a/src/main/java/org/onap/dmaap/messagerouter/mirroragent/nsa/dmaapMMAgent/dao/MirrorMaker.java b/src/main/java/com/att/nsa/dmaapMMAgent/dao/MirrorMaker.java similarity index 96% rename from src/main/java/org/onap/dmaap/messagerouter/mirroragent/nsa/dmaapMMAgent/dao/MirrorMaker.java rename to src/main/java/com/att/nsa/dmaapMMAgent/dao/MirrorMaker.java index d496aea..61426c9 100644 --- a/src/main/java/org/onap/dmaap/messagerouter/mirroragent/nsa/dmaapMMAgent/dao/MirrorMaker.java +++ b/src/main/java/com/att/nsa/dmaapMMAgent/dao/MirrorMaker.java @@ -20,7 +20,7 @@ * *******************************************************************************/ -package org.onap.dmaap.messagerouter.mirroragent.nsa.dmaapMMAgent.dao; +package com.att.nsa.dmaapMMAgent.dao; public class MirrorMaker { public String name; diff --git a/src/main/java/org/onap/dmaap/messagerouter/mirroragent/nsa/dmaapMMAgent/dao/UpdateMirrorMaker.java b/src/main/java/com/att/nsa/dmaapMMAgent/dao/UpdateMirrorMaker.java similarity index 95% rename from src/main/java/org/onap/dmaap/messagerouter/mirroragent/nsa/dmaapMMAgent/dao/UpdateMirrorMaker.java rename to src/main/java/com/att/nsa/dmaapMMAgent/dao/UpdateMirrorMaker.java index d78054f..336d240 100644 --- a/src/main/java/org/onap/dmaap/messagerouter/mirroragent/nsa/dmaapMMAgent/dao/UpdateMirrorMaker.java +++ b/src/main/java/com/att/nsa/dmaapMMAgent/dao/UpdateMirrorMaker.java @@ -20,7 +20,7 @@ * *******************************************************************************/ -package org.onap.dmaap.messagerouter.mirroragent.nsa.dmaapMMAgent.dao; +package com.att.nsa.dmaapMMAgent.dao; public class UpdateMirrorMaker { String messageID; diff --git a/src/main/java/org/onap/dmaap/messagerouter/mirroragent/nsa/dmaapMMAgent/dao/UpdateWhiteList.java b/src/main/java/com/att/nsa/dmaapMMAgent/dao/UpdateWhiteList.java similarity index 95% rename from src/main/java/org/onap/dmaap/messagerouter/mirroragent/nsa/dmaapMMAgent/dao/UpdateWhiteList.java rename to src/main/java/com/att/nsa/dmaapMMAgent/dao/UpdateWhiteList.java index 215fb34..3227c51 100644 --- a/src/main/java/org/onap/dmaap/messagerouter/mirroragent/nsa/dmaapMMAgent/dao/UpdateWhiteList.java +++ b/src/main/java/com/att/nsa/dmaapMMAgent/dao/UpdateWhiteList.java @@ -20,7 +20,7 @@ * *******************************************************************************/ -package org.onap.dmaap.messagerouter.mirroragent.nsa.dmaapMMAgent.dao; +package com.att.nsa.dmaapMMAgent.dao; public class UpdateWhiteList { String messageID; diff --git a/src/main/java/org/onap/dmaap/messagerouter/mirroragent/nsa/dmaapMMAgent/utils/MirrorMakerProcessHandler.java b/src/main/java/com/att/nsa/dmaapMMAgent/utils/MirrorMakerProcessHandler.java similarity index 97% rename from src/main/java/org/onap/dmaap/messagerouter/mirroragent/nsa/dmaapMMAgent/utils/MirrorMakerProcessHandler.java rename to src/main/java/com/att/nsa/dmaapMMAgent/utils/MirrorMakerProcessHandler.java index 05c81be..906fb3e 100644 --- a/src/main/java/org/onap/dmaap/messagerouter/mirroragent/nsa/dmaapMMAgent/utils/MirrorMakerProcessHandler.java +++ b/src/main/java/com/att/nsa/dmaapMMAgent/utils/MirrorMakerProcessHandler.java @@ -20,14 +20,15 @@ * *******************************************************************************/ -package org.onap.dmaap.messagerouter.mirroragent.nsa.dmaapMMAgent.utils; +package com.att.nsa.dmaapMMAgent.utils; import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; import org.apache.log4j.Logger; -import org.onap.dmaap.messagerouter.mirroragent.nsa.dmaapMMAgent.MirrorMakerAgent; + +import com.att.nsa.dmaapMMAgent.MirrorMakerAgent; public class MirrorMakerProcessHandler { static final Logger logger = Logger.getLogger(MirrorMakerProcessHandler.class); diff --git a/src/test/java/org/onap/dmaap/messagerouter/mirroragent/nsa/dmaapMMAgent/AppTest.java b/src/test/java/com/att/nsa/dmaapMMAgent/AppTest.java similarity index 96% rename from src/test/java/org/onap/dmaap/messagerouter/mirroragent/nsa/dmaapMMAgent/AppTest.java rename to src/test/java/com/att/nsa/dmaapMMAgent/AppTest.java index 19a48b8..6fff7f9 100644 --- a/src/test/java/org/onap/dmaap/messagerouter/mirroragent/nsa/dmaapMMAgent/AppTest.java +++ b/src/test/java/com/att/nsa/dmaapMMAgent/AppTest.java @@ -20,7 +20,7 @@ * *******************************************************************************/ -package org.onap.dmaap.messagerouter.mirroragent.nsa.dmaapMMAgent; +package com.att.nsa.dmaapMMAgent; import junit.framework.Test; import junit.framework.TestCase; -- 2.16.6