aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorVarun Gudisena <vg411h@att.com>2017-08-31 10:44:28 -0500
committerVarun Gudisena <vg411h@att.com>2017-08-31 10:44:41 -0500
commit7d45c179879363222fcf49b30f75837f66d7f423 (patch)
treec5a344247515c1d8b74a6cc74bcea63541e4b46f /src/main
parentcc9de9bc6803212f0233e0e1bf06aa63fe8b7a6a (diff)
Revert package name changes
Reverted package name changes to avoid any potential issues. Renamed maven group id only. Issue-id: DMAAP-74 Change-Id: I36c2aef063050c265640b79e6dc0e8ab7add8d22 Signed-off-by: Varun Gudisena <vg411h@att.com>
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/att/nsa/mr/client/HostSelector.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/HostSelector.java)2
-rw-r--r--src/main/java/com/att/nsa/mr/client/MRBatchingPublisher.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/MRBatchingPublisher.java)5
-rw-r--r--src/main/java/com/att/nsa/mr/client/MRClient.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/MRClient.java)2
-rw-r--r--src/main/java/com/att/nsa/mr/client/MRClientBuilders.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/MRClientBuilders.java)9
-rw-r--r--src/main/java/com/att/nsa/mr/client/MRClientFactory.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/MRClientFactory.java)10
-rw-r--r--src/main/java/com/att/nsa/mr/client/MRConsumer.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/MRConsumer.java)4
-rw-r--r--src/main/java/com/att/nsa/mr/client/MRIdentityManager.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/MRIdentityManager.java)2
-rw-r--r--src/main/java/com/att/nsa/mr/client/MRPublisher.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/MRPublisher.java)2
-rw-r--r--src/main/java/com/att/nsa/mr/client/MRTopicManager.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/MRTopicManager.java)2
-rw-r--r--src/main/java/com/att/nsa/mr/client/impl/Clock.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/impl/Clock.java)2
-rw-r--r--src/main/java/com/att/nsa/mr/client/impl/MRBaseClient.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/impl/MRBaseClient.java)9
-rw-r--r--src/main/java/com/att/nsa/mr/client/impl/MRBatchPublisher.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/impl/MRBatchPublisher.java)6
-rw-r--r--src/main/java/com/att/nsa/mr/client/impl/MRClientVersionInfo.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/impl/MRClientVersionInfo.java)2
-rw-r--r--src/main/java/com/att/nsa/mr/client/impl/MRConstants.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/impl/MRConstants.java)2
-rw-r--r--src/main/java/com/att/nsa/mr/client/impl/MRConsumerImpl.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/impl/MRConsumerImpl.java)12
-rw-r--r--src/main/java/com/att/nsa/mr/client/impl/MRFormat.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/impl/MRFormat.java)2
-rw-r--r--src/main/java/com/att/nsa/mr/client/impl/MRMetaClient.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/impl/MRMetaClient.java)6
-rw-r--r--src/main/java/com/att/nsa/mr/client/impl/MRSimplerBatchPublisher.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/impl/MRSimplerBatchPublisher.java)12
-rw-r--r--src/main/java/com/att/nsa/mr/client/response/MRConsumerResponse.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/response/MRConsumerResponse.java)2
-rw-r--r--src/main/java/com/att/nsa/mr/client/response/MRPublisherResponse.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/response/MRPublisherResponse.java)2
-rw-r--r--src/main/java/com/att/nsa/mr/dme/client/DefaultLoggingFailoverFaultHandler.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/dme/client/DefaultLoggingFailoverFaultHandler.java)2
-rw-r--r--src/main/java/com/att/nsa/mr/dme/client/HeaderReplyHandler.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/dme/client/HeaderReplyHandler.java)6
-rw-r--r--src/main/java/com/att/nsa/mr/dme/client/PreferredRouteReplyHandler.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/dme/client/PreferredRouteReplyHandler.java)6
-rw-r--r--src/main/java/com/att/nsa/mr/dme/client/PreferredRouteRequestHandler.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/dme/client/PreferredRouteRequestHandler.java)4
-rw-r--r--src/main/java/com/att/nsa/mr/dme/client/SimpleExampleConsumer.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/dme/client/SimpleExampleConsumer.java)6
-rw-r--r--src/main/java/com/att/nsa/mr/dme/client/SimpleExamplePublisher.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/dme/client/SimpleExamplePublisher.java)9
-rw-r--r--src/main/java/com/att/nsa/mr/logging/MRAppender.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/logging/MRAppender.java)7
-rw-r--r--src/main/java/com/att/nsa/mr/test/clients/ConsolePublisher.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/test/clients/ConsolePublisher.java)8
-rw-r--r--src/main/java/com/att/nsa/mr/test/clients/ProtocolTypeConstants.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/test/clients/ProtocolTypeConstants.java)2
-rw-r--r--src/main/java/com/att/nsa/mr/test/clients/SampleConsumer.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/test/clients/SampleConsumer.java)9
-rw-r--r--src/main/java/com/att/nsa/mr/test/clients/SamplePublisher.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/test/clients/SamplePublisher.java)13
-rw-r--r--src/main/java/com/att/nsa/mr/test/clients/SimpleExampleConsumer.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/test/clients/SimpleExampleConsumer.java)6
-rw-r--r--src/main/java/com/att/nsa/mr/test/clients/SimpleExampleConsumerWithReturnResponse.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/test/clients/SimpleExampleConsumerWithReturnResponse.java)8
-rw-r--r--src/main/java/com/att/nsa/mr/test/clients/SimpleExamplePublisher.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/test/clients/SimpleExamplePublisher.java)9
-rw-r--r--src/main/java/com/att/nsa/mr/test/clients/SimpleExamplePublisherWithResponse.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/test/clients/SimpleExamplePublisherWithResponse.java)8
-rw-r--r--src/main/java/com/att/nsa/mr/test/support/MRBatchingPublisherMock.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/test/support/MRBatchingPublisherMock.java)7
-rw-r--r--src/main/java/com/att/nsa/mr/test/support/MRConsumerMock.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/test/support/MRConsumerMock.java)7
-rw-r--r--src/main/java/com/att/nsa/mr/tools/ApiKeyCommand.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/tools/ApiKeyCommand.java)11
-rw-r--r--src/main/java/com/att/nsa/mr/tools/AuthCommand.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/tools/AuthCommand.java)2
-rw-r--r--src/main/java/com/att/nsa/mr/tools/ClusterCommand.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/tools/ClusterCommand.java)5
-rw-r--r--src/main/java/com/att/nsa/mr/tools/MRCommandContext.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/tools/MRCommandContext.java)5
-rw-r--r--src/main/java/com/att/nsa/mr/tools/MRTool.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/tools/MRTool.java)5
-rw-r--r--src/main/java/com/att/nsa/mr/tools/MessageCommand.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/tools/MessageCommand.java)13
-rw-r--r--src/main/java/com/att/nsa/mr/tools/TopicCommand.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/tools/TopicCommand.java)9
-rw-r--r--src/main/java/com/att/nsa/mr/tools/TraceCommand.java (renamed from src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/tools/TraceCommand.java)2
-rw-r--r--src/main/resources/dme2/consumer.properties6
-rw-r--r--src/main/resources/dme2/producer.properties6
-rw-r--r--src/main/resources/log4j.xml6
48 files changed, 141 insertions, 141 deletions
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/HostSelector.java b/src/main/java/com/att/nsa/mr/client/HostSelector.java
index b30c2f1..de0e52c 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/HostSelector.java
+++ b/src/main/java/com/att/nsa/mr/client/HostSelector.java
@@ -19,7 +19,7 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client;
+package com.att.nsa.mr.client;
import java.util.Collection;
import java.util.Iterator;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/MRBatchingPublisher.java b/src/main/java/com/att/nsa/mr/client/MRBatchingPublisher.java
index 4f09fce..875b5a3 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/MRBatchingPublisher.java
+++ b/src/main/java/com/att/nsa/mr/client/MRBatchingPublisher.java
@@ -19,13 +19,12 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client;
+package com.att.nsa.mr.client;
import java.io.IOException;
import java.util.List;
import java.util.concurrent.TimeUnit;
-
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.response.MRPublisherResponse;
+import com.att.nsa.mr.client.response.MRPublisherResponse;
/**
* A MR batching publisher is a publisher with additional functionality
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/MRClient.java b/src/main/java/com/att/nsa/mr/client/MRClient.java
index fea00a1..f3d5c88 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/MRClient.java
+++ b/src/main/java/com/att/nsa/mr/client/MRClient.java
@@ -19,7 +19,7 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client;
+package com.att.nsa.mr.client;
import org.slf4j.Logger;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/MRClientBuilders.java b/src/main/java/com/att/nsa/mr/client/MRClientBuilders.java
index 572f6d4..00c8915 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/MRClientBuilders.java
+++ b/src/main/java/com/att/nsa/mr/client/MRClientBuilders.java
@@ -19,19 +19,20 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client;
+package com.att.nsa.mr.client;
import java.net.MalformedURLException;
import java.util.Collection;
import java.util.TreeSet;
import java.util.UUID;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.impl.MRConsumerImpl;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.impl.MRMetaClient;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.impl.MRSimplerBatchPublisher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.att.nsa.mr.client.impl.MRConsumerImpl;
+import com.att.nsa.mr.client.impl.MRMetaClient;
+import com.att.nsa.mr.client.impl.MRSimplerBatchPublisher;
+
/**
* A collection of builders for various types of MR API clients
*
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/MRClientFactory.java b/src/main/java/com/att/nsa/mr/client/MRClientFactory.java
index 93d50be..59e472c 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/MRClientFactory.java
+++ b/src/main/java/com/att/nsa/mr/client/MRClientFactory.java
@@ -19,7 +19,7 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client;
+package com.att.nsa.mr.client;
import java.io.File;
import java.io.FileNotFoundException;
@@ -35,10 +35,10 @@ import java.util.UUID;
import javax.ws.rs.core.MultivaluedMap;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.impl.MRConsumerImpl;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.impl.MRMetaClient;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.impl.MRSimplerBatchPublisher;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.test.clients.ProtocolTypeConstants;
+import com.att.nsa.mr.client.impl.MRConsumerImpl;
+import com.att.nsa.mr.client.impl.MRMetaClient;
+import com.att.nsa.mr.client.impl.MRSimplerBatchPublisher;
+import com.att.nsa.mr.test.clients.ProtocolTypeConstants;
/**
* A factory for MR clients.<br/>
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/MRConsumer.java b/src/main/java/com/att/nsa/mr/client/MRConsumer.java
index 214552b..444eb7c 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/MRConsumer.java
+++ b/src/main/java/com/att/nsa/mr/client/MRConsumer.java
@@ -19,11 +19,11 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client;
+package com.att.nsa.mr.client;
import java.io.IOException;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.response.MRConsumerResponse;
+import com.att.nsa.mr.client.response.MRConsumerResponse;
public interface MRConsumer extends MRClient
{
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/MRIdentityManager.java b/src/main/java/com/att/nsa/mr/client/MRIdentityManager.java
index 34826c9..5483761 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/MRIdentityManager.java
+++ b/src/main/java/com/att/nsa/mr/client/MRIdentityManager.java
@@ -19,7 +19,7 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client;
+package com.att.nsa.mr.client;
import java.io.IOException;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/MRPublisher.java b/src/main/java/com/att/nsa/mr/client/MRPublisher.java
index 165bf0f..651c548 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/MRPublisher.java
+++ b/src/main/java/com/att/nsa/mr/client/MRPublisher.java
@@ -19,7 +19,7 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client;
+package com.att.nsa.mr.client;
import java.io.IOException;
import java.util.Collection;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/MRTopicManager.java b/src/main/java/com/att/nsa/mr/client/MRTopicManager.java
index 3703385..13524bd 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/MRTopicManager.java
+++ b/src/main/java/com/att/nsa/mr/client/MRTopicManager.java
@@ -19,7 +19,7 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client;
+package com.att.nsa.mr.client;
import java.io.IOException;
import java.util.Set;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/impl/Clock.java b/src/main/java/com/att/nsa/mr/client/impl/Clock.java
index e1ea06e..ace791e 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/impl/Clock.java
+++ b/src/main/java/com/att/nsa/mr/client/impl/Clock.java
@@ -19,7 +19,7 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.impl;
+package com.att.nsa.mr.client.impl;
public class Clock
{
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/impl/MRBaseClient.java b/src/main/java/com/att/nsa/mr/client/impl/MRBaseClient.java
index 405ed90..a9fd9bd 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/impl/MRBaseClient.java
+++ b/src/main/java/com/att/nsa/mr/client/impl/MRBaseClient.java
@@ -19,7 +19,7 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.impl;
+package com.att.nsa.mr.client.impl;
import java.net.MalformedURLException;
import java.util.Collection;
@@ -40,14 +40,15 @@ import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import org.json.JSONTokener;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRClient;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRClientFactory;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.test.clients.ProtocolTypeConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.att.nsa.apiClient.http.CacheUse;
import com.att.nsa.apiClient.http.HttpClient;
+import com.att.nsa.mr.client.MRClient;
+import com.att.nsa.mr.client.MRClientFactory;
+import com.att.nsa.mr.test.clients.ProtocolTypeConstants;
+//import com.fasterxml.jackson.core.JsonProcessingException;
public class MRBaseClient extends HttpClient implements MRClient
{
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/impl/MRBatchPublisher.java b/src/main/java/com/att/nsa/mr/client/impl/MRBatchPublisher.java
index 28affcc..597e4da 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/impl/MRBatchPublisher.java
+++ b/src/main/java/com/att/nsa/mr/client/impl/MRBatchPublisher.java
@@ -19,7 +19,7 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.impl;
+package com.att.nsa.mr.client.impl;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -35,13 +35,13 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
import java.util.zip.GZIPOutputStream;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRBatchingPublisher;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.response.MRPublisherResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.att.nsa.apiClient.http.HttpClient;
import com.att.nsa.apiClient.http.HttpException;
+import com.att.nsa.mr.client.MRBatchingPublisher;
+import com.att.nsa.mr.client.response.MRPublisherResponse;
/**
* This is a batching publisher class that allows the client to publish messages
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/impl/MRClientVersionInfo.java b/src/main/java/com/att/nsa/mr/client/impl/MRClientVersionInfo.java
index 3b68363..fa9207d 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/impl/MRClientVersionInfo.java
+++ b/src/main/java/com/att/nsa/mr/client/impl/MRClientVersionInfo.java
@@ -19,7 +19,7 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.impl;
+package com.att.nsa.mr.client.impl;
import java.io.IOException;
import java.io.InputStream;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/impl/MRConstants.java b/src/main/java/com/att/nsa/mr/client/impl/MRConstants.java
index 4039a0b..803670c 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/impl/MRConstants.java
+++ b/src/main/java/com/att/nsa/mr/client/impl/MRConstants.java
@@ -19,7 +19,7 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.impl;
+package com.att.nsa.mr.client.impl;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/impl/MRConsumerImpl.java b/src/main/java/com/att/nsa/mr/client/impl/MRConsumerImpl.java
index 8f4d777..fdd1b89 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/impl/MRConsumerImpl.java
+++ b/src/main/java/com/att/nsa/mr/client/impl/MRConsumerImpl.java
@@ -19,7 +19,7 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.impl;
+package com.att.nsa.mr.client.impl;
import java.io.File;
import java.io.FileReader;
@@ -41,15 +41,15 @@ import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import org.json.JSONTokener;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRClientFactory;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRConsumer;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.response.MRConsumerResponse;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.test.clients.ProtocolTypeConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.att.aft.dme2.api.DME2Client;
import com.att.aft.dme2.api.DME2Exception;
+import com.att.nsa.mr.client.MRClientFactory;
+import com.att.nsa.mr.client.MRConsumer;
+import com.att.nsa.mr.client.response.MRConsumerResponse;
+import com.att.nsa.mr.test.clients.ProtocolTypeConstants;
public class MRConsumerImpl extends MRBaseClient implements MRConsumer
{
@@ -451,7 +451,7 @@ public class MRConsumerImpl extends MRBaseClient implements MRConsumer
sender.addHeader("AFT_DME2_EXCHANGE_REPLY_HANDLERS", props.getProperty("AFT_DME2_EXCHANGE_REPLY_HANDLERS"));
sender.addHeader("AFT_DME2_REQ_TRACE_ON", props.getProperty("AFT_DME2_REQ_TRACE_ON"));
}else{
- sender.addHeader("AFT_DME2_EXCHANGE_REPLY_HANDLERS", "org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.dme.client.HeaderReplyHandler");
+ sender.addHeader("AFT_DME2_EXCHANGE_REPLY_HANDLERS", "com.att.nsa.mr.dme.client.HeaderReplyHandler");
}
/* HeaderReplyHandler headerhandler= new HeaderReplyHandler();
sender.setReplyHandler(headerhandler);*/
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/impl/MRFormat.java b/src/main/java/com/att/nsa/mr/client/impl/MRFormat.java
index 07128ed..09a317b 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/impl/MRFormat.java
+++ b/src/main/java/com/att/nsa/mr/client/impl/MRFormat.java
@@ -19,7 +19,7 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.impl;
+package com.att.nsa.mr.client.impl;
enum MRFormat
{
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/impl/MRMetaClient.java b/src/main/java/com/att/nsa/mr/client/impl/MRMetaClient.java
index 90b50f6..d32a7ef 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/impl/MRMetaClient.java
+++ b/src/main/java/com/att/nsa/mr/client/impl/MRMetaClient.java
@@ -19,7 +19,7 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.impl;
+package com.att.nsa.mr.client.impl;
import java.io.IOException;
import java.net.MalformedURLException;
@@ -30,12 +30,12 @@ import java.util.TreeSet;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRIdentityManager;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRTopicManager;
import com.att.nsa.apiClient.credentials.ApiCredential;
import com.att.nsa.apiClient.http.HttpException;
import com.att.nsa.apiClient.http.HttpObjectNotFoundException;
+import com.att.nsa.mr.client.MRIdentityManager;
+import com.att.nsa.mr.client.MRTopicManager;
public class MRMetaClient extends MRBaseClient implements MRTopicManager, MRIdentityManager
{
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/impl/MRSimplerBatchPublisher.java b/src/main/java/com/att/nsa/mr/client/impl/MRSimplerBatchPublisher.java
index 10eef5e..ad925b1 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/impl/MRSimplerBatchPublisher.java
+++ b/src/main/java/com/att/nsa/mr/client/impl/MRSimplerBatchPublisher.java
@@ -19,7 +19,7 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.impl;
+package com.att.nsa.mr.client.impl;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -44,13 +44,13 @@ import org.apache.http.HttpException;
import org.apache.http.HttpStatus;
import org.json.JSONArray;
import org.json.JSONObject;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.HostSelector;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRBatchingPublisher;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.response.MRPublisherResponse;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.test.clients.ProtocolTypeConstants;
import com.att.aft.dme2.api.DME2Client;
import com.att.aft.dme2.api.DME2Exception;
+import com.att.nsa.mr.client.HostSelector;
+import com.att.nsa.mr.client.MRBatchingPublisher;
+import com.att.nsa.mr.client.response.MRPublisherResponse;
+import com.att.nsa.mr.test.clients.ProtocolTypeConstants;
public class MRSimplerBatchPublisher extends MRBaseClient implements MRBatchingPublisher
{
@@ -810,7 +810,7 @@ private MRPublisherResponse createMRPublisherResponse(String reply, MRPublisherR
sender.addHeader("AFT_DME2_EXCHANGE_REPLY_HANDLERS", props.getProperty("AFT_DME2_EXCHANGE_REPLY_HANDLERS"));
sender.addHeader("AFT_DME2_REQ_TRACE_ON", props.getProperty("AFT_DME2_REQ_TRACE_ON"));
}else{
- sender.addHeader("AFT_DME2_EXCHANGE_REPLY_HANDLERS", "org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.dme.client.HeaderReplyHandler");
+ sender.addHeader("AFT_DME2_EXCHANGE_REPLY_HANDLERS", "com.att.nsa.mr.dme.client.HeaderReplyHandler");
}
} catch (DME2Exception x) {
getLog().warn(x.getMessage(), x);
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/response/MRConsumerResponse.java b/src/main/java/com/att/nsa/mr/client/response/MRConsumerResponse.java
index 0006852..102794e 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/response/MRConsumerResponse.java
+++ b/src/main/java/com/att/nsa/mr/client/response/MRConsumerResponse.java
@@ -19,7 +19,7 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.response;
+package com.att.nsa.mr.client.response;
public class MRConsumerResponse {
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/response/MRPublisherResponse.java b/src/main/java/com/att/nsa/mr/client/response/MRPublisherResponse.java
index fd53de5..4aebe23 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/client/response/MRPublisherResponse.java
+++ b/src/main/java/com/att/nsa/mr/client/response/MRPublisherResponse.java
@@ -19,7 +19,7 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.response;
+package com.att.nsa.mr.client.response;
/**
* Response for Publisher
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/dme/client/DefaultLoggingFailoverFaultHandler.java b/src/main/java/com/att/nsa/mr/dme/client/DefaultLoggingFailoverFaultHandler.java
index a97793b..1d3b6be 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/dme/client/DefaultLoggingFailoverFaultHandler.java
+++ b/src/main/java/com/att/nsa/mr/dme/client/DefaultLoggingFailoverFaultHandler.java
@@ -19,7 +19,7 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.dme.client;
+package com.att.nsa.mr.dme.client;
//package com.att.aft.dme2.api;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/dme/client/HeaderReplyHandler.java b/src/main/java/com/att/nsa/mr/dme/client/HeaderReplyHandler.java
index f5c133a..c70c63f 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/dme/client/HeaderReplyHandler.java
+++ b/src/main/java/com/att/nsa/mr/dme/client/HeaderReplyHandler.java
@@ -19,19 +19,19 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.dme.client;
+package com.att.nsa.mr.dme.client;
import java.util.Map;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRClientFactory;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.impl.MRSimplerBatchPublisher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.att.aft.dme2.api.util.DME2ExchangeFaultContext;
import com.att.aft.dme2.api.util.DME2ExchangeReplyHandler;
import com.att.aft.dme2.api.util.DME2ExchangeResponseContext;
+import com.att.nsa.mr.client.MRClientFactory;
+import com.att.nsa.mr.client.impl.MRSimplerBatchPublisher;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/dme/client/PreferredRouteReplyHandler.java b/src/main/java/com/att/nsa/mr/dme/client/PreferredRouteReplyHandler.java
index bf57836..b7e174c 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/dme/client/PreferredRouteReplyHandler.java
+++ b/src/main/java/com/att/nsa/mr/dme/client/PreferredRouteReplyHandler.java
@@ -19,19 +19,19 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.dme.client;
+package com.att.nsa.mr.dme.client;
import java.io.File;
import java.io.FileWriter;
import java.io.InputStream;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRClientFactory;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.impl.MRSimplerBatchPublisher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.att.aft.dme2.api.util.DME2ExchangeFaultContext;
import com.att.aft.dme2.api.util.DME2ExchangeReplyHandler;
import com.att.aft.dme2.api.util.DME2ExchangeResponseContext;
+import com.att.nsa.mr.client.MRClientFactory;
+import com.att.nsa.mr.client.impl.MRSimplerBatchPublisher;
public class PreferredRouteReplyHandler implements DME2ExchangeReplyHandler {
private Logger fLog = LoggerFactory.getLogger ( this.getClass().getName () );
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/dme/client/PreferredRouteRequestHandler.java b/src/main/java/com/att/nsa/mr/dme/client/PreferredRouteRequestHandler.java
index 14ab313..a65683b 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/dme/client/PreferredRouteRequestHandler.java
+++ b/src/main/java/com/att/nsa/mr/dme/client/PreferredRouteRequestHandler.java
@@ -19,14 +19,14 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.dme.client;
+package com.att.nsa.mr.dme.client;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRClientFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.att.aft.dme2.api.util.DME2ExchangeRequestContext;
import com.att.aft.dme2.api.util.DME2ExchangeRequestHandler;
+import com.att.nsa.mr.client.MRClientFactory;
public class PreferredRouteRequestHandler implements DME2ExchangeRequestHandler {
private Logger fLog = LoggerFactory.getLogger(this.getClass().getName());
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/dme/client/SimpleExampleConsumer.java b/src/main/java/com/att/nsa/mr/dme/client/SimpleExampleConsumer.java
index fa1075c..4df9fcb 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/dme/client/SimpleExampleConsumer.java
+++ b/src/main/java/com/att/nsa/mr/dme/client/SimpleExampleConsumer.java
@@ -20,14 +20,14 @@
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.dme.client;
+package com.att.nsa.mr.dme.client;
import java.util.Map;
import javax.ws.rs.core.MultivaluedMap;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRClientFactory;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRConsumer;
+import com.att.nsa.mr.client.MRClientFactory;
+import com.att.nsa.mr.client.MRConsumer;
public class SimpleExampleConsumer {
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/dme/client/SimpleExamplePublisher.java b/src/main/java/com/att/nsa/mr/dme/client/SimpleExamplePublisher.java
index c4b006f..0e8efda 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/dme/client/SimpleExamplePublisher.java
+++ b/src/main/java/com/att/nsa/mr/dme/client/SimpleExamplePublisher.java
@@ -20,7 +20,7 @@
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.dme.client;
+package com.att.nsa.mr.dme.client;
import java.io.IOException;
@@ -32,9 +32,10 @@ import java.util.concurrent.TimeUnit;
import javax.ws.rs.core.MultivaluedMap;
import org.json.JSONObject;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRBatchingPublisher;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRClientFactory;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRPublisher.message;
+
+import com.att.nsa.mr.client.MRBatchingPublisher;
+import com.att.nsa.mr.client.MRClientFactory;
+import com.att.nsa.mr.client.MRPublisher.message;
/**
* An example of how to use the Java publisher.
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/logging/MRAppender.java b/src/main/java/com/att/nsa/mr/logging/MRAppender.java
index 96389f5..8faf0df 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/logging/MRAppender.java
+++ b/src/main/java/com/att/nsa/mr/logging/MRAppender.java
@@ -22,15 +22,16 @@
/**
*
*/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.logging;
+package com.att.nsa.mr.logging;
import java.io.IOException;
import org.apache.log4j.AppenderSkeleton;
import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.spi.LoggingEvent;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRClientFactory;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRPublisher;
+
+import com.att.nsa.mr.client.MRClientFactory;
+import com.att.nsa.mr.client.MRPublisher;
/**
* @author author
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/test/clients/ConsolePublisher.java b/src/main/java/com/att/nsa/mr/test/clients/ConsolePublisher.java
index 20eacd8..2294d7b 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/test/clients/ConsolePublisher.java
+++ b/src/main/java/com/att/nsa/mr/test/clients/ConsolePublisher.java
@@ -20,7 +20,7 @@
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.test.clients;
+package com.att.nsa.mr.test.clients;
import java.io.BufferedReader;
import java.io.IOException;
@@ -29,9 +29,9 @@ import java.util.List;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRBatchingPublisher;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRClientFactory;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRPublisher.message;
+import com.att.nsa.mr.client.MRBatchingPublisher;
+import com.att.nsa.mr.client.MRClientFactory;
+import com.att.nsa.mr.client.MRPublisher.message;
/**
* A simple publisher that reads from std in, sending each line as a message.
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/test/clients/ProtocolTypeConstants.java b/src/main/java/com/att/nsa/mr/test/clients/ProtocolTypeConstants.java
index c60657b..6e86d47 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/test/clients/ProtocolTypeConstants.java
+++ b/src/main/java/com/att/nsa/mr/test/clients/ProtocolTypeConstants.java
@@ -22,7 +22,7 @@
/**
*
*/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.test.clients;
+package com.att.nsa.mr.test.clients;
/**
* @author author
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/test/clients/SampleConsumer.java b/src/main/java/com/att/nsa/mr/test/clients/SampleConsumer.java
index 79bf2ed..8e1c0e0 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/test/clients/SampleConsumer.java
+++ b/src/main/java/com/att/nsa/mr/test/clients/SampleConsumer.java
@@ -19,16 +19,17 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.test.clients;
+package com.att.nsa.mr.test.clients;
import java.io.IOException;
import java.util.LinkedList;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRClientFactory;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRConsumer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.att.nsa.mr.client.MRClientFactory;
+import com.att.nsa.mr.client.MRConsumer;
+
public class SampleConsumer {
public static void main ( String[] args )
{
@@ -36,7 +37,7 @@ public class SampleConsumer {
LOG.info("Sample Consumer Class executing");
- final String topic = "org.onap.dmaap.messagerouter.dmaapclient.app.dmaap.mr.testingTopic";
+ final String topic = "com.att.app.dmaap.mr.testingTopic";
final String url = ( args.length > 1 ? args[1] : "localhost:8181" );
final String group = ( args.length > 2 ? args[2] :"grp" );
/*final String id = ( args.length > 3 ? args[3] : "0" );*/
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/test/clients/SamplePublisher.java b/src/main/java/com/att/nsa/mr/test/clients/SamplePublisher.java
index 5ed3a2b..36c2b7f 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/test/clients/SamplePublisher.java
+++ b/src/main/java/com/att/nsa/mr/test/clients/SamplePublisher.java
@@ -19,20 +19,21 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.test.clients;
+package com.att.nsa.mr.test.clients;
import java.io.IOException;
import java.util.List;
import java.util.concurrent.TimeUnit;
import org.json.JSONObject;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRBatchingPublisher;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRClientFactory;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRClientBuilders.PublisherBuilder;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRPublisher.message;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.att.nsa.mr.client.MRBatchingPublisher;
+import com.att.nsa.mr.client.MRClientFactory;
+import com.att.nsa.mr.client.MRClientBuilders.PublisherBuilder;
+import com.att.nsa.mr.client.MRPublisher.message;
+
public class SamplePublisher {
public static void main ( String[] args ) throws IOException, InterruptedException
{
@@ -42,7 +43,7 @@ public class SamplePublisher {
// read the topic name from the command line
//final String topic = ( args.length > 1 ? args[1] : "MY-EXAMPLE-TOPIC" );
- final String topic = ( args.length > 1 ? args[1] : "org.onap.dmaap.messagerouter.dmaapclient.app.dmaap.mr.testingTopic" );
+ final String topic = ( args.length > 1 ? args[1] : "com.att.app.dmaap.mr.testingTopic" );
// set up some batch limits and the compression flag
final int maxBatchSize = 100;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/test/clients/SimpleExampleConsumer.java b/src/main/java/com/att/nsa/mr/test/clients/SimpleExampleConsumer.java
index fe43802..3a131a0 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/test/clients/SimpleExampleConsumer.java
+++ b/src/main/java/com/att/nsa/mr/test/clients/SimpleExampleConsumer.java
@@ -20,7 +20,7 @@
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.test.clients;
+package com.att.nsa.mr.test.clients;
@@ -29,8 +29,8 @@ import java.io.FileReader;
import java.io.FileWriter;
import java.util.Properties;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRClientFactory;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRConsumer;
+import com.att.nsa.mr.client.MRClientFactory;
+import com.att.nsa.mr.client.MRConsumer;
public class SimpleExampleConsumer
{
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/test/clients/SimpleExampleConsumerWithReturnResponse.java b/src/main/java/com/att/nsa/mr/test/clients/SimpleExampleConsumerWithReturnResponse.java
index 836fb90..b3c167b 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/test/clients/SimpleExampleConsumerWithReturnResponse.java
+++ b/src/main/java/com/att/nsa/mr/test/clients/SimpleExampleConsumerWithReturnResponse.java
@@ -19,16 +19,16 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.test.clients;
+package com.att.nsa.mr.test.clients;
import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
import java.util.Properties;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRClientFactory;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRConsumer;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.response.MRConsumerResponse;
+import com.att.nsa.mr.client.MRClientFactory;
+import com.att.nsa.mr.client.MRConsumer;
+import com.att.nsa.mr.client.response.MRConsumerResponse;
public class SimpleExampleConsumerWithReturnResponse {
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/test/clients/SimpleExamplePublisher.java b/src/main/java/com/att/nsa/mr/test/clients/SimpleExamplePublisher.java
index 8579e68..01e770e 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/test/clients/SimpleExamplePublisher.java
+++ b/src/main/java/com/att/nsa/mr/test/clients/SimpleExamplePublisher.java
@@ -20,7 +20,7 @@
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.test.clients;
+package com.att.nsa.mr.test.clients;
import java.io.File;
import java.io.FileReader;
@@ -32,9 +32,10 @@ import java.util.Properties;
import java.util.concurrent.TimeUnit;
import org.json.JSONObject;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRBatchingPublisher;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRClientFactory;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRPublisher.message;
+
+import com.att.nsa.mr.client.MRBatchingPublisher;
+import com.att.nsa.mr.client.MRClientFactory;
+import com.att.nsa.mr.client.MRPublisher.message;
/**
* An example of how to use the Java publisher.
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/test/clients/SimpleExamplePublisherWithResponse.java b/src/main/java/com/att/nsa/mr/test/clients/SimpleExamplePublisherWithResponse.java
index 74b1462..4914688 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/test/clients/SimpleExamplePublisherWithResponse.java
+++ b/src/main/java/com/att/nsa/mr/test/clients/SimpleExamplePublisherWithResponse.java
@@ -19,7 +19,7 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.test.clients;
+package com.att.nsa.mr.test.clients;
import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
@@ -28,9 +28,9 @@ import java.util.List;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
import org.json.JSONObject;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRBatchingPublisher;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRClientFactory;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.response.MRPublisherResponse;
+import com.att.nsa.mr.client.MRBatchingPublisher;
+import com.att.nsa.mr.client.MRClientFactory;
+import com.att.nsa.mr.client.response.MRPublisherResponse;
/**
*An example of how to use the Java publisher.
* @author author
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/test/support/MRBatchingPublisherMock.java b/src/main/java/com/att/nsa/mr/test/support/MRBatchingPublisherMock.java
index eca5874..3c123b1 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/test/support/MRBatchingPublisherMock.java
+++ b/src/main/java/com/att/nsa/mr/test/support/MRBatchingPublisherMock.java
@@ -19,17 +19,18 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.test.support;
+package com.att.nsa.mr.test.support;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.TimeUnit;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRBatchingPublisher;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.response.MRPublisherResponse;
import org.slf4j.Logger;
+import com.att.nsa.mr.client.MRBatchingPublisher;
+import com.att.nsa.mr.client.response.MRPublisherResponse;
+
/**
* A helper for unit testing systems that use a MRPublisher. When setting
* up your test, inject an instance into MRClientFactory to have it return
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/test/support/MRConsumerMock.java b/src/main/java/com/att/nsa/mr/test/support/MRConsumerMock.java
index 9728053..3373710 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/test/support/MRConsumerMock.java
+++ b/src/main/java/com/att/nsa/mr/test/support/MRConsumerMock.java
@@ -19,16 +19,17 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.test.support;
+package com.att.nsa.mr.test.support;
import java.io.IOException;
import java.util.LinkedList;
import java.util.List;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRConsumer;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.response.MRConsumerResponse;
import org.slf4j.Logger;
+import com.att.nsa.mr.client.MRConsumer;
+import com.att.nsa.mr.client.response.MRConsumerResponse;
+
/**
* A helper for unit testing systems that use a MRConsumer. When setting
* up your test, inject an instance into MRClientFactory to have it return
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/tools/ApiKeyCommand.java b/src/main/java/com/att/nsa/mr/tools/ApiKeyCommand.java
index f15c3ae..0faefe7 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/tools/ApiKeyCommand.java
+++ b/src/main/java/com/att/nsa/mr/tools/ApiKeyCommand.java
@@ -19,21 +19,20 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.tools;
+package com.att.nsa.mr.tools;
import java.io.IOException;
import java.io.PrintStream;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRClientFactory;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRIdentityManager;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRClient.MRApiException;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRIdentityManager.ApiKey;
-
import com.att.nsa.apiClient.credentials.ApiCredential;
import com.att.nsa.apiClient.http.HttpException;
import com.att.nsa.apiClient.http.HttpObjectNotFoundException;
import com.att.nsa.cmdtool.Command;
import com.att.nsa.cmdtool.CommandNotReadyException;
+import com.att.nsa.mr.client.MRClientFactory;
+import com.att.nsa.mr.client.MRIdentityManager;
+import com.att.nsa.mr.client.MRClient.MRApiException;
+import com.att.nsa.mr.client.MRIdentityManager.ApiKey;
public class ApiKeyCommand implements Command<MRCommandContext>
{
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/tools/AuthCommand.java b/src/main/java/com/att/nsa/mr/tools/AuthCommand.java
index 0845432..72f226b 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/tools/AuthCommand.java
+++ b/src/main/java/com/att/nsa/mr/tools/AuthCommand.java
@@ -19,7 +19,7 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.tools;
+package com.att.nsa.mr.tools;
import java.io.PrintStream;
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/tools/ClusterCommand.java b/src/main/java/com/att/nsa/mr/tools/ClusterCommand.java
index 69198d4..5ecaf7c 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/tools/ClusterCommand.java
+++ b/src/main/java/com/att/nsa/mr/tools/ClusterCommand.java
@@ -19,14 +19,13 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.tools;
+package com.att.nsa.mr.tools;
import java.io.PrintStream;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.impl.MRConsumerImpl;
-
import com.att.nsa.cmdtool.Command;
import com.att.nsa.cmdtool.CommandNotReadyException;
+import com.att.nsa.mr.client.impl.MRConsumerImpl;
public class ClusterCommand implements Command<MRCommandContext>
{
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/tools/MRCommandContext.java b/src/main/java/com/att/nsa/mr/tools/MRCommandContext.java
index 7b11573..3430d9c 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/tools/MRCommandContext.java
+++ b/src/main/java/com/att/nsa/mr/tools/MRCommandContext.java
@@ -19,16 +19,15 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.tools;
+package com.att.nsa.mr.tools;
import java.util.Collection;
import java.util.LinkedList;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRClient;
-
import com.att.nsa.apiClient.http.HttpClient;
import com.att.nsa.apiClient.http.HttpTracer;
import com.att.nsa.cmdtool.CommandContext;
+import com.att.nsa.mr.client.MRClient;
public class MRCommandContext implements CommandContext
{
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/tools/MRTool.java b/src/main/java/com/att/nsa/mr/tools/MRTool.java
index 563315e..7f1effd 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/tools/MRTool.java
+++ b/src/main/java/com/att/nsa/mr/tools/MRTool.java
@@ -19,13 +19,12 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.tools;
+package com.att.nsa.mr.tools;
import java.io.IOException;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.impl.MRClientVersionInfo;
-
import com.att.nsa.cmdtool.CommandLineTool;
+import com.att.nsa.mr.client.impl.MRClientVersionInfo;
public class MRTool extends CommandLineTool<MRCommandContext>
{
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/tools/MessageCommand.java b/src/main/java/com/att/nsa/mr/tools/MessageCommand.java
index afee95f..2c646bf 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/tools/MessageCommand.java
+++ b/src/main/java/com/att/nsa/mr/tools/MessageCommand.java
@@ -19,21 +19,20 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.tools;
+package com.att.nsa.mr.tools;
import java.io.IOException;
import java.io.PrintStream;
import java.util.List;
import java.util.concurrent.TimeUnit;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRBatchingPublisher;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRClientFactory;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRConsumer;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRClientBuilders.PublisherBuilder;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRPublisher.message;
-
import com.att.nsa.cmdtool.Command;
import com.att.nsa.cmdtool.CommandNotReadyException;
+import com.att.nsa.mr.client.MRBatchingPublisher;
+import com.att.nsa.mr.client.MRClientFactory;
+import com.att.nsa.mr.client.MRConsumer;
+import com.att.nsa.mr.client.MRClientBuilders.PublisherBuilder;
+import com.att.nsa.mr.client.MRPublisher.message;
public class MessageCommand implements Command<MRCommandContext>
{
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/tools/TopicCommand.java b/src/main/java/com/att/nsa/mr/tools/TopicCommand.java
index 6bc6c14..8010a58 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/tools/TopicCommand.java
+++ b/src/main/java/com/att/nsa/mr/tools/TopicCommand.java
@@ -19,20 +19,19 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.tools;
+package com.att.nsa.mr.tools;
import java.io.IOException;
import java.io.PrintStream;
import java.util.Set;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRClientFactory;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRTopicManager;
-import org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.client.MRTopicManager.TopicInfo;
-
import com.att.nsa.apiClient.http.HttpException;
import com.att.nsa.apiClient.http.HttpObjectNotFoundException;
import com.att.nsa.cmdtool.Command;
import com.att.nsa.cmdtool.CommandNotReadyException;
+import com.att.nsa.mr.client.MRClientFactory;
+import com.att.nsa.mr.client.MRTopicManager;
+import com.att.nsa.mr.client.MRTopicManager.TopicInfo;
public class TopicCommand implements Command<MRCommandContext>
{
diff --git a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/tools/TraceCommand.java b/src/main/java/com/att/nsa/mr/tools/TraceCommand.java
index 280c0ad..0489172 100644
--- a/src/main/java/org/onap/dmaap/messagerouter/dmaapclient/nsa/mr/tools/TraceCommand.java
+++ b/src/main/java/com/att/nsa/mr/tools/TraceCommand.java
@@ -19,7 +19,7 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*
*******************************************************************************/
-package org.onap.dmaap.messagerouter.dmaapclient.nsa.mr.tools;
+package com.att.nsa.mr.tools;
import java.io.PrintStream;
import java.net.URI;
diff --git a/src/main/resources/dme2/consumer.properties b/src/main/resources/dme2/consumer.properties
index 22dfc58..8350288 100644
--- a/src/main/resources/dme2/consumer.properties
+++ b/src/main/resources/dme2/consumer.properties
@@ -37,14 +37,14 @@ authKey=<auth key>
authDate=2016-02-18T13:57:37-0800
#host=uebsb91bodc.it.att.com:3904
host=<host>:<port>
-topic=org.onap.dmaap.messagerouter.dmaapclient.ecomp_test.crm.preDemo1
+topic=com.att.ecomp_test.crm.preDemo1
group=con
id=5
timeout=15000
limit=1000
filter=
-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=org.onap.dmaap.messagerouter.dmaapclient.nsa.test.PreferredRouteRequestHandler
-AFT_DME2_EXCHANGE_REPLY_HANDLERS=org.onap.dmaap.messagerouter.dmaapclient.nsa.test.PreferredRouteReplyHandler
+AFT_DME2_EXCHANGE_REQUEST_HANDLERS=com.att.nsa.test.PreferredRouteRequestHandler
+AFT_DME2_EXCHANGE_REPLY_HANDLERS=com.att.nsa.test.PreferredRouteReplyHandler
AFT_DME2_REQ_TRACE_ON=true
AFT_ENVIRONMENT=AFTUAT
AFT_DME2_EP_CONN_TIMEOUT=15000
diff --git a/src/main/resources/dme2/producer.properties b/src/main/resources/dme2/producer.properties
index 49d3117..b3c3630 100644
--- a/src/main/resources/dme2/producer.properties
+++ b/src/main/resources/dme2/producer.properties
@@ -37,13 +37,13 @@ contenttype = application/json
authKey=<auth key>
authDate=2016-07-20T11:30:56-0700
host=<host>:<port>
-topic=org.onap.dmaap.messagerouter.dmaapclient.ecomp_test.crm.preDemo1
+topic=com.att.ecomp_test.crm.preDemo1
#host=uebsb91bodc.it.att.com:3904
partition=1
maxBatchSize=100
maxAgeMs=250
-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=org.onap.dmaap.messagerouter.dmaapclient.nsa.test.PreferredRouteRequestHandler
-AFT_DME2_EXCHANGE_REPLY_HANDLERS=org.onap.dmaap.messagerouter.dmaapclient.nsa.test.PreferredRouteReplyHandler
+AFT_DME2_EXCHANGE_REQUEST_HANDLERS=com.att.nsa.test.PreferredRouteRequestHandler
+AFT_DME2_EXCHANGE_REPLY_HANDLERS=com.att.nsa.test.PreferredRouteReplyHandler
AFT_DME2_REQ_TRACE_ON=true
AFT_ENVIRONMENT=AFTUAT
AFT_DME2_EP_CONN_TIMEOUT=15000
diff --git a/src/main/resources/log4j.xml b/src/main/resources/log4j.xml
index 7817a4a..632a61a 100644
--- a/src/main/resources/log4j.xml
+++ b/src/main/resources/log4j.xml
@@ -46,14 +46,12 @@
</layout>
</appender>-->
+
+
<logger name="com.att" additivity="false">
<level value="INFO" />
<appender-ref ref="CONSOLE" />
</logger>
- <logger name="org.onap.dmaap.messagerouter.dmaapclient" additivity="false">
- <level value="INFO" />
- <appender-ref ref="CONSOLE" />
- </logger>
<!-- ############################ -->
<!-- ROOT -->