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-gui/pom.xml                                    |  3 ++-
 .../src/main/java/org/onap/aaf/auth/gui/AAF_GUI.java     | 16 ++--------------
 2 files changed, 4 insertions(+), 15 deletions(-)

(limited to 'auth/auth-gui')

diff --git a/auth/auth-gui/pom.xml b/auth/auth-gui/pom.xml
index bfb65e97..838c006e 100644
--- a/auth/auth-gui/pom.xml
+++ b/auth/auth-gui/pom.xml
@@ -117,7 +117,8 @@
 							<mainClass>org.onap.aaf.auth.gui.AAF_GUI</mainClass>
 							<name>gui</name>
 							<commandLineArguments>
-								<commandLineArgument>cadi_prop_files=${project.conf_dir}/org.osaaf.gui.props</commandLineArgument>
+								<commandLineArgument>cadi_prop_files=${project.ext_root_dir}/etc/org.osaaf.gui.props</commandLineArgument>
+								<commandLineArgument>cadi_log_dir=${project.ext_root_dir}/logs/gui</commandLineArgument>
 							</commandLineArguments>
 							<jvmSettings>
 								<extraArguments>
diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/AAF_GUI.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/AAF_GUI.java
index 676866bb..7d2a0172 100644
--- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/AAF_GUI.java
+++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/AAF_GUI.java
@@ -25,8 +25,6 @@ import static org.onap.aaf.auth.rserv.HttpMethods.GET;
 import static org.onap.aaf.auth.rserv.HttpMethods.POST;
 import static org.onap.aaf.auth.rserv.HttpMethods.PUT;
 
-import java.io.File;
-
 import javax.servlet.Filter;
 
 import org.onap.aaf.auth.cmd.Cmd;
@@ -258,19 +256,9 @@ public class AAF_GUI extends AbsService<AuthzEnv, AuthzTrans> implements State<E
 
 	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, "authz");
+			Log4JLogIt logIt = new Log4JLogIt(args, "gui");
 			PropAccess propAccess = new PropAccess(logIt,args);
- 		
+
 			AAF_GUI service = new AAF_GUI(new AuthzEnv(propAccess));
 			JettyServiceStarter<AuthzEnv,AuthzTrans> jss = new JettyServiceStarter<AuthzEnv,AuthzTrans>(service);
 			jss.start();
-- 
cgit 1.2.3-korg