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/test/resources/babel-beans.xml      | 35 ---------------------------------
 src/test/resources/logback.xml          |  2 +-
 src/test/resources/test-babel-beans.xml | 35 +++++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 36 deletions(-)
 delete mode 100644 src/test/resources/babel-beans.xml
 create mode 100644 src/test/resources/test-babel-beans.xml

(limited to 'src/test/resources')

diff --git a/src/test/resources/babel-beans.xml b/src/test/resources/babel-beans.xml
deleted file mode 100644
index f102337..0000000
--- a/src/test/resources/babel-beans.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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="classpath: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/test/resources/logback.xml b/src/test/resources/logback.xml
index 4f51317..376eb79 100644
--- a/src/test/resources/logback.xml
+++ b/src/test/resources/logback.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="30 seconds" debug="true">
 	<property name="componentName" value="AAI-BAS" />
-	<property name="logDirectory" value="${AJSC_HOME}/logs/${componentName}" />
+	<property name="logDirectory" value="./logs/${componentName}" />
 
 	<!-- default EELF log file names -->
 	<property name="generalLogName" value="error" />
diff --git a/src/test/resources/test-babel-beans.xml b/src/test/resources/test-babel-beans.xml
new file mode 100644
index 0000000..f102337
--- /dev/null
+++ b/src/test/resources/test-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="classpath: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>
-- 
cgit 1.2.3-korg