From 6f31d8db0e6a2affbad74b669a2f05199fcd3f6b Mon Sep 17 00:00:00 2001
From: sunil unnava <sunil.unnava@att.com>
Date: Wed, 24 Oct 2018 19:53:56 -0400
Subject: update the package name

Issue-ID: DMAAP-858
Change-Id: Ia3b75487cc79dea0454f024c3c69a6c4a8291e44
Signed-off-by: sunil unnava <sunil.unnava@att.com>
---
 pom.xml                                            | 29 +++++++++++++++++++---
 .../ajsc/dmaap_v1/dmaap/v1/conf/jaxrsBeans.groovy  | 10 +++++++-
 .../ajsc/dmaap_v1/dmaap/v1/routes/UIService.route  |  2 +-
 .../dmaap_v1/dmaap/v1/routes/adminService.route    |  2 +-
 .../dmaap_v1/dmaap/v1/routes/adminService2.route   |  2 +-
 .../dmaap_v1/dmaap/v1/routes/apiKeyService.route   |  2 +-
 .../dmaap_v1/dmaap/v1/routes/apiKeyService2.route  |  2 +-
 .../dmaap_v1/dmaap/v1/routes/eventService.route    |  2 +-
 .../dmaap_v1/dmaap/v1/routes/metricsService.route  |  2 +-
 .../dmaap_v1/dmaap/v1/routes/mirrorService.route   |  2 +-
 .../dmaap_v1/dmaap/v1/routes/topicService.route    |  2 +-
 .../dmaap/v1/routes/transactionService.route       |  2 +-
 src/main/resources/docker/startup.sh               |  2 +-
 13 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4dbd5bd..b99dfd5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,6 +47,29 @@
 
 	<build>
 		<plugins>
+		 <plugin>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-enforcer-plugin</artifactId>
+			<executions>
+				<execution>
+					<id>enforce-no-snapshots</id>
+					<goals>
+						<goal>enforce</goal>
+					</goals>
+					<configuration>
+						<rules>
+							<requireReleaseDeps>
+								<message>No Snapshots Allowed!</message>
+								<excludes>
+									<exclude>org.onap.dmaap.messagerouter.msgrtr:msgrtr</exclude>
+								</excludes>
+							</requireReleaseDeps>
+						</rules>
+						<fail>true</fail>
+					</configuration>
+				</execution>
+			</executions>
+		</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-site-plugin</artifactId>
@@ -262,7 +285,7 @@
 		<testRouteOffer>workstation</testRouteOffer>
 		<testEnv>DEV</testEnv>
 		<!-- <dmaapImg>${project.version}</dmaapImg> -->
-		<dmaapImg>1.1.7</dmaapImg>
+		<dmaapImg>1.1.8</dmaapImg>
 		<camel.version>2.21.1</camel.version>
 		<sitePath>/content/sites/site/org/onap/dmaap/messagerouter/messageservice/${project.artifactId}/${project.version}</sitePath>
 		<skip.docker.build>true</skip.docker.build>
@@ -457,7 +480,7 @@
 		<dependency>
 			<groupId>org.onap.dmaap.messagerouter.msgrtr</groupId>
 			<artifactId>msgrtr</artifactId>
-			<version>1.1.11</version>
+			<version>1.1.12-SNAPSHOT</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.slf4j</groupId>
@@ -605,7 +628,7 @@
 	<dependency>
 		<groupId>org.onap.aaf.authz</groupId>
 		<artifactId>aaf-cadi-aaf</artifactId>
-		<version>2.1.2</version>
+		<version>2.1.5</version>
 	</dependency>
 	<dependency>
 		<groupId>backport-util-concurrent</groupId>
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> 
diff --git a/src/main/resources/docker/startup.sh b/src/main/resources/docker/startup.sh
index 02855bf..beea455 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 -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
+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
-- 
cgit 1.2.3-korg