X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-certman%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fcm%2FAAF_CM.java;fp=auth%2Fauth-certman%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fcm%2FAAF_CM.java;h=689326e1e5c2b9fe29acae564f39f38081e46ced;hb=7b90307ec5d72dc1170904f86a730e0f2eaff897;hp=15e298b78de3597f4c00e7895dbbda807d7dec42;hpb=c2445ee11b66efebdd5efe92fddf9526926c736e;p=aaf%2Fauthz.git diff --git a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/AAF_CM.java b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/AAF_CM.java index 15e298b7..689326e1 100644 --- a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/AAF_CM.java +++ b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/AAF_CM.java @@ -72,14 +72,14 @@ public class AAF_CM extends AbsService { private static final String USER_PERMS = "userPerms"; private static final Map certAuths = new TreeMap<>(); - public Facade1_0 facade1_0; // this is the default Facade - public Facade1_0 facade1_0_XML; // this is the XML Facade - public Map cacheUser; - public AAFAuthn aafAuthn; - public AAFLurPerm aafLurPerm; - final public Cluster cluster; + public static Facade1_0 facade1_0; // this is the default Facade + public static Facade1_0 facade1_0_XML; // this is the XML Facade + public static Map cacheUser; + public static AAFAuthn aafAuthn; + public static AAFLurPerm aafLurPerm; + public final Cluster cluster; public final LocateDAO locateDAO; - + public static AuthzEnv envLog; /** * Construct AuthzAPI with all the Context Supporting Routes that Authz needs @@ -96,8 +96,8 @@ public class AAF_CM extends AbsService { // Note: If you need both Authn and Authz construct the following: aafAuthn = aafCon().newAuthn(aafLurPerm); - String aaf_env = env.getProperty(Config.AAF_ENV); - if (aaf_env==null) { + String aafEnv = env.getProperty(Config.AAF_ENV); + if (aafEnv==null) { throw new APIException("aaf_env needs to be set"); } @@ -133,7 +133,7 @@ public class AAF_CM extends AbsService { Object pinst[] = new Object[4]; pinst[0]=env; pinst[1]= key.substring(idx+1); - pinst[2]= aaf_env; + pinst[2]= aafEnv; pinst[3] = multiParams; CA ca = cons.newInstance(pinst); certAuths.put(ca.getName(),ca); @@ -228,6 +228,7 @@ public class AAF_CM extends AbsService { } public static void main(final String[] args) { + try { Log4JLogIt logIt = new Log4JLogIt(args, "cm"); PropAccess propAccess = new PropAccess(logIt,args); @@ -236,7 +237,7 @@ public class AAF_CM extends AbsService { JettyServiceStarter jss = new JettyServiceStarter(service); jss.start(); } catch (Exception e) { - e.printStackTrace(); + envLog.error().log(e); } } }