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;h=a9a9b4e521d5c5e6f0ee57a76c53ba8100352e7a;hb=f85f0889b3b0e5e9694afab4dd01a4a97a155188;hp=c1bc8202dfbf56017e7215d381bcaa3bb93bd00b;hpb=71037c39a37d3549dcfe31926832a657744fbe05;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 c1bc8202..a9a9b4e5 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
@@ -49,11 +49,12 @@ import org.onap.aaf.auth.env.AuthzTransFilter;
 import org.onap.aaf.auth.rserv.HttpMethods;
 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.Access;
+import org.onap.aaf.cadi.Access.Level;
 import org.onap.aaf.cadi.CadiException;
 import org.onap.aaf.cadi.LocatorException;
 import org.onap.aaf.cadi.PropAccess;
-import org.onap.aaf.cadi.Access.Level;
 import org.onap.aaf.cadi.aaf.v2_0.AAFAuthn;
 import org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm;
 import org.onap.aaf.cadi.aaf.v2_0.AAFTrustChecker;
@@ -70,7 +71,7 @@ import com.datastax.driver.core.Cluster;
 public class AAF_CM extends AbsService<AuthzEnv, AuthzTrans> {
 
 	private static final String USER_PERMS = "userPerms";
-	private static final Map<String,CA> certAuths = new TreeMap<String,CA>();
+	private static final Map<String,CA> 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<String, Dated> cacheUser;
@@ -200,11 +201,12 @@ public class AAF_CM extends AbsService<AuthzEnv, AuthzTrans> {
 	}
 
 	@Override
-	public Filter[] filters() throws CadiException, LocatorException {
+	public Filter[] _filters(Object ... additionalTafLurs) throws CadiException, LocatorException {
 		try {
 			return new Filter[] {
 					new AuthzTransFilter(env,aafCon(),
-		        			new AAFTrustChecker((Env)env))
+		        		new AAFTrustChecker((Env)env),
+		        		additionalTafLurs)
 				};
 		} catch (NumberFormatException e) {
 			throw new CadiException("Invalid Property information", e);
@@ -226,10 +228,11 @@ public class AAF_CM extends AbsService<AuthzEnv, AuthzTrans> {
 	}
 
 	public static void main(final String[] args) {
-		PropAccess propAccess = new PropAccess(args);
 		try {
+			Log4JLogIt logIt = new Log4JLogIt(args, "cm");
+			PropAccess propAccess = new PropAccess(logIt,args);
+
  			AAF_CM service = new AAF_CM(new AuthzEnv(propAccess));
-//			env.setLog4JNames("log4j.properties","authz","cm","audit","init","trace");
 			JettyServiceStarter<AuthzEnv,AuthzTrans> jss = new JettyServiceStarter<AuthzEnv,AuthzTrans>(service);
 			jss.start();
 		} catch (Exception e) {