update the package name

Issue-ID: DMAAP-858
Change-Id: I4c9c2d32b645854fd5e46c134c9b07f6eb2d4d4b
Signed-off-by: sunil unnava <sunil.unnava@att.com>

32 files changed, 165 insertions, 166 deletions

diff --git a/pom.xml b/pom.xml
index a884adb..4dbd5bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -457,7 +457,7 @@
 		<dependency>
 			<groupId>org.onap.dmaap.messagerouter.msgrtr</groupId>
 			<artifactId>msgrtr</artifactId>
-			<version>1.1.10</version>
+			<version>1.1.11</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.slf4j</groupId>
diff --git a/src/main/java/com/att/nsa/dmaap/DMaaPCambriaExceptionMapper.java b/src/main/java/com/att/nsa/dmaap/DMaaPCambriaExceptionMapper.java
index c3699c7..5408d62 100644
--- a/src/main/java/com/att/nsa/dmaap/DMaaPCambriaExceptionMapper.java
+++ b/src/main/java/com/att/nsa/dmaap/DMaaPCambriaExceptionMapper.java
@@ -35,10 +35,10 @@ import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.att.dmf.mr.CambriaApiException;
-import com.att.dmf.mr.exception.DMaaPErrorMessages;
-import com.att.dmf.mr.exception.DMaaPResponseCode;
-import com.att.dmf.mr.exception.ErrorResponse;
+import org.onap.dmaap.dmf.mr.CambriaApiException;
+import org.onap.dmaap.dmf.mr.exception.DMaaPErrorMessages;
+import org.onap.dmaap.dmf.mr.exception.DMaaPResponseCode;
+import org.onap.dmaap.dmf.mr.exception.ErrorResponse;
 
 /**
  * Exception Mapper class to handle
diff --git a/src/main/java/com/att/nsa/dmaap/DMaaPWebExceptionMapper.java b/src/main/java/com/att/nsa/dmaap/DMaaPWebExceptionMapper.java
index 75c4525..a59f8ca 100644
--- a/src/main/java/com/att/nsa/dmaap/DMaaPWebExceptionMapper.java
+++ b/src/main/java/com/att/nsa/dmaap/DMaaPWebExceptionMapper.java
@@ -39,9 +39,9 @@ import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.att.dmf.mr.exception.DMaaPErrorMessages;
-import com.att.dmf.mr.exception.DMaaPResponseCode;
-import com.att.dmf.mr.exception.ErrorResponse;
+import org.onap.dmaap.dmf.mr.exception.DMaaPErrorMessages;
+import org.onap.dmaap.dmf.mr.exception.DMaaPResponseCode;
+import org.onap.dmaap.dmf.mr.exception.ErrorResponse;
 
 /**
  * Exception Mapper class to handle
diff --git a/src/main/java/com/att/nsa/dmaap/mmagent/CreateMirrorMaker.java b/src/main/java/com/att/nsa/dmaap/mmagent/CreateMirrorMaker.java
index 4007b17..35b4f03 100644
--- a/src/main/java/com/att/nsa/dmaap/mmagent/CreateMirrorMaker.java
+++ b/src/main/java/com/att/nsa/dmaap/mmagent/CreateMirrorMaker.java
@@ -26,10 +26,10 @@ import java.util.Date;
 import org.apache.http.HttpStatus;
 import org.json.JSONObject;
 
-import com.att.dmf.mr.CambriaApiException;
-import com.att.dmf.mr.exception.DMaaPResponseCode;
-import com.att.dmf.mr.exception.ErrorResponse;
-import com.att.dmf.mr.utils.Utils;
+import org.onap.dmaap.dmf.mr.CambriaApiException;
+import  org.onap.dmaap.dmf.mr.exception.DMaaPResponseCode;
+import  org.onap.dmaap.dmf.mr.exception.ErrorResponse;
+import  org.onap.dmaap.dmf.mr.utils.Utils;
 
 public class CreateMirrorMaker {
 	String messageID;
diff --git a/src/main/java/com/att/nsa/dmaap/mmagent/MMAgentUtil.java b/src/main/java/com/att/nsa/dmaap/mmagent/MMAgentUtil.java
index 800f82d..8b1ec3f 100644
--- a/src/main/java/com/att/nsa/dmaap/mmagent/MMAgentUtil.java
+++ b/src/main/java/com/att/nsa/dmaap/mmagent/MMAgentUtil.java
@@ -45,21 +45,20 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import com.att.ajsc.filemonitor.AJSCPropertiesMap;
-import com.att.dmf.mr.CambriaApiException;
-import com.att.dmf.mr.beans.DMaaPContext;
-import com.att.dmf.mr.constants.CambriaConstants;
-import com.att.dmf.mr.exception.DMaaPErrorMessages;
-import com.att.dmf.mr.exception.DMaaPResponseCode;
-import com.att.dmf.mr.exception.ErrorResponse;
-import com.att.dmf.mr.security.DMaaPAAFAuthenticator;
-import com.att.dmf.mr.security.DMaaPAAFAuthenticatorImpl;
-import com.att.dmf.mr.service.MMService;
-import com.att.dmf.mr.utils.ConfigurationReader;
-import com.att.dmf.mr.utils.DMaaPResponseBuilder;
-import com.att.dmf.mr.utils.Utils;
+import  org.onap.dmaap.dmf.mr.CambriaApiException;
+import  org.onap.dmaap.dmf.mr.beans.DMaaPContext;
+import  org.onap.dmaap.dmf.mr.constants.CambriaConstants;
+import  org.onap.dmaap.dmf.mr.exception.DMaaPErrorMessages;
+import  org.onap.dmaap.dmf.mr.exception.DMaaPResponseCode;
+import  org.onap.dmaap.dmf.mr.exception.ErrorResponse;
+import  org.onap.dmaap.dmf.mr.security.DMaaPAAFAuthenticator;
+import  org.onap.dmaap.dmf.mr.security.DMaaPAAFAuthenticatorImpl;
+import  org.onap.dmaap.dmf.mr.service.MMService;
+import  org.onap.dmaap.dmf.mr.utils.ConfigurationReader;
+import org.onap.dmaap.dmf.mr.utils.DMaaPResponseBuilder;
+import  org.onap.dmaap.dmf.mr.utils.Utils;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
-import edu.emory.mathcs.backport.java.util.Arrays;
 
 /**
  * @author rajashree.khare
diff --git a/src/main/java/com/att/nsa/dmaap/mmagent/UpdateMirrorMaker.java b/src/main/java/com/att/nsa/dmaap/mmagent/UpdateMirrorMaker.java
index 4a0a4b6..6e7a0f3 100644
--- a/src/main/java/com/att/nsa/dmaap/mmagent/UpdateMirrorMaker.java
+++ b/src/main/java/com/att/nsa/dmaap/mmagent/UpdateMirrorMaker.java
@@ -26,10 +26,10 @@ import java.util.Date;
 import org.apache.http.HttpStatus;
 import org.json.JSONObject;
 
-import com.att.dmf.mr.CambriaApiException;
-import com.att.dmf.mr.exception.DMaaPResponseCode;
-import com.att.dmf.mr.exception.ErrorResponse;
-import com.att.dmf.mr.utils.Utils;
+import org.onap.dmaap.dmf.mr.CambriaApiException;
+import org.onap.dmaap.dmf.mr.exception.DMaaPResponseCode;
+import org.onap.dmaap.dmf.mr.exception.ErrorResponse;
+import org.onap.dmaap.dmf.mr.utils.Utils;
 
 public class UpdateMirrorMaker {
 	String messageID;
diff --git a/src/main/java/com/att/nsa/dmaap/service/AdminRestService.java b/src/main/java/com/att/nsa/dmaap/service/AdminRestService.java
index 49e752a..d2bf081 100644
--- a/src/main/java/com/att/nsa/dmaap/service/AdminRestService.java
+++ b/src/main/java/com/att/nsa/dmaap/service/AdminRestService.java
@@ -44,12 +44,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
-import com.att.dmf.mr.CambriaApiException;
-import com.att.dmf.mr.beans.DMaaPContext;
-import com.att.dmf.mr.exception.DMaaPResponseCode;
-import com.att.dmf.mr.exception.ErrorResponse;
-import com.att.dmf.mr.service.AdminService;
-import com.att.dmf.mr.utils.ConfigurationReader;
+import org.onap.dmaap.dmf.mr.CambriaApiException;
+import org.onap.dmaap.dmf.mr.beans.DMaaPContext;
+import org.onap.dmaap.dmf.mr.exception.DMaaPResponseCode;
+import org.onap.dmaap.dmf.mr.exception.ErrorResponse;
+import org.onap.dmaap.dmf.mr.service.AdminService;
+import org.onap.dmaap.dmf.mr.utils.ConfigurationReader;
 import com.att.nsa.configs.ConfigDbException;
 import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;
 
diff --git a/src/main/java/com/att/nsa/dmaap/service/ApiKeysRestService.java b/src/main/java/com/att/nsa/dmaap/service/ApiKeysRestService.java
index 2dea889..d44d259 100644
--- a/src/main/java/com/att/nsa/dmaap/service/ApiKeysRestService.java
+++ b/src/main/java/com/att/nsa/dmaap/service/ApiKeysRestService.java
@@ -43,13 +43,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
-import com.att.dmf.mr.CambriaApiException;
-import com.att.dmf.mr.beans.ApiKeyBean;
-import com.att.dmf.mr.beans.DMaaPContext;
-import com.att.dmf.mr.exception.DMaaPResponseCode;
-import com.att.dmf.mr.exception.ErrorResponse;
-import com.att.dmf.mr.service.ApiKeysService;
-import com.att.dmf.mr.utils.ConfigurationReader;
+import org.onap.dmaap.dmf.mr.CambriaApiException;
+import org.onap.dmaap.dmf.mr.beans.ApiKeyBean;
+import org.onap.dmaap.dmf.mr.beans.DMaaPContext;
+import org.onap.dmaap.dmf.mr.exception.DMaaPResponseCode;
+import org.onap.dmaap.dmf.mr.exception.ErrorResponse;
+import org.onap.dmaap.dmf.mr.service.ApiKeysService;
+import org.onap.dmaap.dmf.mr.utils.ConfigurationReader;
 import com.att.nsa.configs.ConfigDbException;
 import com.att.nsa.security.db.NsaApiDb.KeyExistsException;
 import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;
diff --git a/src/main/java/com/att/nsa/dmaap/service/EventsRestService.java b/src/main/java/com/att/nsa/dmaap/service/EventsRestService.java
index 40468a3..cd28967 100644
--- a/src/main/java/com/att/nsa/dmaap/service/EventsRestService.java
+++ b/src/main/java/com/att/nsa/dmaap/service/EventsRestService.java
@@ -42,20 +42,20 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
-import com.att.dmf.mr.CambriaApiException;
-import com.att.dmf.mr.backends.ConsumerFactory.UnavailableException;
-import com.att.dmf.mr.beans.DMaaPContext;
-import com.att.dmf.mr.exception.DMaaPErrorMessages;
-import com.att.dmf.mr.exception.DMaaPResponseCode;
-import com.att.dmf.mr.exception.ErrorResponse;
-import com.att.dmf.mr.metabroker.Broker.TopicExistsException;
-import com.att.dmf.mr.service.EventsService;
-import com.att.dmf.mr.utils.ConfigurationReader;
-import com.att.dmf.mr.utils.Utils;
+import org.onap.dmaap.dmf.mr.CambriaApiException;
+import org.onap.dmaap.dmf.mr.backends.ConsumerFactory.UnavailableException;
+import org.onap.dmaap.dmf.mr.beans.DMaaPContext;
+import org.onap.dmaap.dmf.mr.exception.DMaaPErrorMessages;
+import org.onap.dmaap.dmf.mr.exception.DMaaPResponseCode;
+import org.onap.dmaap.dmf.mr.exception.ErrorResponse;
+import org.onap.dmaap.dmf.mr.metabroker.Broker.TopicExistsException;
+import org.onap.dmaap.dmf.mr.service.EventsService;
+import org.onap.dmaap.dmf.mr.utils.ConfigurationReader;
+import org.onap.dmaap.dmf.mr.utils.Utils;
 import com.att.nsa.configs.ConfigDbException;
 import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting;
 import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;
-import com.att.dmf.mr.exception.DMaaPAccessDeniedException;
+import org.onap.dmaap.dmf.mr.exception.DMaaPAccessDeniedException;
 /**
  * This class is a CXF REST service which acts 
  * as gateway for MR Event Service.
diff --git a/src/main/java/com/att/nsa/dmaap/service/MMRestService.java b/src/main/java/com/att/nsa/dmaap/service/MMRestService.java
index 0415c57..853c9ba 100644
--- a/src/main/java/com/att/nsa/dmaap/service/MMRestService.java
+++ b/src/main/java/com/att/nsa/dmaap/service/MMRestService.java
@@ -42,9 +42,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
-import com.att.dmf.mr.utils.ConfigurationReader;
-import com.att.dmf.mr.utils.DMaaPResponseBuilder;
-import com.att.dmf.mr.utils.Utils;
+import org.onap.dmaap.dmf.mr.utils.ConfigurationReader;
+import org.onap.dmaap.dmf.mr.utils.DMaaPResponseBuilder;
+import org.onap.dmaap.dmf.mr.utils.Utils;
 import com.att.nsa.configs.ConfigDbException;
 import com.att.nsa.dmaap.mmagent.*;
 import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting;
@@ -55,19 +55,19 @@ import com.google.gson.JsonSyntaxException;
 import edu.emory.mathcs.backport.java.util.Arrays;
 
 import com.att.ajsc.filemonitor.AJSCPropertiesMap;
-import com.att.dmf.mr.CambriaApiException;
-import com.att.dmf.mr.backends.ConsumerFactory.UnavailableException;
+import org.onap.dmaap.dmf.mr.CambriaApiException;
+import org.onap.dmaap.dmf.mr.backends.ConsumerFactory.UnavailableException;
 
 import org.json.JSONArray;
 import org.json.JSONException;
-import com.att.dmf.mr.beans.DMaaPContext;
-import com.att.dmf.mr.constants.CambriaConstants;
-import com.att.dmf.mr.exception.DMaaPErrorMessages;
-import com.att.dmf.mr.metabroker.Broker.TopicExistsException;
-import com.att.dmf.mr.security.DMaaPAAFAuthenticator;
-import com.att.dmf.mr.security.DMaaPAAFAuthenticatorImpl;
-import com.att.dmf.mr.security.DMaaPAuthenticatorImpl;
-import com.att.dmf.mr.service.MMService;
+import org.onap.dmaap.dmf.mr.beans.DMaaPContext;
+import org.onap.dmaap.dmf.mr.constants.CambriaConstants;
+import org.onap.dmaap.dmf.mr.exception.DMaaPErrorMessages;
+import org.onap.dmaap.dmf.mr.metabroker.Broker.TopicExistsException;
+import org.onap.dmaap.dmf.mr.security.DMaaPAAFAuthenticator;
+import org.onap.dmaap.dmf.mr.security.DMaaPAAFAuthenticatorImpl;
+import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticatorImpl;
+import org.onap.dmaap.dmf.mr.service.MMService;
 
 /**
  * Rest Service class for Mirror Maker proxy Rest Services
diff --git a/src/main/java/com/att/nsa/dmaap/service/MetricsRestService.java b/src/main/java/com/att/nsa/dmaap/service/MetricsRestService.java
index 2b7b560..8ff58f3 100644
--- a/src/main/java/com/att/nsa/dmaap/service/MetricsRestService.java
+++ b/src/main/java/com/att/nsa/dmaap/service/MetricsRestService.java
@@ -38,12 +38,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
-import com.att.dmf.mr.CambriaApiException;
-import com.att.dmf.mr.beans.DMaaPContext;
-import com.att.dmf.mr.exception.DMaaPResponseCode;
-import com.att.dmf.mr.exception.ErrorResponse;
-import com.att.dmf.mr.service.MetricsService;
-import com.att.dmf.mr.utils.ConfigurationReader;
+import org.onap.dmaap.dmf.mr.CambriaApiException;
+import org.onap.dmaap.dmf.mr.beans.DMaaPContext;
+import org.onap.dmaap.dmf.mr.exception.DMaaPResponseCode;
+import org.onap.dmaap.dmf.mr.exception.ErrorResponse;
+import org.onap.dmaap.dmf.mr.service.MetricsService;
+import org.onap.dmaap.dmf.mr.utils.ConfigurationReader;
 
 /**
  * This class is a CXF REST service which acts 
diff --git a/src/main/java/com/att/nsa/dmaap/service/ServiceUtil.java b/src/main/java/com/att/nsa/dmaap/service/ServiceUtil.java
index 4045ae3..d73bcaf 100644
--- a/src/main/java/com/att/nsa/dmaap/service/ServiceUtil.java
+++ b/src/main/java/com/att/nsa/dmaap/service/ServiceUtil.java
@@ -19,10 +19,10 @@
  */
 package com.att.nsa.dmaap.service;
 
-import com.att.dmf.mr.beans.DMaaPContext;
+import org.onap.dmaap.dmf.mr.beans.DMaaPContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import com.att.dmf.mr.utils.ConfigurationReader;
+import org.onap.dmaap.dmf.mr.utils.ConfigurationReader;
 
 public class ServiceUtil {
 	private static DMaaPContext dmaaPContext;
diff --git a/src/main/java/com/att/nsa/dmaap/service/TopicRestService.java b/src/main/java/com/att/nsa/dmaap/service/TopicRestService.java
index 3540664..42049d2 100644
--- a/src/main/java/com/att/nsa/dmaap/service/TopicRestService.java
+++ b/src/main/java/com/att/nsa/dmaap/service/TopicRestService.java
@@ -45,19 +45,19 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-import com.att.dmf.mr.CambriaApiException;
-import com.att.dmf.mr.beans.DMaaPContext;
-import com.att.dmf.mr.beans.TopicBean;
-import com.att.dmf.mr.constants.CambriaConstants;
-import com.att.dmf.mr.exception.DMaaPAccessDeniedException;
-import com.att.dmf.mr.exception.DMaaPErrorMessages;
-import com.att.dmf.mr.exception.DMaaPResponseCode;
-import com.att.dmf.mr.exception.ErrorResponse;
-import com.att.dmf.mr.metabroker.Broker.TopicExistsException;
-import com.att.dmf.mr.security.DMaaPAAFAuthenticator;
-import com.att.dmf.mr.security.DMaaPAAFAuthenticatorImpl;
-import com.att.dmf.mr.service.TopicService;
-import com.att.dmf.mr.utils.ConfigurationReader;
+import org.onap.dmaap.dmf.mr.CambriaApiException;
+import org.onap.dmaap.dmf.mr.beans.DMaaPContext;
+import org.onap.dmaap.dmf.mr.beans.TopicBean;
+import org.onap.dmaap.dmf.mr.constants.CambriaConstants;
+import org.onap.dmaap.dmf.mr.exception.DMaaPAccessDeniedException;
+import org.onap.dmaap.dmf.mr.exception.DMaaPErrorMessages;
+import org.onap.dmaap.dmf.mr.exception.DMaaPResponseCode;
+import org.onap.dmaap.dmf.mr.exception.ErrorResponse;
+import org.onap.dmaap.dmf.mr.metabroker.Broker.TopicExistsException;
+import org.onap.dmaap.dmf.mr.security.DMaaPAAFAuthenticator;
+import org.onap.dmaap.dmf.mr.security.DMaaPAAFAuthenticatorImpl;
+import org.onap.dmaap.dmf.mr.service.TopicService;
+import org.onap.dmaap.dmf.mr.utils.ConfigurationReader;
 import com.att.nsa.configs.ConfigDbException;
 import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;
 
diff --git a/src/main/java/com/att/nsa/dmaap/service/TransactionRestService.java b/src/main/java/com/att/nsa/dmaap/service/TransactionRestService.java
index 784f7c5..9354f5c 100644
--- a/src/main/java/com/att/nsa/dmaap/service/TransactionRestService.java
+++ b/src/main/java/com/att/nsa/dmaap/service/TransactionRestService.java
@@ -38,12 +38,12 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import com.att.aft.dme2.internal.jettison.json.JSONException;
-import com.att.dmf.mr.CambriaApiException;
-import com.att.dmf.mr.beans.DMaaPContext;
-import com.att.dmf.mr.exception.DMaaPResponseCode;
-import com.att.dmf.mr.exception.ErrorResponse;
-import com.att.dmf.mr.service.TransactionService;
-import com.att.dmf.mr.utils.ConfigurationReader;
+import  org.onap.dmaap.dmf.mr.CambriaApiException;
+import  org.onap.dmaap.dmf.mr.beans.DMaaPContext;
+import  org.onap.dmaap.dmf.mr.exception.DMaaPResponseCode;
+import  org.onap.dmaap.dmf.mr.exception.ErrorResponse;
+import  org.onap.dmaap.dmf.mr.service.TransactionService;
+import  org.onap.dmaap.dmf.mr.utils.ConfigurationReader;
 import com.att.nsa.configs.ConfigDbException;
 
 /**
diff --git a/src/main/java/com/att/nsa/dmaap/service/UIRestServices.java b/src/main/java/com/att/nsa/dmaap/service/UIRestServices.java
index 445da5f..f82d0a1 100644
--- a/src/main/java/com/att/nsa/dmaap/service/UIRestServices.java
+++ b/src/main/java/com/att/nsa/dmaap/service/UIRestServices.java
@@ -40,10 +40,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
-import com.att.dmf.mr.beans.DMaaPContext;
-import com.att.dmf.mr.service.UIService;
-import com.att.dmf.mr.utils.ConfigurationReader;
-import com.att.dmf.mr.utils.DMaaPResponseBuilder;
+import org.onap.dmaap.dmf.mr.beans.DMaaPContext;
+import org.onap.dmaap.dmf.mr.service.UIService;
+import org.onap.dmaap.dmf.mr.utils.ConfigurationReader;
+import org.onap.dmaap.dmf.mr.utils.DMaaPResponseBuilder;
 import com.att.nsa.configs.ConfigDbException;
 
 /**
diff --git a/src/main/java/com/att/nsa/dmaap/tools/ConfigTool.java b/src/main/java/com/att/nsa/dmaap/tools/ConfigTool.java
index bf1c1fb..d896bdd 100644
--- a/src/main/java/com/att/nsa/dmaap/tools/ConfigTool.java
+++ b/src/main/java/com/att/nsa/dmaap/tools/ConfigTool.java
@@ -31,8 +31,8 @@ import java.util.Map.Entry;
 import org.json.JSONException;
 
 import com.att.nsa.apiServer.CommonServlet;
-import com.att.dmf.mr.beans.DMaaPKafkaMetaBroker;
-import com.att.dmf.mr.metabroker.Topic;
+import org.onap.dmaap.dmf.mr.beans.DMaaPKafkaMetaBroker;
+import org.onap.dmaap.dmf.mr.metabroker.Topic;
 import com.att.nsa.cmdtool.Command;
 import com.att.nsa.cmdtool.CommandLineTool;
 import com.att.nsa.cmdtool.CommandNotReadyException;
diff --git a/src/main/java/com/att/nsa/dmaap/tools/ConfigToolContext.java b/src/main/java/com/att/nsa/dmaap/tools/ConfigToolContext.java
index c4369f1..f61d179 100644
--- a/src/main/java/com/att/nsa/dmaap/tools/ConfigToolContext.java
+++ b/src/main/java/com/att/nsa/dmaap/tools/ConfigToolContext.java
@@ -21,7 +21,7 @@
  *******************************************************************************/
 package com.att.nsa.dmaap.tools;
 
-import com.att.dmf.mr.beans.DMaaPMetricsSet;
+import org.onap.dmaap.dmf.mr.beans.DMaaPMetricsSet;
 import com.att.nsa.cmdtool.CommandContext;
 import com.att.nsa.configs.ConfigDb;
 import com.att.nsa.drumlin.till.nv.rrNvReadable;
diff --git a/src/main/java/com/att/nsa/dmaap/util/ContentLengthInterceptor.java b/src/main/java/com/att/nsa/dmaap/util/ContentLengthInterceptor.java
index 4ed9322..4ddc54a 100644
--- a/src/main/java/com/att/nsa/dmaap/util/ContentLengthInterceptor.java
+++ b/src/main/java/com/att/nsa/dmaap/util/ContentLengthInterceptor.java
@@ -30,9 +30,9 @@ import com.att.eelf.configuration.EELFManager;
 import org.json.JSONException;

 import org.json.JSONObject;

 import org.springframework.stereotype.Component;

-import com.att.dmf.mr.CambriaApiException;

-import com.att.dmf.mr.exception.DMaaPResponseCode;

-import com.att.dmf.mr.exception.ErrorResponse;

+import org.onap.dmaap.dmf.mr.CambriaApiException;

+import org.onap.dmaap.dmf.mr.exception.DMaaPResponseCode;

+import org.onap.dmaap.dmf.mr.exception.ErrorResponse;

 import ajsc.beans.interceptors.AjscInterceptor;

 

 /**

diff --git a/src/main/java/com/att/nsa/dmaap/util/DMaaPAuthFilter.java b/src/main/java/com/att/nsa/dmaap/util/DMaaPAuthFilter.java
index 64480e6..4ef8626 100644
--- a/src/main/java/com/att/nsa/dmaap/util/DMaaPAuthFilter.java
+++ b/src/main/java/com/att/nsa/dmaap/util/DMaaPAuthFilter.java
@@ -29,7 +29,7 @@ import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 
-import com.att.dmf.mr.utils.Utils;
+import org.onap.dmaap.dmf.mr.utils.Utils;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.springframework.stereotype.Component;
diff --git a/src/main/resources/docker/startup.sh b/src/main/resources/docker/startup.sh
index a857a20..02855bf 100644
--- a/src/main/resources/docker/startup.sh
+++ b/src/main/resources/docker/startup.sh
@@ -29,4 +29,4 @@ echo "Starting using" $runner_file
 
 
 echo "10.12.6.214 aaf-onap-beijing-test aaf-onap-beijing-test.osaaf.org aaf-onap-test.osaaf.org" >> /etc/hosts
-java -jar  -XX:MaxPermSize=256m -XX:PermSize=32m -DSOACLOUD_SERVICE_VERSION=0.0.1 -DAJSC_HOME=$root_directory -DAJSC_CONF_HOME=$config_directory -DAJSC_SHARED_CONFIG=$config_directory -DAJSC_HTTPS_PORT=3905 -Dplatform=NON-PROD -DPid=1306 -Dlogback.configurationFile=/appl/dmaapMR1/bundleconfig/etc/logback.xml -Xmx512m -Xms512m  $runner_file context=/ port=3904 sslport=3905
+java -jar  -XX:MaxPermSize=256m -XX:PermSize=32m -DenableCadi=$enableCadi -DSOACLOUD_SERVICE_VERSION=0.0.1 -DAJSC_HOME=$root_directory -DAJSC_CONF_HOME=$config_directory -DAJSC_SHARED_CONFIG=$config_directory -DAJSC_HTTPS_PORT=3905 -Dplatform=NON-PROD -DPid=1306 -Dlogback.configurationFile=/appl/dmaapMR1/bundleconfig/etc/logback.xml -Xmx512m -Xms512m  $runner_file context=/ port=3904 sslport=3905
diff --git a/src/test/java/com/att/nsa/dmaap/DMaaPCambriaExceptionMapperTest.java b/src/test/java/com/att/nsa/dmaap/DMaaPCambriaExceptionMapperTest.java
index a377db9..89c9400 100644
--- a/src/test/java/com/att/nsa/dmaap/DMaaPCambriaExceptionMapperTest.java
+++ b/src/test/java/com/att/nsa/dmaap/DMaaPCambriaExceptionMapperTest.java
@@ -32,9 +32,9 @@ import org.mockito.Mock;
 import org.powermock.api.mockito.PowerMockito;

 import org.powermock.modules.junit4.PowerMockRunner;

 

-import com.att.dmf.mr.CambriaApiException;

-import com.att.dmf.mr.exception.DMaaPErrorMessages;

-import com.att.dmf.mr.exception.ErrorResponse;

+import org.onap.dmaap.dmf.mr.CambriaApiException;

+import org.onap.dmaap.dmf.mr.exception.DMaaPErrorMessages;

+import org.onap.dmaap.dmf.mr.exception.ErrorResponse;

 @RunWith(PowerMockRunner.class)

 public class DMaaPCambriaExceptionMapperTest {

 

diff --git a/src/test/java/com/att/nsa/dmaap/DMaaPWebExceptionMapperTest.java b/src/test/java/com/att/nsa/dmaap/DMaaPWebExceptionMapperTest.java
index 8807b66..9e67dcd 100644
--- a/src/test/java/com/att/nsa/dmaap/DMaaPWebExceptionMapperTest.java
+++ b/src/test/java/com/att/nsa/dmaap/DMaaPWebExceptionMapperTest.java
@@ -38,7 +38,7 @@ import org.mockito.Mock;
 import org.powermock.api.mockito.PowerMockito;

 import org.powermock.modules.junit4.PowerMockRunner;

 

-import com.att.dmf.mr.exception.DMaaPErrorMessages;

+import org.onap.dmaap.dmf.mr.exception.DMaaPErrorMessages;

 

 @RunWith(PowerMockRunner.class)

 public class DMaaPWebExceptionMapperTest {

diff --git a/src/test/java/com/att/nsa/dmaap/mmagent/CreateMirrorMakerTest.java b/src/test/java/com/att/nsa/dmaap/mmagent/CreateMirrorMakerTest.java
index 20000a4..fde7ab4 100644
--- a/src/test/java/com/att/nsa/dmaap/mmagent/CreateMirrorMakerTest.java
+++ b/src/test/java/com/att/nsa/dmaap/mmagent/CreateMirrorMakerTest.java
@@ -20,7 +20,7 @@
 

 package com.att.nsa.dmaap.mmagent;

 

-import com.att.dmf.mr.CambriaApiException;

+import org.onap.dmaap.dmf.mr.CambriaApiException;

 

 import static org.junit.Assert.*;

 

diff --git a/src/test/java/com/att/nsa/dmaap/service/AdminRestServiceTest.java b/src/test/java/com/att/nsa/dmaap/service/AdminRestServiceTest.java
index 49a4088..5a05a73 100644
--- a/src/test/java/com/att/nsa/dmaap/service/AdminRestServiceTest.java
+++ b/src/test/java/com/att/nsa/dmaap/service/AdminRestServiceTest.java
@@ -28,7 +28,7 @@ import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;

 import org.mockito.Mock;

 import org.mockito.MockitoAnnotations;

-import com.att.dmf.mr.CambriaApiException;

+import org.onap.dmaap.dmf.mr.CambriaApiException;

 

 import static org.junit.Assert.assertTrue;

 import static org.mockito.Mockito.when;

@@ -40,15 +40,15 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import javax.servlet.http.HttpServletRequest;

 import javax.servlet.http.HttpServletResponse;

 

-import com.att.dmf.mr.beans.DMaaPContext;

+import org.onap.dmaap.dmf.mr.beans.DMaaPContext;

 

 import java.io.IOException;

 import java.util.Enumeration;

-import com.att.dmf.mr.service.AdminService;

+import org.onap.dmaap.dmf.mr.service.AdminService;

 import com.att.nsa.configs.ConfigDbException;

 import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;

-import com.att.dmf.mr.beans.DMaaPContext;

-import com.att.dmf.mr.utils.ConfigurationReader;

+import org.onap.dmaap.dmf.mr.beans.DMaaPContext;

+import org.onap.dmaap.dmf.mr.utils.ConfigurationReader;

 import org.powermock.core.classloader.annotations.PrepareForTest;

 

 @RunWith(PowerMockRunner.class)

diff --git a/src/test/java/com/att/nsa/dmaap/service/ApiKeysRestServiceTest.java b/src/test/java/com/att/nsa/dmaap/service/ApiKeysRestServiceTest.java
index 8a630b1..c784f90 100644
--- a/src/test/java/com/att/nsa/dmaap/service/ApiKeysRestServiceTest.java
+++ b/src/test/java/com/att/nsa/dmaap/service/ApiKeysRestServiceTest.java
@@ -31,8 +31,8 @@ import org.junit.Before;
 import org.junit.Test;

 import org.junit.runner.RunWith;

 

-import com.att.dmf.mr.CambriaApiException;

-import com.att.dmf.mr.beans.ApiKeyBean;

+import org.onap.dmaap.dmf.mr.CambriaApiException;

+import org.onap.dmaap.dmf.mr.beans.ApiKeyBean;

 import com.att.nsa.configs.ConfigDbException;

 import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;

 

@@ -50,11 +50,11 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import javax.servlet.http.HttpServletRequest;

 import javax.servlet.http.HttpServletResponse;

 

-import com.att.dmf.mr.beans.DMaaPContext;

+import org.onap.dmaap.dmf.mr.beans.DMaaPContext;

 

-import com.att.dmf.mr.utils.ConfigurationReader;

-import com.att.dmf.mr.service.ApiKeysService;

-import com.att.dmf.mr.utils.ConfigurationReader;

+import org.onap.dmaap.dmf.mr.utils.ConfigurationReader;

+import org.onap.dmaap.dmf.mr.service.ApiKeysService;

+import org.onap.dmaap.dmf.mr.utils.ConfigurationReader;

 import com.att.nsa.configs.ConfigDbException;

 import com.att.nsa.security.db.NsaApiDb.KeyExistsException;

 

diff --git a/src/test/java/com/att/nsa/dmaap/service/EventsRestServiceTest.java b/src/test/java/com/att/nsa/dmaap/service/EventsRestServiceTest.java
index f8e862d..985d38f 100644
--- a/src/test/java/com/att/nsa/dmaap/service/EventsRestServiceTest.java
+++ b/src/test/java/com/att/nsa/dmaap/service/EventsRestServiceTest.java
@@ -37,12 +37,12 @@ import org.powermock.api.mockito.PowerMockito;
 import static org.mockito.Mockito.when;

 

 import com.att.ajsc.beans.PropertiesMapBean;

-import com.att.dmf.mr.CambriaApiException;

-import com.att.dmf.mr.backends.ConsumerFactory.UnavailableException;

-import com.att.dmf.mr.exception.DMaaPErrorMessages;

-import com.att.dmf.mr.service.EventsService;

+import org.onap.dmaap.dmf.mr.CambriaApiException;

+import org.onap.dmaap.dmf.mr.backends.ConsumerFactory.UnavailableException;

+import org.onap.dmaap.dmf.mr.exception.DMaaPErrorMessages;

+import org.onap.dmaap.dmf.mr.service.EventsService;

 import com.att.nsa.configs.ConfigDbException;

-import com.att.dmf.mr.utils.Utils;

+import org.onap.dmaap.dmf.mr.utils.Utils;

 import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting;

 import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;

 

@@ -56,10 +56,10 @@ import javax.servlet.ServletInputStream;
 import javax.servlet.ServletOutputStream;

 import javax.servlet.http.HttpServletRequest;

 

-import com.att.dmf.mr.beans.DMaaPContext;

-import com.att.dmf.mr.exception.DMaaPAccessDeniedException;

-import com.att.dmf.mr.exception.ErrorResponse;

-import com.att.dmf.mr.metabroker.Broker.TopicExistsException;

+import org.onap.dmaap.dmf.mr.beans.DMaaPContext;

+import org.onap.dmaap.dmf.mr.exception.DMaaPAccessDeniedException;

+import org.onap.dmaap.dmf.mr.exception.ErrorResponse;

+import org.onap.dmaap.dmf.mr.metabroker.Broker.TopicExistsException;

 

 @RunWith(PowerMockRunner.class)

 @PrepareForTest({ PropertiesMapBean.class })

diff --git a/src/test/java/com/att/nsa/dmaap/service/MMRestServiceTest.java b/src/test/java/com/att/nsa/dmaap/service/MMRestServiceTest.java
index 3f98dc2..29d6bc4 100644
--- a/src/test/java/com/att/nsa/dmaap/service/MMRestServiceTest.java
+++ b/src/test/java/com/att/nsa/dmaap/service/MMRestServiceTest.java
@@ -55,19 +55,19 @@ import org.powermock.modules.junit4.PowerMockRunner;
 

 import com.att.ajsc.beans.PropertiesMapBean;

 import com.att.ajsc.filemonitor.AJSCPropertiesMap;

-import com.att.dmf.mr.CambriaApiException;

-import com.att.dmf.mr.beans.DMaaPContext;

-import com.att.dmf.mr.beans.DMaaPKafkaMetaBroker;

-import com.att.dmf.mr.constants.CambriaConstants;

-import com.att.dmf.mr.exception.DMaaPAccessDeniedException;

-import com.att.dmf.mr.exception.DMaaPErrorMessages;

-import com.att.dmf.mr.metabroker.Broker.TopicExistsException;

-import com.att.dmf.mr.metabroker.Topic;

-import com.att.dmf.mr.security.DMaaPAAFAuthenticator;

-import com.att.dmf.mr.security.DMaaPAAFAuthenticatorImpl;

-import com.att.dmf.mr.security.DMaaPAuthenticator;

-import com.att.dmf.mr.service.MMService;

-import com.att.dmf.mr.utils.ConfigurationReader;

+import org.onap.dmaap.dmf.mr.CambriaApiException;

+import org.onap.dmaap.dmf.mr.beans.DMaaPContext;

+import org.onap.dmaap.dmf.mr.beans.DMaaPKafkaMetaBroker;

+import org.onap.dmaap.dmf.mr.constants.CambriaConstants;

+import org.onap.dmaap.dmf.mr.exception.DMaaPAccessDeniedException;

+import org.onap.dmaap.dmf.mr.exception.DMaaPErrorMessages;

+import org.onap.dmaap.dmf.mr.metabroker.Broker.TopicExistsException;

+import org.onap.dmaap.dmf.mr.metabroker.Topic;

+import org.onap.dmaap.dmf.mr.security.DMaaPAAFAuthenticator;

+import org.onap.dmaap.dmf.mr.security.DMaaPAAFAuthenticatorImpl;

+import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticator;

+import org.onap.dmaap.dmf.mr.service.MMService;

+import org.onap.dmaap.dmf.mr.utils.ConfigurationReader;

 import com.att.nsa.configs.ConfigDbException;

 import com.att.nsa.dmaap.mmagent.CreateMirrorMaker;

 import com.att.nsa.dmaap.mmagent.MirrorMaker;

diff --git a/src/test/java/com/att/nsa/dmaap/service/MetricsRestServiceTest.java b/src/test/java/com/att/nsa/dmaap/service/MetricsRestServiceTest.java
index 1b5f39c..5f0669c 100644
--- a/src/test/java/com/att/nsa/dmaap/service/MetricsRestServiceTest.java
+++ b/src/test/java/com/att/nsa/dmaap/service/MetricsRestServiceTest.java
@@ -32,8 +32,8 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;

 

 import com.att.ajsc.beans.PropertiesMapBean;

-import com.att.dmf.mr.CambriaApiException;

-import com.att.dmf.mr.service.MetricsService;

+import org.onap.dmaap.dmf.mr.CambriaApiException;

+import org.onap.dmaap.dmf.mr.service.MetricsService;

 

 

 @RunWith(PowerMockRunner.class)

diff --git a/src/test/java/com/att/nsa/dmaap/service/TopicRestServiceTest.java b/src/test/java/com/att/nsa/dmaap/service/TopicRestServiceTest.java
index 8ef1391..c805fcb 100644
--- a/src/test/java/com/att/nsa/dmaap/service/TopicRestServiceTest.java
+++ b/src/test/java/com/att/nsa/dmaap/service/TopicRestServiceTest.java
@@ -50,20 +50,20 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;

 

 import com.att.ajsc.beans.PropertiesMapBean;

-import com.att.dmf.mr.CambriaApiException;

-import com.att.dmf.mr.beans.DMaaPContext;

-import com.att.dmf.mr.beans.DMaaPKafkaMetaBroker;

-import com.att.dmf.mr.beans.TopicBean;

-import com.att.dmf.mr.constants.CambriaConstants;

-import com.att.dmf.mr.exception.DMaaPAccessDeniedException;

-import com.att.dmf.mr.exception.DMaaPErrorMessages;

-import com.att.dmf.mr.metabroker.Broker.TopicExistsException;

-import com.att.dmf.mr.metabroker.Topic;

-import com.att.dmf.mr.security.DMaaPAAFAuthenticator;

-import com.att.dmf.mr.security.DMaaPAuthenticator;

-import com.att.dmf.mr.service.TopicService;

-import com.att.dmf.mr.utils.ConfigurationReader;

-import com.att.dmf.mr.utils.DMaaPResponseBuilder;

+import org.onap.dmaap.dmf.mr.CambriaApiException;

+import org.onap.dmaap.dmf.mr.beans.DMaaPContext;

+import org.onap.dmaap.dmf.mr.beans.DMaaPKafkaMetaBroker;

+import org.onap.dmaap.dmf.mr.beans.TopicBean;

+import org.onap.dmaap.dmf.mr.constants.CambriaConstants;

+import org.onap.dmaap.dmf.mr.exception.DMaaPAccessDeniedException;

+import org.onap.dmaap.dmf.mr.exception.DMaaPErrorMessages;

+import org.onap.dmaap.dmf.mr.metabroker.Broker.TopicExistsException;

+import org.onap.dmaap.dmf.mr.metabroker.Topic;

+import org.onap.dmaap.dmf.mr.security.DMaaPAAFAuthenticator;

+import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticator;

+import org.onap.dmaap.dmf.mr.service.TopicService;

+import org.onap.dmaap.dmf.mr.utils.ConfigurationReader;

+import org.onap.dmaap.dmf.mr.utils.DMaaPResponseBuilder;

 import com.att.nsa.configs.ConfigDbException;

 import com.att.nsa.security.NsaAcl;

 import com.att.nsa.security.NsaApiKey;

diff --git a/src/test/java/com/att/nsa/dmaap/service/TransactionRestServiceTest.java b/src/test/java/com/att/nsa/dmaap/service/TransactionRestServiceTest.java
index 536a685..a5abb75 100644
--- a/src/test/java/com/att/nsa/dmaap/service/TransactionRestServiceTest.java
+++ b/src/test/java/com/att/nsa/dmaap/service/TransactionRestServiceTest.java
@@ -37,10 +37,10 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;

 

 import com.att.ajsc.beans.PropertiesMapBean;

-import com.att.dmf.mr.CambriaApiException;

-import com.att.dmf.mr.beans.DMaaPContext;

-import com.att.dmf.mr.service.EventsService;

-import com.att.dmf.mr.service.TransactionService;

+import org.onap.dmaap.dmf.mr.CambriaApiException;

+import org.onap.dmaap.dmf.mr.beans.DMaaPContext;

+import org.onap.dmaap.dmf.mr.service.EventsService;

+import org.onap.dmaap.dmf.mr.service.TransactionService;

 import com.att.nsa.configs.ConfigDbException;

 import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;

 import com.att.aft.dme2.internal.jettison.json.JSONException;

diff --git a/src/test/java/com/att/nsa/dmaap/service/UIRestServicesTest.java b/src/test/java/com/att/nsa/dmaap/service/UIRestServicesTest.java
index d8363ac..ea6535a 100644
--- a/src/test/java/com/att/nsa/dmaap/service/UIRestServicesTest.java
+++ b/src/test/java/com/att/nsa/dmaap/service/UIRestServicesTest.java
@@ -29,7 +29,7 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

-import com.att.dmf.mr.CambriaApiException;

+import org.onap.dmaap.dmf.mr.CambriaApiException;

 import com.att.nsa.configs.ConfigDbException;

 import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;

 

diff --git a/src/test/java/com/att/nsa/dmaap/util/DMaaPAuthFilterTest.java b/src/test/java/com/att/nsa/dmaap/util/DMaaPAuthFilterTest.java
index f5ad531..dc59f9c 100644
--- a/src/test/java/com/att/nsa/dmaap/util/DMaaPAuthFilterTest.java
+++ b/src/test/java/com/att/nsa/dmaap/util/DMaaPAuthFilterTest.java
@@ -41,8 +41,8 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;

 

 import com.att.ajsc.beans.PropertiesMapBean;

-import com.att.dmf.mr.beans.DMaaPContext;

-import com.att.dmf.mr.exception.DMaaPResponseCode;

+import org.onap.dmaap.dmf.mr.beans.DMaaPContext;

+import org.onap.dmaap.dmf.mr.exception.DMaaPResponseCode;

 

 

 @RunWith(PowerMockRunner.class)