Rework AAF classes

Rework AAF integration to be more Spring specific + change console log
to previous pattern

Issue-ID: CLAMP-210
Change-Id: I689269668f64996f2d07491e420062f5ca0ca1db
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>

3 files changed, 22 insertions, 21 deletions

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 552efbc7..b5069159 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -55,15 +55,19 @@ info.build.version=@project.version@
 ### HTTP (Redirected to HTTPS) and HTTPS Example:
 ### --------------------------------------------
 server.port=8443
-server.ssl.client-auth=want
-server.ssl.key-store=file:/opt/clamp/config/org.onap.clamp.p12
+## Config part for Server certificates
+# Can be a classpath parameter instead of file:/
+server.ssl.key-store=classpath:/clds/aaf/org.onap.clamp.p12
 server.ssl.key-store-password=China in the Spring
 server.ssl.key-password=China in the Spring
 server.ssl.key-store-type=PKCS12
-server.ssl.trust=/opt/clamp/config/truststoreONAPall.jks
-server.ssl.trust-pass=changeit
-server.ssl.trust-type=JKS
 server.ssl.key-alias=clamp@clamp.onap.org
+
+## Config part for Client certificates
+server.ssl.client-auth=need
+server.ssl.trust-store=classpath:/clds/aaf/truststoreONAPall.jks
+server.ssl.trust-store-password=changeit
+
 server.http-to-https-redirection.port=8080
 
 server.servlet.context-path=/
@@ -228,7 +232,7 @@ clamp.config.security.permission.type.template=org.onap.clamp.clds.template
 clamp.config.security.permission.instance=dev
 
 #AAF related parameters
-clamp.config.cadi.keyFile=/opt/clamp/config/org.onap.clamp.keyfile
+clamp.config.cadi.keyFile=classpath:/clds/aaf/org.onap.clamp.keyfile
 clamp.config.cadi.cadiLoglevel=DEBUG
 clamp.config.cadi.cadiLatitude=37.78187
 clamp.config.cadi.cadiLongitude=-122.26147
diff --git a/src/main/resources/logback-default.xml b/src/main/resources/logback-default.xml
index 37cdf763..c2524bec 100644
--- a/src/main/resources/logback-default.xml
+++ b/src/main/resources/logback-default.xml
@@ -10,18 +10,15 @@
 		<property name="p_mak" value="%replace(%replace(%marker){'\t', '\\\\t'}){'\n','\\\\n'}"/>
 		<property name="p_thr" value="%thread"/>
 		<property name="defaultPattern" value="%nopexception${p_tim}\t${p_thr}\t${p_lvl}\t${p_log}\t${p_mdc}\t${p_msg}\t${p_exc}\t${p_mak}\t%n"/>
-		<property name="debugPattern" value="%nopexception${p_tim}|${p_lvl}|${p_mdc}|{p_exc}|%msg%n"/>
+		<property name="debugPattern" value="%nopexception${p_tim}|${p_lvl}|${p_mdc}|${p_exc}|%msg%n"/>
 
 		<!-- Example evaluator filter applied against console appender -->
 		<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-				<!-- filter class="ch.qos.logback.classic.filter.LevelFilter"> <level>ERROR</level> 
-						<onMatch>ACCEPT</onMatch> <onMismatch>DENY</onMismatch> </filter -->
-				<!-- deny all events with a level below INFO, that is TRACE and DEBUG -->
 				<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
 						<level>INFO</level>
 				</filter>
 				<encoder>
-						<pattern>${debugPattern}</pattern>
+					<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n</pattern>
 				</encoder>
 		</appender>
 
@@ -181,7 +178,6 @@
 	<logger name="ch.qos.logback.core" level="INFO" />
 
 	<!-- logback jms appenders & loggers definition starts here -->
-	<!-- logback jms appenders & loggers definition starts here -->
 	<appender name="auditLogs"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
diff --git a/src/main/resources/system.properties b/src/main/resources/system.properties
index a24b6202..f95fc700 100644
--- a/src/main/resources/system.properties
+++ b/src/main/resources/system.properties
@@ -5,22 +5,23 @@
 # Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
 #                             reserved.
 # ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License"); 
-# you may not use this file except in compliance with the License. 
+# 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
 # 
-# 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 
+# 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============================================
 # ===================================================================
-# 
-###
+#
+### Static JVM parameters can be set here by the dev team
+### These will be loaded at Clamp startup
 #
 # JVM SSL/TLS properties
-jdk.tls.client.protocols=TLSv1.1,TLSv1.2 
+jdk.tls.client.protocols=TLSv1.1,TLSv1.2
 https.protocols=TLSv1.1,TLSv1.2