Revert package name changes

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

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

2 files changed, 14 insertions, 14 deletions

diff --git a/src/main/webapp/WEB-INF/spring-context.xml b/src/main/webapp/WEB-INF/spring-context.xml
index d7f128e..5e2e985 100644
--- a/src/main/webapp/WEB-INF/spring-context.xml
+++ b/src/main/webapp/WEB-INF/spring-context.xml
@@ -56,49 +56,49 @@
 	<bean id="drumlinRequestRouter"
 		class="com.att.nsa.drumlin.service.framework.routing.DrumlinRequestRouter" />
 
-	<bean id="dMaaPMetricsSet" class="org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPMetricsSet">
+	<bean id="dMaaPMetricsSet" class="com.att.nsa.cambria.beans.DMaaPMetricsSet">
 		<constructor-arg ref="propertyReader" />
 	</bean>
 
-	<bean id="dMaaPZkClient" class=" org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPZkClient">
+	<bean id="dMaaPZkClient" class=" com.att.nsa.cambria.beans.DMaaPZkClient">
 		<constructor-arg ref="propertyReader" />
 	</bean>
 
-	<bean id="dMaaPZkConfigDb" class=" org.onap.dmaap.messagerouter.msgrt.nsa.cambria.beans.DMaaPZkConfigDb">
+	<bean id="dMaaPZkConfigDb" class=" com.att.nsa.cambria.beans.DMaaPZkConfigDb">
 		<constructor-arg ref="dMaaPZkClient" />
 		<constructor-arg ref="propertyReader" />
 	</bean>
 
-	<bean id="kafkaPublisher" class=" org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.kafka.KafkaPublisher">
+	<bean id="kafkaPublisher" class=" com.att.nsa.cambria.backends.kafka.KafkaPublisher">
 		<constructor-arg ref="propertyReader" />
 	</bean>
 
-	<bean id="dMaaPKafkaConsumerFactory" class=" org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPKafkaConsumerFactory">
+	<bean id="dMaaPKafkaConsumerFactory" class=" com.att.nsa.cambria.beans.DMaaPKafkaConsumerFactory">
 		<constructor-arg ref="propertyReader" />
 		<constructor-arg ref="dMaaPMetricsSet" />
 		<constructor-arg ref="curator" />
 	</bean>
 
-	<bean id="curator" class="org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.utils.DMaaPCuratorFactory"
+	<bean id="curator" class="com.att.nsa.cambria.utils.DMaaPCuratorFactory"
 		factory-method="getCurator">
 		<constructor-arg ref="propertyReader" />
 	</bean>
 
-	<bean id="dMaaPKafkaMetaBroker" class=" org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPKafkaMetaBroker">
+	<bean id="dMaaPKafkaMetaBroker" class=" com.att.nsa.cambria.beans.DMaaPKafkaMetaBroker">
 		<constructor-arg ref="propertyReader" />
 		<constructor-arg ref="dMaaPZkClient" />
 		<constructor-arg ref="dMaaPZkConfigDb" />
 	</bean>
 
-	<bean id="q" class=" org.onap.dmaap.messagerouter.msgrtr.com.att.nsa.cambria.backends.memory.MemoryQueue" />
+	<bean id="q" class=" com.att.nsa.cambria.backends.memory.MemoryQueue" />
 
-	<bean id="mmb" class=" org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.backends.memory.MemoryMetaBroker">
+	<bean id="mmb" class=" com.att.nsa.cambria.backends.memory.MemoryMetaBroker">
 		<constructor-arg ref="q" />
 		<constructor-arg ref="dMaaPZkConfigDb" />
 	<!-- <constructor-arg ref="propertyReader" />-->
 	</bean>
 
-	<bean id="dMaaPNsaApiDb" class="org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.beans.DMaaPNsaApiDb"
+	<bean id="dMaaPNsaApiDb" class="com.att.nsa.cambria.beans.DMaaPNsaApiDb"
 		factory-method="buildApiKeyDb">
 		<constructor-arg ref="propertyReader" />
 		<constructor-arg ref="dMaaPZkConfigDb" />
@@ -108,10 +108,10 @@
 		factory-method="buildTransactionDb"> <constructor-arg ref="propertyReader" 
 		/> <constructor-arg ref="dMaaPZkConfigDb" /> </bean> -->
 
-	<bean id="dMaaPAuthenticatorImpl" class="org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.security.DMaaPAuthenticatorImpl">
+	<bean id="dMaaPAuthenticatorImpl" class="com.att.nsa.cambria.security.DMaaPAuthenticatorImpl">
 		<constructor-arg ref="dMaaPNsaApiDb" />
 	</bean>
-	<bean id="defLength" class="org.onap.dmaap.messagerouter.msgrtr.nsa.filter.DefaultLength">
+	<bean id="defLength" class="com.att.nsa.filter.DefaultLength">
 		<property name="defaultLength" value="${maxcontentlength}"></property>
 	</bean>
 
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index c3e07b5..46d7b45 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -31,12 +31,12 @@
     <param-value>/WEB-INF/spring-context.xml</param-value>
   </context-param>
   <listener>
-    <listener-class>org.onap.dmaap.messagerouter.msgrtr.nsa.cambria.listener.CambriaServletContextListener</listener-class>
+    <listener-class>com.att.nsa.cambria.listener.CambriaServletContextListener</listener-class>
   </listener>
   <filter>
     <display-name>ContentLengthFilter</display-name>
     <filter-name>ContentLengthFilter</filter-name>
-    <filter-class>org.onap.dmaap.messagerouter.msgrtr.nsa.filter.ContentLengthFilter</filter-class>
+    <filter-class>com.att.nsa.filter.ContentLengthFilter</filter-class>
   </filter>
   <filter-mapping>
     <filter-name>ContentLengthFilter</filter-name>