Revert package name changes

Reverted package name changes to avoid any potential issues. Renamed maven
    group id only.

Issue-id: DMAAP-74
Change-Id: Ic741b602ade60f108d940c0571a1d94b7be2abc2
Signed-off-by: Varun Gudisena <vg411h@att.com>

25 files changed, 32 insertions, 32 deletions

diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/ApiKeyBean.java b/src/test/java/com/att/mr/test/dmaap/ApiKeyBean.java
index dd458eb..3c0bb79 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/ApiKeyBean.java
+++ b/src/test/java/com/att/mr/test/dmaap/ApiKeyBean.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dmaap;
+package com.att.mr.test.dmaap;
 
 import java.io.Serializable;
 
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/DMaapPubSubTest.java b/src/test/java/com/att/mr/test/dmaap/DMaapPubSubTest.java
index 066bf50..fc91598 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/DMaapPubSubTest.java
+++ b/src/test/java/com/att/mr/test/dmaap/DMaapPubSubTest.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dmaap;
+package com.att.mr.test.dmaap;
 
 import java.io.InputStream;
 import java.util.Scanner;
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/DMaapTopicTest.java b/src/test/java/com/att/mr/test/dmaap/DMaapTopicTest.java
index 780ce1a..1b5e746 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/DMaapTopicTest.java
+++ b/src/test/java/com/att/mr/test/dmaap/DMaapTopicTest.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dmaap;
+package com.att.mr.test.dmaap;
 
 import java.io.InputStream;
 import java.util.Properties;
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/DmaapAdminTest.java b/src/test/java/com/att/mr/test/dmaap/DmaapAdminTest.java
index 19e78a9..f3e7fa9 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/DmaapAdminTest.java
+++ b/src/test/java/com/att/mr/test/dmaap/DmaapAdminTest.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dmaap;
+package com.att.mr.test.dmaap;
 
 
 
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/DmaapApiKeyTest.java b/src/test/java/com/att/mr/test/dmaap/DmaapApiKeyTest.java
index e2ed0d4..77a2500 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/DmaapApiKeyTest.java
+++ b/src/test/java/com/att/mr/test/dmaap/DmaapApiKeyTest.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dmaap;
+package com.att.mr.test.dmaap;
 
 import java.io.InputStream;
 import java.util.Properties;
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/DmaapMetricsTest.java b/src/test/java/com/att/mr/test/dmaap/DmaapMetricsTest.java
index 658e274..9728687 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/DmaapMetricsTest.java
+++ b/src/test/java/com/att/mr/test/dmaap/DmaapMetricsTest.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dmaap;
+package com.att.mr.test.dmaap;
 
 import java.io.InputStream;
 import java.util.Scanner;
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/JUnitTestSuite.java b/src/test/java/com/att/mr/test/dmaap/JUnitTestSuite.java
index 4b2d52a..40a5286 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/JUnitTestSuite.java
+++ b/src/test/java/com/att/mr/test/dmaap/JUnitTestSuite.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dmaap;
+package com.att.mr.test.dmaap;
 
 import junit.framework.TestSuite;
 
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/LoadPropertyFile.java b/src/test/java/com/att/mr/test/dmaap/LoadPropertyFile.java
index 8c4afa2..c9d0387 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/LoadPropertyFile.java
+++ b/src/test/java/com/att/mr/test/dmaap/LoadPropertyFile.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dmaap;
+package com.att.mr.test.dmaap;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/TestRunner.java b/src/test/java/com/att/mr/test/dmaap/TestRunner.java
index bffb32e..9a744d9 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/TestRunner.java
+++ b/src/test/java/com/att/mr/test/dmaap/TestRunner.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dmaap;
+package com.att.mr.test.dmaap;
 
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/TopicBean.java b/src/test/java/com/att/mr/test/dmaap/TopicBean.java
index 9c0ddbb..62f9d0c 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dmaap/TopicBean.java
+++ b/src/test/java/com/att/mr/test/dmaap/TopicBean.java
@@ -22,7 +22,7 @@
 /**
  * 
  */
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dmaap;
+package com.att.mr.test.dmaap;
 
 import java.io.Serializable;
 
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/ApiKeyBean.java b/src/test/java/com/att/mr/test/dme2/ApiKeyBean.java
index 03e34ad..e6545e1 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/ApiKeyBean.java
+++ b/src/test/java/com/att/mr/test/dme2/ApiKeyBean.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dme2;
+package com.att.mr.test.dme2;
 
 import java.io.Serializable;
 
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/DME2AdminTest.java b/src/test/java/com/att/mr/test/dme2/DME2AdminTest.java
index ce7f80b..5f6f9c4 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/DME2AdminTest.java
+++ b/src/test/java/com/att/mr/test/dme2/DME2AdminTest.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dme2;
+package com.att.mr.test.dme2;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -27,12 +27,13 @@ import java.util.HashMap;
 import java.util.Properties;
 
 import org.apache.log4j.Logger;
-import org.onap.dmaap.messagerouter.msgrtr.mr.test.dmaap.DmaapAdminTest;
 
 import junit.framework.TestCase;
 
 import com.att.aft.dme2.api.DME2Client;
 import com.att.aft.dme2.api.DME2Exception;
+import com.att.mr.test.dmaap.DmaapAdminTest;
+//import com.ibm.disthub2.impl.client.PropSchema;
 
 public class DME2AdminTest extends TestCase {
 	private static final Logger LOGGER = Logger.getLogger(DME2AdminTest.class);
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/DME2ApiKeyTest.java b/src/test/java/com/att/mr/test/dme2/DME2ApiKeyTest.java
index 9088eb9..ee2ef9d 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/DME2ApiKeyTest.java
+++ b/src/test/java/com/att/mr/test/dme2/DME2ApiKeyTest.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dme2;
+package com.att.mr.test.dme2;
 
 import java.net.URI;
 import java.net.URISyntaxException;
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/DME2ConsumerFilterTest.java b/src/test/java/com/att/mr/test/dme2/DME2ConsumerFilterTest.java
index 3a4bc75..30c13ea 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/DME2ConsumerFilterTest.java
+++ b/src/test/java/com/att/mr/test/dme2/DME2ConsumerFilterTest.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dme2;
+package com.att.mr.test.dme2;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -28,12 +28,12 @@ import java.util.HashMap;
 import java.util.Properties;
 
 import org.apache.log4j.Logger;
-import org.onap.dmaap.messagerouter.msgrtr.mr.test.dmaap.DmaapAdminTest;
 
 import junit.framework.TestCase;
 
 import com.att.aft.dme2.api.DME2Client;
 import com.att.aft.dme2.api.DME2Exception;
+import com.att.mr.test.dmaap.DmaapAdminTest;
 
 public class DME2ConsumerFilterTest extends TestCase {
 	private static final Logger LOGGER = Logger.getLogger(DME2ConsumerFilterTest.class);
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/DME2ConsumerTest.java b/src/test/java/com/att/mr/test/dme2/DME2ConsumerTest.java
index 5406c6a..810f451 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/DME2ConsumerTest.java
+++ b/src/test/java/com/att/mr/test/dme2/DME2ConsumerTest.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dme2;
+package com.att.mr.test.dme2;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -27,12 +27,12 @@ import java.util.HashMap;
 import java.util.Properties;
 
 import org.apache.log4j.Logger;
-import org.onap.dmaap.messagerouter.msgrtr.mr.test.dmaap.DmaapAdminTest;
 
 import junit.framework.TestCase;
 
 import com.att.aft.dme2.api.DME2Client;
 import com.att.aft.dme2.api.DME2Exception;
+import com.att.mr.test.dmaap.DmaapAdminTest;
 
 public class DME2ConsumerTest extends TestCase {
 	private static final Logger LOGGER = Logger.getLogger(DME2ConsumerTest.class);
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/DME2MetricsTest.java b/src/test/java/com/att/mr/test/dme2/DME2MetricsTest.java
index 6f674f4..e7ccebe 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/DME2MetricsTest.java
+++ b/src/test/java/com/att/mr/test/dme2/DME2MetricsTest.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dme2;
+package com.att.mr.test.dme2;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -27,12 +27,12 @@ import java.util.HashMap;
 import java.util.Properties;
 
 import org.apache.log4j.Logger;
-import org.onap.dmaap.messagerouter.msgrtr.mr.test.dmaap.DmaapAdminTest;
 
 import junit.framework.TestCase;
 
 import com.att.aft.dme2.api.DME2Client;
 import com.att.aft.dme2.api.DME2Exception;
+import com.att.mr.test.dmaap.DmaapAdminTest;
 
 public class DME2MetricsTest extends TestCase {
 	private static final Logger LOGGER = Logger.getLogger(DME2MetricsTest.class);
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/DME2ProducerTest.java b/src/test/java/com/att/mr/test/dme2/DME2ProducerTest.java
index 2941b69..71c5e0f 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/DME2ProducerTest.java
+++ b/src/test/java/com/att/mr/test/dme2/DME2ProducerTest.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dme2;
+package com.att.mr.test.dme2;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -27,13 +27,13 @@ import java.util.HashMap;
 import java.util.Properties;
 
 import org.apache.log4j.Logger;
-import org.onap.dmaap.messagerouter.msgrtr.mr.test.dmaap.DmaapAdminTest;
 
 import junit.framework.TestCase;
 
 import com.att.aft.dme2.api.DME2Client;
 import com.att.aft.dme2.api.DME2Exception;
 import com.att.aft.dme2.internal.jackson.map.ObjectMapper;
+import com.att.mr.test.dmaap.DmaapAdminTest;
 
 public class DME2ProducerTest extends TestCase {
 	private static final Logger LOGGER = Logger.getLogger(DmaapAdminTest.class);
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/DME2TopicTest.java b/src/test/java/com/att/mr/test/dme2/DME2TopicTest.java
index bfa25f1..9d26083 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/DME2TopicTest.java
+++ b/src/test/java/com/att/mr/test/dme2/DME2TopicTest.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dme2;
+package com.att.mr.test.dme2;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -29,13 +29,13 @@ import java.util.Properties;
 import javax.ws.rs.client.Entity;
 
 import org.apache.log4j.Logger;
-import org.onap.dmaap.messagerouter.msgrtr.mr.test.dmaap.DmaapAdminTest;
 
 import junit.framework.TestCase;
 
 import com.att.aft.dme2.api.DME2Client;
 import com.att.aft.dme2.api.DME2Exception;
 import com.att.aft.dme2.internal.jackson.map.ObjectMapper;
+import com.att.mr.test.dmaap.DmaapAdminTest;
 
 public class DME2TopicTest extends TestCase {
 	private String latitude;
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/JUnitTestSuite.java b/src/test/java/com/att/mr/test/dme2/JUnitTestSuite.java
index 45d1dba..b3f2683 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/JUnitTestSuite.java
+++ b/src/test/java/com/att/mr/test/dme2/JUnitTestSuite.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dme2;
+package com.att.mr.test.dme2;
 
 import junit.framework.TestSuite;
 
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/LoadPropertyFile.java b/src/test/java/com/att/mr/test/dme2/LoadPropertyFile.java
index 188adc7..a274d68 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/LoadPropertyFile.java
+++ b/src/test/java/com/att/mr/test/dme2/LoadPropertyFile.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dme2;
+package com.att.mr.test.dme2;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/TestRunner.java b/src/test/java/com/att/mr/test/dme2/TestRunner.java
index 26c8f34..dce6e6c 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/TestRunner.java
+++ b/src/test/java/com/att/mr/test/dme2/TestRunner.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dme2;
+package com.att.mr.test.dme2;
 
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/TopicBeanDME2.java b/src/test/java/com/att/mr/test/dme2/TopicBeanDME2.java
index d8b1287..4de5015 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/mr/test/dme2/TopicBeanDME2.java
+++ b/src/test/java/com/att/mr/test/dme2/TopicBeanDME2.java
@@ -22,7 +22,7 @@
 /**
  * 
  */
-package org.onap.dmaap.messagerouter.msgrtr.mr.test.dme2;
+package com.att.mr.test.dme2;
 
 import java.io.Serializable;
 
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/CambriaApiTestCase.java b/src/test/java/com/att/nsa/cambria/CambriaApiTestCase.java
index 5800918..c14f10c 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/CambriaApiTestCase.java
+++ b/src/test/java/com/att/nsa/cambria/CambriaApiTestCase.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria;
+package com.att.nsa.cambria;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/CambriaRateLimiterTest.java b/src/test/java/com/att/nsa/cambria/CambriaRateLimiterTest.java
index f362a0c..8e853d2 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/CambriaRateLimiterTest.java
+++ b/src/test/java/com/att/nsa/cambria/CambriaRateLimiterTest.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria;
+package com.att.nsa.cambria;
 
 import junit.framework.TestCase;
 
diff --git a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/utils/UtilsTest.java b/src/test/java/com/att/nsa/cambria/utils/UtilsTest.java
index e768033..58e6934 100644
--- a/src/test/java/org/onap/dmaap/messagerouter/msgrtr/nsa/cambria/utils/UtilsTest.java
+++ b/src/test/java/com/att/nsa/cambria/utils/UtilsTest.java
@@ -19,7 +19,7 @@
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
-package org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils;
+package com.att.nsa.cambria.utils;
 
 import static org.junit.Assert.*;
 
@@ -29,7 +29,6 @@ import java.util.Date;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils.Utils;
 
 public class UtilsTest {