update the package name

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

11 files changed, 19 insertions, 11 deletions

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 1a334cf..b019fbc 100644
--- a/src/main/ajsc/dmaap_v1/dmaap/v1/conf/jaxrsBeans.groovy
+++ b/src/main/ajsc/dmaap_v1/dmaap/v1/conf/jaxrsBeans.groovy
@@ -5,7 +5,15 @@
 	
 	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')
 		ref(bean:'userService')
diff --git a/src/main/ajsc/dmaap_v1/dmaap/v1/routes/UIService.route b/src/main/ajsc/dmaap_v1/dmaap/v1/routes/UIService.route
index e434391..4f37c87 100644
--- a/src/main/ajsc/dmaap_v1/dmaap/v1/routes/UIService.route
+++ b/src/main/ajsc/dmaap_v1/dmaap/v1/routes/UIService.route
@@ -1,6 +1,6 @@
 <route xmlns="http://camel.apache.org/schema/spring" trace="true">
   <from uri="att-dme2-servlet:///UI?matchOnUriPrefix=true" />
-  <to uri="cxfbean:UIService?providers=#jacksonProvider,#jsonProvider,#cambriaExMapper,#webExMapper" />
+  <to uri="cxfbean:UIRestServices?providers=#jacksonProvider,#jsonProvider,#cambriaExMapper,#webExMapper" />
     <setBody>
 		<simple>${in.header.exception}</simple>
 	</setBody> 
diff --git a/src/main/ajsc/dmaap_v1/dmaap/v1/routes/adminService.route b/src/main/ajsc/dmaap_v1/dmaap/v1/routes/adminService.route
index e29aeef..8add83f 100644
--- a/src/main/ajsc/dmaap_v1/dmaap/v1/routes/adminService.route
+++ b/src/main/ajsc/dmaap_v1/dmaap/v1/routes/adminService.route
@@ -1,6 +1,6 @@
 <route xmlns="http://camel.apache.org/schema/spring" trace="true">
   <from uri="att-dme2-servlet:///admin?matchOnUriPrefix=true" />
-  <to uri="cxfbean:adminService?providers=#jacksonProvider,#jsonProvider,#cambriaExMapper,#webExMapper" />
+  <to uri="cxfbean:adminRestService?providers=#jacksonProvider,#jsonProvider,#cambriaExMapper,#webExMapper" />
    <setBody>
 		<simple>${in.header.exception}</simple>
 	</setBody> 
diff --git a/src/main/ajsc/dmaap_v1/dmaap/v1/routes/adminService2.route b/src/main/ajsc/dmaap_v1/dmaap/v1/routes/adminService2.route
index a24ebe0..d132139 100644
--- a/src/main/ajsc/dmaap_v1/dmaap/v1/routes/adminService2.route
+++ b/src/main/ajsc/dmaap_v1/dmaap/v1/routes/adminService2.route
@@ -1,6 +1,6 @@
 <route xmlns="http://camel.apache.org/schema/spring" trace="true">
   <from uri="att-dme2-servlet:///__module_ajsc_namespace_version__/admin?matchOnUriPrefix=true" />
-    <to uri="cxfbean:adminService?providers=#jacksonProvider,#jsonProvider,#cambriaExMapper,#webExMapper" />
+    <to uri="cxfbean:adminRestService?providers=#jacksonProvider,#jsonProvider,#cambriaExMapper,#webExMapper" />
    <setBody>
 		<simple>${in.header.exception}</simple>
 	</setBody> 
diff --git a/src/main/ajsc/dmaap_v1/dmaap/v1/routes/apiKeyService.route b/src/main/ajsc/dmaap_v1/dmaap/v1/routes/apiKeyService.route
index 0be872c..321e9fb 100644
--- a/src/main/ajsc/dmaap_v1/dmaap/v1/routes/apiKeyService.route
+++ b/src/main/ajsc/dmaap_v1/dmaap/v1/routes/apiKeyService.route
@@ -1,6 +1,6 @@
 <route xmlns="http://camel.apache.org/schema/spring" trace="true">
   <from uri="att-dme2-servlet:///__module_ajsc_namespace_version__/apiKeys?matchOnUriPrefix=true" />
-  <to uri="cxfbean:apiKeyService?providers=#jacksonProvider,#jsonProvider,#cambriaExMapper,#webExMapper" />
+  <to uri="cxfbean:apiKeysRestService?providers=#jacksonProvider,#jsonProvider,#cambriaExMapper,#webExMapper" />
    <setBody>
 		<simple>${in.header.exception}</simple>
 	</setBody> 
diff --git a/src/main/ajsc/dmaap_v1/dmaap/v1/routes/apiKeyService2.route b/src/main/ajsc/dmaap_v1/dmaap/v1/routes/apiKeyService2.route
index 2d65bc5..49f18ed 100644
--- a/src/main/ajsc/dmaap_v1/dmaap/v1/routes/apiKeyService2.route
+++ b/src/main/ajsc/dmaap_v1/dmaap/v1/routes/apiKeyService2.route
@@ -1,6 +1,6 @@
 <route xmlns="http://camel.apache.org/schema/spring" trace="true">
   <from uri="att-dme2-servlet:///apiKeys?matchOnUriPrefix=true" />
-  <to uri="cxfbean:apiKeyService?providers=#jacksonProvider,#jsonProvider,#cambriaExMapper,#webExMapper" />
+  <to uri="cxfbean:apiKeysRestService?providers=#jacksonProvider,#jsonProvider,#cambriaExMapper,#webExMapper" />
    <setBody>
 		<simple>${in.header.exception}</simple>
 	</setBody> 
diff --git a/src/main/ajsc/dmaap_v1/dmaap/v1/routes/eventService.route b/src/main/ajsc/dmaap_v1/dmaap/v1/routes/eventService.route
index 5f3924e..c722ce0 100644
--- a/src/main/ajsc/dmaap_v1/dmaap/v1/routes/eventService.route
+++ b/src/main/ajsc/dmaap_v1/dmaap/v1/routes/eventService.route
@@ -3,7 +3,7 @@
 
   
   <from uri="att-dme2-servlet:///events?matchOnUriPrefix=true" />
-  <to uri="cxfbean:eventService?providers=#jacksonProvider,#jsonProvider,#cambriaExMapper,#webExMapper" />
+  <to uri="cxfbean:eventsRestService?providers=#jacksonProvider,#jsonProvider,#cambriaExMapper,#webExMapper" />
     <setBody>
 		<simple>${in.header.exception}</simple>
 	</setBody> 
diff --git a/src/main/ajsc/dmaap_v1/dmaap/v1/routes/metricsService.route b/src/main/ajsc/dmaap_v1/dmaap/v1/routes/metricsService.route
index 3cd3b87..4250d8b 100644
--- a/src/main/ajsc/dmaap_v1/dmaap/v1/routes/metricsService.route
+++ b/src/main/ajsc/dmaap_v1/dmaap/v1/routes/metricsService.route
@@ -1,6 +1,6 @@
 <route xmlns="http://camel.apache.org/schema/spring" trace="true">
   <from uri="att-dme2-servlet:///metrics?matchOnUriPrefix=true" />
-  <to uri="cxfbean:metricsService?providers=#jacksonProvider,#jsonProvider,#cambriaExMapper,#webExMapper" />
+  <to uri="cxfbea:nmetricsRestService?providers=#jacksonProvider,#jsonProvider,#cambriaExMapper,#webExMapper" />
     <setBody>
 		<simple>${in.header.exception}</simple>
 	</setBody> 
diff --git a/src/main/ajsc/dmaap_v1/dmaap/v1/routes/mirrorService.route b/src/main/ajsc/dmaap_v1/dmaap/v1/routes/mirrorService.route
index 0157120..2c442bc 100644
--- a/src/main/ajsc/dmaap_v1/dmaap/v1/routes/mirrorService.route
+++ b/src/main/ajsc/dmaap_v1/dmaap/v1/routes/mirrorService.route
@@ -3,7 +3,7 @@
 
   
   <from uri="att-dme2-servlet:///mirrormakers?matchOnUriPrefix=true" />
-  <to uri="cxfbean:mirrorService?providers=#jacksonProvider,#jsonProvider,#cambriaExMapper,#webExMapper" />
+  <to uri="cxfbean:MMRestService?providers=#jacksonProvider,#jsonProvider,#cambriaExMapper,#webExMapper" />
     <setBody>
 		<simple>${in.header.exception}</simple>
 	</setBody> 
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 b1073d8..b41aa2e 100644
--- a/src/main/ajsc/dmaap_v1/dmaap/v1/routes/topicService.route
+++ b/src/main/ajsc/dmaap_v1/dmaap/v1/routes/topicService.route
@@ -2,7 +2,7 @@
   
   <from uri="att-dme2-servlet:///topics?matchOnUriPrefix=true" />
 	
-  <to uri="cxfbean:topicService?providers=#jacksonProvider,#jsonProvider,#cambriaExMapper,#webExMapper" />
+  <to uri="cxfbean:topicRestService?providers=#jacksonProvider,#jsonProvider,#cambriaExMapper,#webExMapper" />
 
      <setBody>
 		<simple>${in.header.exception}</simple>
diff --git a/src/main/ajsc/dmaap_v1/dmaap/v1/routes/transactionService.route b/src/main/ajsc/dmaap_v1/dmaap/v1/routes/transactionService.route
index 70fb7e1..7157c0d 100644
--- a/src/main/ajsc/dmaap_v1/dmaap/v1/routes/transactionService.route
+++ b/src/main/ajsc/dmaap_v1/dmaap/v1/routes/transactionService.route
@@ -1,6 +1,6 @@
 <route xmlns="http://camel.apache.org/schema/spring" trace="true">
   <from uri="att-dme2-servlet:///transaction?matchOnUriPrefix=true" />
-  <to uri="cxfbean:transactionService?providers=#jacksonProvider,#jsonProvider,#cambriaExMapper,#webExMapper" />
+  <to uri="cxfbean:transactionRestService?providers=#jacksonProvider,#jsonProvider,#cambriaExMapper,#webExMapper" />
     <setBody>
 		<simple>${in.header.exception}</simple>
 	</setBody>