From 4f13d6cc64eed0ef75a31ec5f490853267447ab1 Mon Sep 17 00:00:00 2001
From: Venkata Harish K Kajur <vk250x@att.com>
Date: Tue, 30 Jan 2018 13:52:34 -0500
Subject: Turn ajsc 2 to using ajsc 6 spring boot

Issue-ID: AAI-800
Change-Id: Id174ec5088ddea57f18e605d004c417bee8fbf33
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
---
 .../ajsc-aai/v1/conf/FileMonitorBeans.xml          |  20 ----
 .../ajsc-aai_v1/ajsc-aai/v1/conf/jaxrsBeans.groovy |  29 ------
 .../ajsc-aai_v1/ajsc-aai/v1/conf/serviceBeans.xml  | 101 ---------------------
 .../ajsc/ajsc-aai_v1/ajsc-aai/v1/docs/README.txt   |   1 -
 .../ajsc/ajsc-aai_v1/ajsc-aai/v1/lib/README.txt    |   1 -
 .../ajsc-aai_v1/ajsc-aai/v1/props/module.props     |   1 -
 .../ajsc/ajsc-aai_v1/ajsc-aai/v1/routes/aai.route  |   4 -
 7 files changed, 157 deletions(-)
 delete mode 100644 aai-resources/src/main/ajsc/ajsc-aai_v1/ajsc-aai/v1/conf/FileMonitorBeans.xml
 delete mode 100644 aai-resources/src/main/ajsc/ajsc-aai_v1/ajsc-aai/v1/conf/jaxrsBeans.groovy
 delete mode 100644 aai-resources/src/main/ajsc/ajsc-aai_v1/ajsc-aai/v1/conf/serviceBeans.xml
 delete mode 100644 aai-resources/src/main/ajsc/ajsc-aai_v1/ajsc-aai/v1/docs/README.txt
 delete mode 100644 aai-resources/src/main/ajsc/ajsc-aai_v1/ajsc-aai/v1/lib/README.txt
 delete mode 100644 aai-resources/src/main/ajsc/ajsc-aai_v1/ajsc-aai/v1/props/module.props
 delete mode 100644 aai-resources/src/main/ajsc/ajsc-aai_v1/ajsc-aai/v1/routes/aai.route

(limited to 'aai-resources/src/main/ajsc')

diff --git a/aai-resources/src/main/ajsc/ajsc-aai_v1/ajsc-aai/v1/conf/FileMonitorBeans.xml b/aai-resources/src/main/ajsc/ajsc-aai_v1/ajsc-aai/v1/conf/FileMonitorBeans.xml
deleted file mode 100644
index 37e929d..0000000
--- a/aai-resources/src/main/ajsc/ajsc-aai_v1/ajsc-aai/v1/conf/FileMonitorBeans.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-	<!--<bean-->
-		<!--class="org.springframework.context.annotation.CommonAnnotationBeanPostProcessor" />-->
-		<!---->
-	<!--<bean id="ServicePropertiesListener" class="org.onap.aai.ajsc_aai.filemonitor.ServicePropertiesListener" />-->
-	<!---->
-	<!--<bean id="ServicePropertiesMap" class="org.onap.aai.ajsc_aai.filemonitor.ServicePropertiesMap" />-->
-
-	<!--<bean id="ServicePropertyService" class="org.onap.aai.ajsc_aai.filemonitor.ServicePropertyService">-->
-		<!--<property name="loadOnStartup" value="false" />-->
-		<!--<property name="fileChangedListener" ref="ServicePropertiesListener" />-->
-		<!--<property name="filePropertiesMap" ref="ServicePropertiesMap" />-->
-		<!--<property name="ssfFileMonitorPollingInterval" value="15" />-->
-		<!--<property name="ssfFileMonitorThreadpoolSize" value="10" />-->
-	<!--</bean>-->
-</beans>
diff --git a/aai-resources/src/main/ajsc/ajsc-aai_v1/ajsc-aai/v1/conf/jaxrsBeans.groovy b/aai-resources/src/main/ajsc/ajsc-aai_v1/ajsc-aai/v1/conf/jaxrsBeans.groovy
deleted file mode 100644
index 0b036c6..0000000
--- a/aai-resources/src/main/ajsc/ajsc-aai_v1/ajsc-aai/v1/conf/jaxrsBeans.groovy
+++ /dev/null
@@ -1,29 +0,0 @@
-beans{
-	xmlns cxf: "http://camel.apache.org/schema/cxf"
-	xmlns jaxrs: "http://cxf.apache.org/jaxrs"
-	xmlns util: "http://www.springframework.org/schema/util"
-
-	LegacyMoxyConsumer(org.onap.aai.rest.LegacyMoxyConsumer)
-	URLFromVertexIdConsumer(org.onap.aai.rest.URLFromVertexIdConsumer)
-	VertexIdConsumer(org.onap.aai.rest.VertexIdConsumer)
-	BulkAddConsumer(org.onap.aai.rest.BulkAddConsumer)
-	BulkProcessConsumer(org.onap.aai.rest.BulkProcessConsumer)
-	ExampleConsumer(org.onap.aai.rest.ExampleConsumer)
-    V3ThroughV7Consumer(org.onap.aai.rest.retired.V3ThroughV7Consumer)
-	EchoResponse(org.onap.aai.rest.util.EchoResponse)
-	ModelVersionTransformer(org.onap.aai.rest.tools.ModelVersionTransformer)
-
-	util.list(id: 'jaxrsServices') {
-		
-		ref(bean:'ExampleConsumer')
-		ref(bean:'LegacyMoxyConsumer')
-		ref(bean:'VertexIdConsumer')
-		ref(bean:'URLFromVertexIdConsumer')
-		ref(bean:'BulkAddConsumer')
-		ref(bean:'BulkProcessConsumer')
-		ref(bean:'V3ThroughV7Consumer')
-		ref(bean:'ModelVersionTransformer')
-
-		ref(bean:'EchoResponse')
-	}
-}
diff --git a/aai-resources/src/main/ajsc/ajsc-aai_v1/ajsc-aai/v1/conf/serviceBeans.xml b/aai-resources/src/main/ajsc/ajsc-aai_v1/ajsc-aai/v1/conf/serviceBeans.xml
deleted file mode 100644
index 578fa6f..0000000
--- a/aai-resources/src/main/ajsc/ajsc-aai_v1/ajsc-aai/v1/conf/serviceBeans.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cxf="http://cxf.apache.org/core"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:task="http://www.springframework.org/schema/task" xmlns:jms="http://www.springframework.org/schema/jms"
-	xsi:schemaLocation="
-		   http://cxf.apache.org/core
-		   http://cxf.apache.org/schemas/core.xsd
-	       http://www.springframework.org/schema/beans
-	       http://www.springframework.org/schema/beans/spring-beans.xsd
-	       http://www.springframework.org/schema/context
-     	   http://www.springframework.org/schema/context/spring-context-2.5.xsd
-     	   http://www.springframework.org/schema/task 
-     	   http://www.springframework.org/schema/task/spring-task-3.0.xsd
-     	   http://www.springframework.org/schema/jms
-		   http://www.springframework.org/schema/jms/spring-jms-4.1.xsd">
-
-	<!-- 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="org.onap.aai.ajsc_aai.util.ServicePropertiesMapBean" />-->
-	<bean id="jsonProvider" class="org.onap.aai.restcore.CustomJacksonJaxBJsonProvider" />
-
-	<bean id="inInterceptor" class="org.onap.aai.interceptors.AAILogJAXRSInInterceptor" />
-	<bean id="outInterceptor" class="org.onap.aai.interceptors.AAILogJAXRSOutInterceptor" />
-	<!--<bean id="readInInterceptor" class="org.onap.aai.interceptors.AAICXFReadPhaseInterceptor" />-->
-	<cxf:bus bus="cxfBus">
-		<cxf:inInterceptors>
-			<ref bean="inInterceptor" />
-			<!--<ref bean="readInInterceptor" />-->
-		</cxf:inInterceptors>
-		<cxf:outInterceptors>
-			<ref bean="outInterceptor" />
-		</cxf:outInterceptors>
-	</cxf:bus>
-	<context:component-scan base-package="org.onap.aai.tasks" />
-	<context:component-scan base-package="org.onap.aai.config" />
-
-	<task:scheduler id="taskScheduler" pool-size="10" />
-	<task:executor id="taskExecutor" pool-size="10"
-		queue-capacity="5" />
-	<task:annotation-driven executor="taskExecutor"
-		scheduler="taskScheduler" />
-
-	<bean id="jmsProperties"
-		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"
-		name="jmsProperties">
-		<property name="order" value="99999" />
-		<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
-		<property name="ignoreUnresolvablePlaceholders" value="true" />
-		<property name="properties">
-			<value>
-
-				<!-- JMS -->
-				JMS.BROKER.URL=tcp://localhost:61447
-				JMS.QUEUE.NAME=IN_QUEUE
-
-			</value>
-		</property>
-	</bean>
-
-	<!-- ActiveMQ connection factory -->
-	<bean id="amqConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
-		<constructor-arg index="0" value="${JMS.BROKER.URL}" />
-	</bean>
-
-	<!-- ConnectionFactory Definition -->
-	<bean id="connectionFactory"
-		class="org.springframework.jms.connection.CachingConnectionFactory">
-		<constructor-arg ref="amqConnectionFactory" />
-	</bean>
-
-	<!-- Destination Queue -->
-	<bean id="destinationQueue" class="org.apache.activemq.command.ActiveMQQueue">
-		<constructor-arg index="0" value="${JMS.QUEUE.NAME}" />
-	</bean>
-
-	<!-- JmsTemplate Definition -->
-	<bean id="jmsTemplate" class="org.springframework.jms.core.JmsTemplate">
-		<property name="connectionFactory" ref="connectionFactory" />
-		<property name="defaultDestination" ref="destinationQueue" />
-	</bean>
-
-	<!-- Message Producer -->
-	<bean id="messageProducer" class="org.onap.aai.dmaap.AAIDmaapEventJMSProducer" />
-
-	<!-- Message Consumer from Default Destination -->
-	<bean id="messageDefaultConsumer" class="org.onap.aai.dmaap.AAIDmaapEventJMSConsumer" />
-
-	<!-- Message Consumer Container for Default Destination -->
-	<bean
-		class="org.springframework.jms.listener.DefaultMessageListenerContainer">
-		<property name="connectionFactory" ref="connectionFactory" />
-		<property name="destinationName" value="${JMS.QUEUE.NAME}" />
-		<property name="messageListener" ref="messageDefaultConsumer" />
-	</bean>
-	
-
-</beans>
diff --git a/aai-resources/src/main/ajsc/ajsc-aai_v1/ajsc-aai/v1/docs/README.txt b/aai-resources/src/main/ajsc/ajsc-aai_v1/ajsc-aai/v1/docs/README.txt
deleted file mode 100644
index 3707179..0000000
--- a/aai-resources/src/main/ajsc/ajsc-aai_v1/ajsc-aai/v1/docs/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-Place any docs here that you want to access within the ajsc upon deployment of your service.
diff --git a/aai-resources/src/main/ajsc/ajsc-aai_v1/ajsc-aai/v1/lib/README.txt b/aai-resources/src/main/ajsc/ajsc-aai_v1/ajsc-aai/v1/lib/README.txt
deleted file mode 100644
index 639e21b..0000000
--- a/aai-resources/src/main/ajsc/ajsc-aai_v1/ajsc-aai/v1/lib/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-3rd party JAR's needed by your jars (if any) for a ajsc deployment package go here...
\ No newline at end of file
diff --git a/aai-resources/src/main/ajsc/ajsc-aai_v1/ajsc-aai/v1/props/module.props b/aai-resources/src/main/ajsc/ajsc-aai_v1/ajsc-aai/v1/props/module.props
deleted file mode 100644
index 17ebc08..0000000
--- a/aai-resources/src/main/ajsc/ajsc-aai_v1/ajsc-aai/v1/props/module.props
+++ /dev/null
@@ -1 +0,0 @@
-EXAMPLE.PROPERTY=EXAMLE_VALUE
\ No newline at end of file
diff --git a/aai-resources/src/main/ajsc/ajsc-aai_v1/ajsc-aai/v1/routes/aai.route b/aai-resources/src/main/ajsc/ajsc-aai_v1/ajsc-aai/v1/routes/aai.route
deleted file mode 100644
index 6a86246..0000000
--- a/aai-resources/src/main/ajsc/ajsc-aai_v1/ajsc-aai/v1/routes/aai.route
+++ /dev/null
@@ -1,4 +0,0 @@
-<route xmlns="http://camel.apache.org/schema/spring" trace="true"> 
-	<from uri="att-dme2-servlet:///aai?matchOnUriPrefix=true" />
-	<to uri="cxfbean:jaxrsServices?providers=#jsonProvider&amp;bus=#cxfBus" />
-</route>
\ No newline at end of file
-- 
cgit 1.2.3-korg