JettyStartups to improve new Filters

[aaf/authz.git] / auth / auth-locate / src / main / java / org / onap / aaf / auth / locate / AAF_Locate.java

diff --git a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java
index 31f6772..efda67f 100644 (file)
--- a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java
+++ b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java
@@ -22,7 +22,6 @@
 
 package org.onap.aaf.auth.locate;
 
-import java.io.File;
 import java.net.URI;
 import java.util.Map;
 
@@ -203,11 +202,12 @@ public class AAF_Locate 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)
+                                       ,additionalTafLurs
                                )};
                } catch (NumberFormatException e) {
                        throw new CadiException("Invalid Property information", e);
@@ -233,17 +233,7 @@ public class AAF_Locate 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, "locate");
+                       Log4JLogIt logIt = new Log4JLogIt(args, "locate");
                        PropAccess propAccess = new PropAccess(logIt,args);
 
                        AAF_Locate service = new AAF_Locate(new AuthzEnv(propAccess));