<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>
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
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
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;
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
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;
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;
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;
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.
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;
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
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
*/
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;
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;
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;
/**
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;
/**
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;
*******************************************************************************/
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;
import org.json.JSONException;\r
import org.json.JSONObject;\r
import org.springframework.stereotype.Component;\r
-import com.att.dmf.mr.CambriaApiException;\r
-import com.att.dmf.mr.exception.DMaaPResponseCode;\r
-import com.att.dmf.mr.exception.ErrorResponse;\r
+import org.onap.dmaap.dmf.mr.CambriaApiException;\r
+import org.onap.dmaap.dmf.mr.exception.DMaaPResponseCode;\r
+import org.onap.dmaap.dmf.mr.exception.ErrorResponse;\r
import ajsc.beans.interceptors.AjscInterceptor;\r
\r
/**\r
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;
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
import org.powermock.api.mockito.PowerMockito;\r
import org.powermock.modules.junit4.PowerMockRunner;\r
\r
-import com.att.dmf.mr.CambriaApiException;\r
-import com.att.dmf.mr.exception.DMaaPErrorMessages;\r
-import com.att.dmf.mr.exception.ErrorResponse;\r
+import org.onap.dmaap.dmf.mr.CambriaApiException;\r
+import org.onap.dmaap.dmf.mr.exception.DMaaPErrorMessages;\r
+import org.onap.dmaap.dmf.mr.exception.ErrorResponse;\r
@RunWith(PowerMockRunner.class)\r
public class DMaaPCambriaExceptionMapperTest {\r
\r
import org.powermock.api.mockito.PowerMockito;\r
import org.powermock.modules.junit4.PowerMockRunner;\r
\r
-import com.att.dmf.mr.exception.DMaaPErrorMessages;\r
+import org.onap.dmaap.dmf.mr.exception.DMaaPErrorMessages;\r
\r
@RunWith(PowerMockRunner.class)\r
public class DMaaPWebExceptionMapperTest {\r
\r
package com.att.nsa.dmaap.mmagent;\r
\r
-import com.att.dmf.mr.CambriaApiException;\r
+import org.onap.dmaap.dmf.mr.CambriaApiException;\r
\r
import static org.junit.Assert.*;\r
\r
import org.mockito.InjectMocks;\r
import org.mockito.Mock;\r
import org.mockito.MockitoAnnotations;\r
-import com.att.dmf.mr.CambriaApiException;\r
+import org.onap.dmaap.dmf.mr.CambriaApiException;\r
\r
import static org.junit.Assert.assertTrue;\r
import static org.mockito.Mockito.when;\r
import javax.servlet.http.HttpServletRequest;\r
import javax.servlet.http.HttpServletResponse;\r
\r
-import com.att.dmf.mr.beans.DMaaPContext;\r
+import org.onap.dmaap.dmf.mr.beans.DMaaPContext;\r
\r
import java.io.IOException;\r
import java.util.Enumeration;\r
-import com.att.dmf.mr.service.AdminService;\r
+import org.onap.dmaap.dmf.mr.service.AdminService;\r
import com.att.nsa.configs.ConfigDbException;\r
import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;\r
-import com.att.dmf.mr.beans.DMaaPContext;\r
-import com.att.dmf.mr.utils.ConfigurationReader;\r
+import org.onap.dmaap.dmf.mr.beans.DMaaPContext;\r
+import org.onap.dmaap.dmf.mr.utils.ConfigurationReader;\r
import org.powermock.core.classloader.annotations.PrepareForTest;\r
\r
@RunWith(PowerMockRunner.class)\r
import org.junit.Test;\r
import org.junit.runner.RunWith;\r
\r
-import com.att.dmf.mr.CambriaApiException;\r
-import com.att.dmf.mr.beans.ApiKeyBean;\r
+import org.onap.dmaap.dmf.mr.CambriaApiException;\r
+import org.onap.dmaap.dmf.mr.beans.ApiKeyBean;\r
import com.att.nsa.configs.ConfigDbException;\r
import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;\r
\r
import javax.servlet.http.HttpServletRequest;\r
import javax.servlet.http.HttpServletResponse;\r
\r
-import com.att.dmf.mr.beans.DMaaPContext;\r
+import org.onap.dmaap.dmf.mr.beans.DMaaPContext;\r
\r
-import com.att.dmf.mr.utils.ConfigurationReader;\r
-import com.att.dmf.mr.service.ApiKeysService;\r
-import com.att.dmf.mr.utils.ConfigurationReader;\r
+import org.onap.dmaap.dmf.mr.utils.ConfigurationReader;\r
+import org.onap.dmaap.dmf.mr.service.ApiKeysService;\r
+import org.onap.dmaap.dmf.mr.utils.ConfigurationReader;\r
import com.att.nsa.configs.ConfigDbException;\r
import com.att.nsa.security.db.NsaApiDb.KeyExistsException;\r
\r
import static org.mockito.Mockito.when;\r
\r
import com.att.ajsc.beans.PropertiesMapBean;\r
-import com.att.dmf.mr.CambriaApiException;\r
-import com.att.dmf.mr.backends.ConsumerFactory.UnavailableException;\r
-import com.att.dmf.mr.exception.DMaaPErrorMessages;\r
-import com.att.dmf.mr.service.EventsService;\r
+import org.onap.dmaap.dmf.mr.CambriaApiException;\r
+import org.onap.dmaap.dmf.mr.backends.ConsumerFactory.UnavailableException;\r
+import org.onap.dmaap.dmf.mr.exception.DMaaPErrorMessages;\r
+import org.onap.dmaap.dmf.mr.service.EventsService;\r
import com.att.nsa.configs.ConfigDbException;\r
-import com.att.dmf.mr.utils.Utils;\r
+import org.onap.dmaap.dmf.mr.utils.Utils;\r
import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting;\r
import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;\r
\r
import javax.servlet.ServletOutputStream;\r
import javax.servlet.http.HttpServletRequest;\r
\r
-import com.att.dmf.mr.beans.DMaaPContext;\r
-import com.att.dmf.mr.exception.DMaaPAccessDeniedException;\r
-import com.att.dmf.mr.exception.ErrorResponse;\r
-import com.att.dmf.mr.metabroker.Broker.TopicExistsException;\r
+import org.onap.dmaap.dmf.mr.beans.DMaaPContext;\r
+import org.onap.dmaap.dmf.mr.exception.DMaaPAccessDeniedException;\r
+import org.onap.dmaap.dmf.mr.exception.ErrorResponse;\r
+import org.onap.dmaap.dmf.mr.metabroker.Broker.TopicExistsException;\r
\r
@RunWith(PowerMockRunner.class)\r
@PrepareForTest({ PropertiesMapBean.class })\r
\r
import com.att.ajsc.beans.PropertiesMapBean;\r
import com.att.ajsc.filemonitor.AJSCPropertiesMap;\r
-import com.att.dmf.mr.CambriaApiException;\r
-import com.att.dmf.mr.beans.DMaaPContext;\r
-import com.att.dmf.mr.beans.DMaaPKafkaMetaBroker;\r
-import com.att.dmf.mr.constants.CambriaConstants;\r
-import com.att.dmf.mr.exception.DMaaPAccessDeniedException;\r
-import com.att.dmf.mr.exception.DMaaPErrorMessages;\r
-import com.att.dmf.mr.metabroker.Broker.TopicExistsException;\r
-import com.att.dmf.mr.metabroker.Topic;\r
-import com.att.dmf.mr.security.DMaaPAAFAuthenticator;\r
-import com.att.dmf.mr.security.DMaaPAAFAuthenticatorImpl;\r
-import com.att.dmf.mr.security.DMaaPAuthenticator;\r
-import com.att.dmf.mr.service.MMService;\r
-import com.att.dmf.mr.utils.ConfigurationReader;\r
+import org.onap.dmaap.dmf.mr.CambriaApiException;\r
+import org.onap.dmaap.dmf.mr.beans.DMaaPContext;\r
+import org.onap.dmaap.dmf.mr.beans.DMaaPKafkaMetaBroker;\r
+import org.onap.dmaap.dmf.mr.constants.CambriaConstants;\r
+import org.onap.dmaap.dmf.mr.exception.DMaaPAccessDeniedException;\r
+import org.onap.dmaap.dmf.mr.exception.DMaaPErrorMessages;\r
+import org.onap.dmaap.dmf.mr.metabroker.Broker.TopicExistsException;\r
+import org.onap.dmaap.dmf.mr.metabroker.Topic;\r
+import org.onap.dmaap.dmf.mr.security.DMaaPAAFAuthenticator;\r
+import org.onap.dmaap.dmf.mr.security.DMaaPAAFAuthenticatorImpl;\r
+import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticator;\r
+import org.onap.dmaap.dmf.mr.service.MMService;\r
+import org.onap.dmaap.dmf.mr.utils.ConfigurationReader;\r
import com.att.nsa.configs.ConfigDbException;\r
import com.att.nsa.dmaap.mmagent.CreateMirrorMaker;\r
import com.att.nsa.dmaap.mmagent.MirrorMaker;\r
import org.powermock.modules.junit4.PowerMockRunner;\r
\r
import com.att.ajsc.beans.PropertiesMapBean;\r
-import com.att.dmf.mr.CambriaApiException;\r
-import com.att.dmf.mr.service.MetricsService;\r
+import org.onap.dmaap.dmf.mr.CambriaApiException;\r
+import org.onap.dmaap.dmf.mr.service.MetricsService;\r
\r
\r
@RunWith(PowerMockRunner.class)\r
import org.powermock.modules.junit4.PowerMockRunner;\r
\r
import com.att.ajsc.beans.PropertiesMapBean;\r
-import com.att.dmf.mr.CambriaApiException;\r
-import com.att.dmf.mr.beans.DMaaPContext;\r
-import com.att.dmf.mr.beans.DMaaPKafkaMetaBroker;\r
-import com.att.dmf.mr.beans.TopicBean;\r
-import com.att.dmf.mr.constants.CambriaConstants;\r
-import com.att.dmf.mr.exception.DMaaPAccessDeniedException;\r
-import com.att.dmf.mr.exception.DMaaPErrorMessages;\r
-import com.att.dmf.mr.metabroker.Broker.TopicExistsException;\r
-import com.att.dmf.mr.metabroker.Topic;\r
-import com.att.dmf.mr.security.DMaaPAAFAuthenticator;\r
-import com.att.dmf.mr.security.DMaaPAuthenticator;\r
-import com.att.dmf.mr.service.TopicService;\r
-import com.att.dmf.mr.utils.ConfigurationReader;\r
-import com.att.dmf.mr.utils.DMaaPResponseBuilder;\r
+import org.onap.dmaap.dmf.mr.CambriaApiException;\r
+import org.onap.dmaap.dmf.mr.beans.DMaaPContext;\r
+import org.onap.dmaap.dmf.mr.beans.DMaaPKafkaMetaBroker;\r
+import org.onap.dmaap.dmf.mr.beans.TopicBean;\r
+import org.onap.dmaap.dmf.mr.constants.CambriaConstants;\r
+import org.onap.dmaap.dmf.mr.exception.DMaaPAccessDeniedException;\r
+import org.onap.dmaap.dmf.mr.exception.DMaaPErrorMessages;\r
+import org.onap.dmaap.dmf.mr.metabroker.Broker.TopicExistsException;\r
+import org.onap.dmaap.dmf.mr.metabroker.Topic;\r
+import org.onap.dmaap.dmf.mr.security.DMaaPAAFAuthenticator;\r
+import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticator;\r
+import org.onap.dmaap.dmf.mr.service.TopicService;\r
+import org.onap.dmaap.dmf.mr.utils.ConfigurationReader;\r
+import org.onap.dmaap.dmf.mr.utils.DMaaPResponseBuilder;\r
import com.att.nsa.configs.ConfigDbException;\r
import com.att.nsa.security.NsaAcl;\r
import com.att.nsa.security.NsaApiKey;\r
import org.powermock.modules.junit4.PowerMockRunner;\r
\r
import com.att.ajsc.beans.PropertiesMapBean;\r
-import com.att.dmf.mr.CambriaApiException;\r
-import com.att.dmf.mr.beans.DMaaPContext;\r
-import com.att.dmf.mr.service.EventsService;\r
-import com.att.dmf.mr.service.TransactionService;\r
+import org.onap.dmaap.dmf.mr.CambriaApiException;\r
+import org.onap.dmaap.dmf.mr.beans.DMaaPContext;\r
+import org.onap.dmaap.dmf.mr.service.EventsService;\r
+import org.onap.dmaap.dmf.mr.service.TransactionService;\r
import com.att.nsa.configs.ConfigDbException;\r
import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;\r
import com.att.aft.dme2.internal.jettison.json.JSONException;\r
import org.junit.Before;\r
import org.junit.Test;\r
\r
-import com.att.dmf.mr.CambriaApiException;\r
+import org.onap.dmaap.dmf.mr.CambriaApiException;\r
import com.att.nsa.configs.ConfigDbException;\r
import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;\r
\r
import org.powermock.modules.junit4.PowerMockRunner;\r
\r
import com.att.ajsc.beans.PropertiesMapBean;\r
-import com.att.dmf.mr.beans.DMaaPContext;\r
-import com.att.dmf.mr.exception.DMaaPResponseCode;\r
+import org.onap.dmaap.dmf.mr.beans.DMaaPContext;\r
+import org.onap.dmaap.dmf.mr.exception.DMaaPResponseCode;\r
\r
\r
@RunWith(PowerMockRunner.class)\r