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 <vg411h@att.com>

diff --git a/pom.xml b/pom.xml
index 1cb4120..cc1cb45 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,6 @@
 
        <name>dmaapMMAgent</name>
        <description>Mirror Maker Agent - Repliaction agent</description>
 
        <name>dmaapMMAgent</name>
        <description>Mirror Maker Agent - Repliaction agent</description>

-       <url>https://github.com/att/dmaap-framework</url>

 
        <properties>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
        <properties>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>


@@ -131,7 +130,7 @@
 
                                                <manifest>
                                                        <addClasspath>true</addClasspath>
 
                                                <manifest>
                                                        <addClasspath>true</addClasspath>

-                                                       <mainClass>org.onap.dmaap.messagerouter.mirroragent.nsa.dmaapMMAgent.MirrorMakerAgent</mainClass>
+                                                       <mainClass>com.att.nsa.dmaapMMAgent.MirrorMakerAgent</mainClass>

                                                </manifest>
                                        </archive>
                                </configuration>
                                                </manifest>
                                        </archive>
                                </configuration>


@@ -146,20 +145,6 @@
                                        </execution>
                                </executions>
                        </plugin>
                                        </execution>
                                </executions>
                        </plugin>

-                       <plugin> 
-                                <groupId>org.apache.maven.plugins</groupId> 
-                                <artifactId>maven-gpg-plugin</artifactId> 
-                                    <version>1.5</version> 
-                                    <executions> 
-                                            <execution> 
-                                                    <id>sign-artifacts</id> 
-                                                    <phase>verify</phase> 
-                                                    <goals> 
-                                                       <goal>sign</goal> 
-                                                    </goals> 
-                                         </execution> 
-                                       </executions> 
-                  </plugin>

 
                </plugins>
        </build>
 
                </plugins>
        </build>

diff --git a/src/main/config/mmagent.config b/src/main/config/mmagent.config
index 9e43eae..1d978c1 100644 (file)
--- 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
 #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
 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 (file)
--- 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://<mr_host>:3904
 kafkahome=/opt/app/dmaap/msgrtr/kafka
 topicURL=http://<mr_host>:3904

-topicname=org.onap.dmaap.messagerouter.mirroragent.agenttest
+topicname=com.att.agenttest

 mechid=<aaf_id>
 password=<aaf_password>
\ No newline at end of file
 mechid=<aaf_id>
 password=<aaf_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 (file)
--- a/src/main/config/template.lrm.xml
+++ b/src/main/config/template.lrm.xml
@@ -96,7 +96,7 @@
                </ResourceProps>
                <ResourceProps>
                        <Tag>start.class</Tag>
                </ResourceProps>
                <ResourceProps>
                        <Tag>start.class</Tag>

-                       <Value>org.onap.dmaap.messagerouter.mirroragent.nsa.dmaapMMAgent.MirrorMakerAgent</Value>
+                       <Value>com.att.nsa.dmaapMMAgent.MirrorMakerAgent</Value>

                </ResourceProps>
                <ResourceProps>
                        <Tag>stdout.redirect</Tag>
                </ResourceProps>
                <ResourceProps>
                        <Tag>stdout.redirect</Tag>

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 (file)
--- 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;
 
 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.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;
 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 (file)
--- 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;
 
 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 (file)
--- 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;
 
 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 (file)
--- 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;
 
 
 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 (file)
--- 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;
 
 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 (file)
--- 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;
 
 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 (file)
--- 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;
 
 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 (file)
--- 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 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);
 
 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 (file)
--- 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;
 
 import junit.framework.Test;
 import junit.framework.TestCase;