From e651abed417b8a173a0745042c7dc5b20c0b7036 Mon Sep 17 00:00:00 2001
From: "Lee, Tian (tl5884)" <TianL@amdocs.com>
Date: Fri, 27 Apr 2018 17:50:07 +0100
Subject: Convert Babel from AJSC2 to Spring Boot 1.5.12

Change-Id: I2ea10250c3881827b6b274afadf1a8c89683f568
Issue-ID: AAI-1045
Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>
---
 src/main/resources/application.properties          |  7 +++++
 src/main/resources/babel-beans.xml                 | 35 ++++++++++++++++++++++
 .../resources/babel-logging-resources.properties   | 14 ++++-----
 3 files changed, 48 insertions(+), 8 deletions(-)
 create mode 100644 src/main/resources/application.properties
 create mode 100644 src/main/resources/babel-beans.xml

(limited to 'src/main/resources')

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
new file mode 100644
index 0000000..2cb4fe8
--- /dev/null
+++ b/src/main/resources/application.properties
@@ -0,0 +1,7 @@
+server.port=9516
+server.ssl.key-store=${CONFIG_HOME}/auth/tomcat_keystore
+server.ssl.client-auth=need
+
+server.contextPath=/services/babel-service
+
+logging.config=${CONFIG_HOME}/logback.xml
\ No newline at end of file
diff --git a/src/main/resources/babel-beans.xml b/src/main/resources/babel-beans.xml
new file mode 100644
index 0000000..f4cc32c
--- /dev/null
+++ b/src/main/resources/babel-beans.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context"
+	xsi:schemaLocation="
+		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-4.2.xsd">
+
+	<!-- ////////////////////////////////////////////////////////////////// -->
+	<!-- PROPERTY AND CONFIGURATION FILES -->
+	<!-- ////////////////////////////////////////////////////////////////// -->
+
+	<context:property-placeholder location="file:${CONFIG_HOME}/babel-auth.properties" ignore-unresolvable="true" />
+
+	<!-- ////////////////////////////////////////////////////////////////// -->
+	<!-- CONFIG BEANS -->
+	<!-- ////////////////////////////////////////////////////////////////// -->
+
+	<bean id="babelAuthConfig" class="org.onap.aai.babel.config.BabelAuthConfig">
+		<property name="authenticationDisable" value="${auth.authentication.disable}" />
+		<property name="authPolicyFile" value="${auth.policy.file}" />
+	</bean>
+
+	<!-- ////////////////////////////////////////////////////////////////// -->
+	<!-- IMPLEMENTATION BEANS -->
+	<!-- ////////////////////////////////////////////////////////////////// -->
+
+	<bean id="aaiMicroServiceAuth" class="org.onap.aai.auth.AAIMicroServiceAuth" >
+		<constructor-arg ref="babelAuthConfig" />
+	</bean>
+
+
+	<bean id="generateArtifacts" class="org.onap.aai.babel.service.GenerateArtifactsServiceImpl" >
+		<constructor-arg ref="aaiMicroServiceAuth" />	
+	</bean>
+
+</beans>
diff --git a/src/main/resources/babel-logging-resources.properties b/src/main/resources/babel-logging-resources.properties
index dba72c8..99b2294 100644
--- a/src/main/resources/babel-logging-resources.properties
+++ b/src/main/resources/babel-logging-resources.properties
@@ -1,23 +1,21 @@
-###
 # ============LICENSE_START=======================================================
-# MODEL LOADER SERVICE
+# org.onap.aai
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-# Copyright (C) 2017 European Software Marketing Ltd.
+# Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2017-2018 European Software Marketing Ltd.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
+#       http://www.apache.org/licenses/LICENSE-2.0
+# 
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ============LICENSE_END=========================================================
-###
 
 #Resource key=Error Code|Message text|Resolution text |Description text
 #######
-- 
cgit 1.2.3-korg