Merge "Install tools/libs from doc hub image"

[aaf/authz.git] / auth / auth-gui / src / main / java / org / onap / aaf / auth / gui / AAF_GUI.java

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 be93d63..23713d8 100644 (file)
--- 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
@@ -68,6 +68,7 @@ import org.onap.aaf.auth.gui.pages.WebCommand;
 import org.onap.aaf.auth.rserv.CachingFileAccess;
 import org.onap.aaf.auth.server.AbsService;
 import org.onap.aaf.auth.server.JettyServiceStarter;
+import org.onap.aaf.auth.server.Log4JLogIt;
 import org.onap.aaf.cadi.CadiException;
 import org.onap.aaf.cadi.LocatorException;
 import org.onap.aaf.cadi.PropAccess;
@@ -121,8 +122,6 @@ public class AAF_GUI extends AbsService<AuthzEnv, AuthzTrans> implements State<E
                sTheme = env.staticSlot(CachingFileAccess.CFA_WEB_PATH,access.getProperty(CachingFileAccess.CFA_WEB_PATH,null)==null?AAF_GUI_THEME:CachingFileAccess.CFA_WEB_PATH);
                theme = env.getProperty(AAF_GUI_THEME);
 
-               //OrganizationFactory.setDefaultOrg(env, "org.osaaf.authz.org.att.ATT");
-
                slot_httpServletRequest = env.slot(HTTP_SERVLET_REQUEST);
                String[] component = Split.split(':', access.getProperty(Config.AAF_COMPONENT, "N/A:2.x"));
                if(component.length>1) {
@@ -254,10 +253,11 @@ public class AAF_GUI extends AbsService<AuthzEnv, AuthzTrans> implements State<E
        }
 
        public static void main(final String[] args) {
-               PropAccess propAccess = new PropAccess(args);
                try {
-                       AAF_GUI service = new AAF_GUI(new AuthzEnv(propAccess));
-//                     env.setLog4JNames("log4j.properties","authz","gui","audit","init","trace ");
+                       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();
                } catch (Exception e) {