From 924b18d7469204ceaae60d7345712ea09f75a674 Mon Sep 17 00:00:00 2001
From: Instrumental <jcgmisc@stl.gathman.org>
Date: Thu, 5 Apr 2018 20:17:18 -0500
Subject: Add Certs, Docker Build

Issue-ID: AAF-211
Change-Id: Idc7630578155586a6e53d7af80dd16e4e0ac41ca
Signed-off-by: Instrumental <jcgmisc@stl.gathman.org>
---
 auth/auth-fs/pom.xml                                      |  3 ++-
 .../src/main/java/org/onap/aaf/auth/fs/AAF_FS.java        | 15 ++-------------
 2 files changed, 4 insertions(+), 14 deletions(-)

(limited to 'auth/auth-fs')

diff --git a/auth/auth-fs/pom.xml b/auth/auth-fs/pom.xml
index 7bc56ac1..05a2b33c 100644
--- a/auth/auth-fs/pom.xml
+++ b/auth/auth-fs/pom.xml
@@ -112,7 +112,8 @@
 							<mainClass>org.onap.aaf.auth.fs.AAF_FS</mainClass>
 							<name>fs</name>
 							<commandLineArguments>
-								<commandLineArgument>cadi_prop_files=${project.conf_dir}/org.osaaf.fs.props</commandLineArgument>
+								<commandLineArgument>cadi_prop_files=${project.ext_root_dir}/etc/org.osaaf.fs.props</commandLineArgument>
+								<commandLineArgument>cadi_log_dir=${project.ext_root_dir}/logs/fs</commandLineArgument>
 							</commandLineArguments>
 						</program>
 					</programs>
diff --git a/auth/auth-fs/src/main/java/org/onap/aaf/auth/fs/AAF_FS.java b/auth/auth-fs/src/main/java/org/onap/aaf/auth/fs/AAF_FS.java
index 719daaae..0359b3ef 100644
--- a/auth/auth-fs/src/main/java/org/onap/aaf/auth/fs/AAF_FS.java
+++ b/auth/auth-fs/src/main/java/org/onap/aaf/auth/fs/AAF_FS.java
@@ -23,7 +23,6 @@ package org.onap.aaf.auth.fs;
 
 import static org.onap.aaf.auth.rserv.HttpMethods.GET;
 
-import java.io.File;
 import java.io.IOException;
 
 import javax.servlet.Filter;
@@ -105,19 +104,9 @@ public class AAF_FS extends AbsService<AuthzEnv, AuthzTrans>  {
 	
 	public static void main(final String[] args) {
 		try {
-			String propsFile = getArg(AAF_LOG4J_PREFIX, args, "org.osaaf")+".log4j.props";
-			String log_dir = getArg(Config.CADI_LOGDIR,args,"./logs");
-			String log_level = getArg(Config.CADI_LOGLEVEL,args,"INFO");
-			File logs = new File(log_dir);
-			if(!logs.isDirectory()) {
-				logs.delete();
-			}
-			if(!logs.exists()) {
-				logs.mkdirs();
-			}
-			Log4JLogIt logIt = new Log4JLogIt(log_dir,log_level,propsFile, "fs");
+			Log4JLogIt logIt = new Log4JLogIt(args, "fs");
 			PropAccess propAccess = new PropAccess(logIt,args);
- 		
+
  			AAF_FS service = new AAF_FS(new AuthzEnv(propAccess));
 			JettyServiceStarter<AuthzEnv,AuthzTrans> jss = new JettyServiceStarter<AuthzEnv,AuthzTrans>(service);
 			jss.insecure().start();
-- 
cgit 1.2.3-korg