update the package name

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

5 files changed, 39 insertions, 35 deletions

diff --git a/src/main/ajsc/dmaap_v1/dmaap/v1/conf/FileMonitorBeans.xml b/src/main/ajsc/dmaap_v1/dmaap/v1/conf/FileMonitorBeans.xml
index a2c393c..cf25ab5 100644
--- a/src/main/ajsc/dmaap_v1/dmaap/v1/conf/FileMonitorBeans.xml
+++ b/src/main/ajsc/dmaap_v1/dmaap/v1/conf/FileMonitorBeans.xml
@@ -5,11 +5,11 @@
 	<bean
 		class="org.springframework.context.annotation.CommonAnnotationBeanPostProcessor" />
 		
-	<bean id="ServicePropertiesListener" class="com.att.nsa.dmaap.filemonitor.ServicePropertiesListener" />
+	<bean id="ServicePropertiesListener" class="org.onap.dmaap.filemonitor.ServicePropertiesListener" />
 	
-	<bean id="ServicePropertiesMap" class="com.att.nsa.dmaap.filemonitor.ServicePropertiesMap" />
+	<bean id="ServicePropertiesMap" class="org.onap.dmaap.filemonitor.ServicePropertiesMap" />
 
-	<bean id="ServicePropertyService" class="com.att.nsa.dmaap.filemonitor.ServicePropertyService">
+	<bean id="ServicePropertyService" class="org.onap.dmaap.filemonitor.ServicePropertyService">
 		<property name="loadOnStartup" value="false" />
 		<property name="fileChangedListener" ref="ServicePropertiesListener" />
 		<property name="filePropertiesMap" ref="ServicePropertiesMap" />
diff --git a/src/main/ajsc/dmaap_v1/dmaap/v1/conf/HelloWorldBeans.xml b/src/main/ajsc/dmaap_v1/dmaap/v1/conf/HelloWorldBeans.xml
index 9cb67d4..04db236 100644
--- a/src/main/ajsc/dmaap_v1/dmaap/v1/conf/HelloWorldBeans.xml
+++ b/src/main/ajsc/dmaap_v1/dmaap/v1/conf/HelloWorldBeans.xml
@@ -4,5 +4,5 @@
 	       http://www.springframework.org/schema/beans
 	       http://www.springframework.org/schema/beans/spring-beans.xsd">
 	<bean id="helloWorld" name="helloWorld"
-		class="com.att.nsa.dmaap.HelloWorld" />
+		class="org.onap.dmaap.HelloWorld" />
 </beans>		
diff --git a/src/main/ajsc/dmaap_v1/dmaap/v1/conf/jaxrsBeans.groovy b/src/main/ajsc/dmaap_v1/dmaap/v1/conf/jaxrsBeans.groovy
index 430e723..b019fbc 100644
--- a/src/main/ajsc/dmaap_v1/dmaap/v1/conf/jaxrsBeans.groovy
+++ b/src/main/ajsc/dmaap_v1/dmaap/v1/conf/jaxrsBeans.groovy
@@ -3,16 +3,16 @@
 	xmlns jaxrs: "http://cxf.apache.org/jaxrs"
 	xmlns util: "http://www.springframework.org/schema/util"
 	
-	echoService(com.att.nsa.dmaap.JaxrsEchoService)
-	userService(com.att.nsa.dmaap.JaxrsUserService)
-	topicService(com.att.nsa.dmaap.service.TopicRestService)
-	eventService(com.att.nsa.dmaap.service.EventsRestService)
-	adminService(com.att.nsa.dmaap.service.AdminRestService)
-	apiKeyService(com.att.nsa.dmaap.service.ApiKeysRestService)
-	metricsService(com.att.nsa.dmaap.service.MetricsRestService)
-	transactionService(com.att.nsa.dmaap.service.TransactionRestService)
-	UIService(com.att.nsa.dmaap.service.UIRestServices)
-	mirrorService(com.att.nsa.dmaap.service.MMRestService)
+	echoService(org.onap.dmaap.JaxrsEchoService)
+	userService(org.onap.dmaap.JaxrsUserService)
+	topicService(org.onap.dmaap.service.TopicRestService)
+	eventService(org.onap.dmaap.service.EventsRestService)
+	adminServiceorg.onap.dmaap.service.AdminRestService)
+	apiKeyService(org.onap.dmaap.service.ApiKeysRestService)
+	metricsService(org.onap.dmaap.service.MetricsRestService)
+	transactionService(org.onap.dmaap.service.TransactionRestService)
+	UIService(org.onap.dmaap.service.UIRestServices)
+	mirrorService(org.onap.dmaap.service.MMRestService)
 	
 	util.list(id: 'jaxrsServices') {
 		ref(bean:'echoService')
diff --git a/src/main/ajsc/dmaap_v1/dmaap/v1/conf/serviceBeans.xml b/src/main/ajsc/dmaap_v1/dmaap/v1/conf/serviceBeans.xml
index 0210d06..090a76b 100644
--- a/src/main/ajsc/dmaap_v1/dmaap/v1/conf/serviceBeans.xml
+++ b/src/main/ajsc/dmaap_v1/dmaap/v1/conf/serviceBeans.xml
@@ -13,7 +13,11 @@
 		location="classpath:msgRtrApi.properties,classpath:DMaaPErrorMesaages.properties" /> -->
 		
 		<context:component-scan
-		base-package="com.att,com.att.dmf.mr.utils, com.att.dmf.mr, com.att.dmf.mr.rest,com.att.dmf.mr.service,
+		base-package="org.onap.dmaap,org.onap.dmaap.filemonitor,org.onap.dmaap.mmagent,org.onap.dmaap.service,org.onap.dmaap.tools,org.onap.dmaap.util,org.onap.dmaap.filter,org.onap.dmaap.apiServer.metrics.cambria,
+	org.onap.dmaap.dmf.mr,org.onap.dmaap.dmf.mr.backends,org.onap.dmaap.dmf.mr.backends.kafka,org.onap.dmaap.dmf.mr.backends.memory,org.onap.dmaap.dmf.mr.beans,org.onap.dmaap.dmf.mr.constants,org.onap.dmaap.dmf.mr.exception,
+	org.onap.dmaap.dmf.mr.listener,org.onap.dmaap.dmf.mr.metabroker,org.onap.dmaap.dmf.mr.metrics.publisher,org.onap.dmaap.dmf.mr.metrics.publisher.impl,org.onap.dmaap.dmf.mr.resources,org.onap.dmaap.dmf.mr.resources.streamReaders,org.onap.dmaap.dmf.mr.security,
+	org.onap.dmaap.dmf.mr.security.impl,org.onap.dmaap.dmf.mr.service,org.onap.dmaap.dmf.mr.service.impl,org.onap.dmaap.dmf.mr.transaction,org.onap.dmaap.dmf.mr.transaction.impl,org.onap.dmaap.dmf.mr.utils,
+	com.att,com.att.dmf.mr.utils, com.att.dmf.mr, com.att.dmf.mr.rest,com.att.dmf.mr.service,
 	com.att.dmf.mr.service.impl,com.att.dmf.mr.beans,com.att.dmf.mr.security,com.att.dmf.mr.exception,com.att.dmf.mr.backends,com.att.dmf.mr.backends.kafka,
 	com.att.dmf.mr.transaction,com.att.dmf.mr.exception,com.att.nsa.dmaap,com.att.nsa.dmaap.service,com.att.nsa.dmaap.util,java.lang,java.util,com.att.dmf.mr.exception, com.att.dmf,com.att.nsa.dmaap.mmagent" />
 	 	<context:property-placeholder 
@@ -26,25 +30,25 @@
 		
 		<bean id="jacksonProvider" class="com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider" />
 		
-		<bean id="cambriaExMapper" class="com.att.nsa.dmaap.DMaaPCambriaExceptionMapper" />
+		<bean id="cambriaExMapper" class="org.onap.dmaap.DMaaPCambriaExceptionMapper" />
     
-    	<bean id="webExMapper" class="com.att.nsa.dmaap.DMaaPWebExceptionMapper" />
+    	<bean id="webExMapper" class="org.onap.dmaap.DMaaPWebExceptionMapper" />
     
 		
 	<!-- Your bean definitions goes here -->
 <!-- 	<bean id="performanceLog" name="performanceLog" class="com.att.ajsc.csi.logging.PerformanceTracking" /> -->
 <!-- 	<bean id="processRestletHeaders" name="processRestletHeaders" class="ajsc.restlet.ProcessRestletHeaders" /> -->
 		<bean id="servicePropsBean" name="servicePropsBean" 
-		class="com.att.nsa.dmaap.util.ServicePropertiesMapBean" />
+		class="org.onap.dmaap.util.ServicePropertiesMapBean" />
 		
 		<!-- Msgrtr beans -->
-		<bean id="propertyReader" class="com.att.dmf.mr.utils.PropertyReader" />
+		<bean id="propertyReader" class="org.onap.dmaap.dmf.mr.utils.PropertyReader" />
 		<bean
 		class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
 		<!-- Next value is the full qualified name of the static setter including 
 			method name -->
 		<property name="staticMethod"
-			value="com.att.dmf.mr.beans.DMaaPKafkaConsumerFactory.populateKafkaInternalDefaultsMap" />
+			value="org.onap.dmaap.dmf.mr.beans.DMaaPKafkaConsumerFactory.populateKafkaInternalDefaultsMap" />
 		<!--  <property name="arguments">
 			<list>
 				<ref bean="propertyReader" />
@@ -55,21 +59,21 @@
 	<bean id="drumlinRequestRouter"
 		class="com.att.nsa.drumlin.service.framework.routing.DrumlinRequestRouter" />
 
-	<bean id="dMaaPMetricsSet" class="com.att.dmf.mr.beans.DMaaPMetricsSet">
+	<bean id="dMaaPMetricsSet" class="org.onap.dmaap.dmf.mr.beans.DMaaPMetricsSet">
 		 <constructor-arg ref="propertyReader" /> 
 	</bean>
 
-	<bean id="dMaaPZkClient" class=" com.att.dmf.mr.beans.DMaaPZkClient">
+	<bean id="dMaaPZkClient" class=" org.onap.dmaap.dmf.mr.beans.DMaaPZkClient">
 		<constructor-arg ref="propertyReader" />
 	</bean>
 
-	<bean id="dMaaPZkConfigDb" class="com.att.dmf.mr.beans.DMaaPZkConfigDb">
+	<bean id="dMaaPZkConfigDb" class="org.onap.dmaap.dmf.mr.beans.DMaaPZkConfigDb">
 		<constructor-arg ref="dMaaPZkClient" />
 		<constructor-arg ref="propertyReader" />
 	</bean>
 	
 
-	<bean id="kafkaPublisher" class=" com.att.dmf.mr.backends.kafka.KafkaPublisher">
+	<bean id="kafkaPublisher" class="org.onap.dmaap.dmf.mr.backends.kafka.KafkaPublisher">
 		<constructor-arg ref="propertyReader" />
 	</bean>
 
@@ -79,33 +83,33 @@
 		<constructor-arg ref="kafkalockavoid" />
 	</bean> -->
 	
-		<bean id="dMaaPKafkaConsumerFactory" class=" com.att.dmf.mr.beans.DMaaPKafkaConsumerFactory">
+		<bean id="dMaaPKafkaConsumerFactory" class="org.onap.dmaap.dmf.mr.beans.DMaaPKafkaConsumerFactory">
 		<constructor-arg ref="dMaaPMetricsSet" />
 		<constructor-arg ref="curator" />
 		<constructor-arg ref="kafkalockavoid" />
 	</bean>
 	
 
-	<bean id="curator" class="com.att.dmf.mr.utils.DMaaPCuratorFactory"
+	<bean id="curator" class="org.onap.dmaap.dmf.mr.utils.DMaaPCuratorFactory"
 		factory-method="getCurator">
 		<constructor-arg ref="propertyReader" />
 	</bean>
 
-	<bean id="dMaaPKafkaMetaBroker" class=" com.att.dmf.mr.beans.DMaaPKafkaMetaBroker">
+	<bean id="dMaaPKafkaMetaBroker" class="org.onap.dmaap.dmf.mr.beans.DMaaPKafkaMetaBroker">
 		<constructor-arg ref="propertyReader" />
 		<constructor-arg ref="dMaaPZkClient" />
 		<constructor-arg ref="dMaaPZkConfigDb" />
 	</bean>
 
-	<bean id="q" class=" com.att.dmf.mr.backends.memory.MemoryQueue" />
+	<bean id="q" class="org.onap.dmaap.dmf.mr.backends.memory.MemoryQueue" />
 
-	<bean id="mmb" class=" com.att.dmf.mr.backends.memory.MemoryMetaBroker">
+	<bean id="mmb" class="org.onap.dmaap.dmf.mr.backends.memory.MemoryMetaBroker">
 		<constructor-arg ref="q" />
 		<constructor-arg ref="dMaaPZkConfigDb" />
 		<!-- <constructor-arg ref="propertyReader" />-->
 	</bean>
 
-	<bean id="dMaaPNsaApiDb" class="com.att.dmf.mr.beans.DMaaPNsaApiDb"
+	<bean id="dMaaPNsaApiDb" class="org.onap.dmaap.dmf.mr.beans.DMaaPNsaApiDb"
 		factory-method="buildApiKeyDb">
 		<constructor-arg ref="propertyReader" />
 		<constructor-arg ref="dMaaPZkConfigDb" />
@@ -115,14 +119,14 @@
 		factory-method="buildTransactionDb"> <constructor-arg ref="propertyReader" 
 		/> <constructor-arg ref="dMaaPZkConfigDb" /> </bean> -->
 
-	<bean id="dMaaPAuthenticatorImpl" class="com.att.dmf.mr.security.DMaaPAuthenticatorImpl">
+	<bean id="dMaaPAuthenticatorImpl" class="org.onap.dmaap.dmf.mr.security.DMaaPAuthenticatorImpl">
 		<constructor-arg ref="dMaaPNsaApiDb" />
 	</bean>
-	<bean id="defLength" class="com.att.mr.filter.DefaultLength">
+	<bean id="defLength" class="org.onap.dmaap.mr.filter.DefaultLength">
 		<property name="defaultLength" value="${maxcontentlength}"></property>
 	</bean>
 	
-	 <bean id="kafkalockavoid" class="com.att.dmf.mr.backends.kafka.KafkaLiveLockAvoider2" /> 
+	 <bean id="kafkalockavoid" class="org.onap.dmaap.dmf.mr.backends.kafka.KafkaLiveLockAvoider2" /> 
 	
 
 		<bean class="org.springframework.context.annotation.CommonAnnotationBeanPostProcessor"/>
diff --git a/src/main/ajsc/dmaap_v1/dmaap/v1/routes/topicService.route b/src/main/ajsc/dmaap_v1/dmaap/v1/routes/topicService.route
index 57a8a70..b1073d8 100644
--- a/src/main/ajsc/dmaap_v1/dmaap/v1/routes/topicService.route
+++ b/src/main/ajsc/dmaap_v1/dmaap/v1/routes/topicService.route
@@ -10,8 +10,8 @@
 	
 	<removeHeader headerName="exception"/>
   
-<log message="Body= ** ${body}" loggingLevel="DEBUG" logName="com.att.nsa.dmaap"/>
-<log message="Body= ** ${body}" loggingLevel="DEBUG" logName="com.att.nsa.dmaap.service"/>
+<log message="Body= ** ${body}" loggingLevel="DEBUG" logName="org.onap.dmaap"/>
+<log message="Body= ** ${body}" loggingLevel="DEBUG" logName="org.onap.dmaap.service"/>
 
 </route>