X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-service%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fservice%2FAAF_Service.java;h=4064000776bb8b48d5a46a632f45d9002099fdcd;hb=ca76fbda94492f1b0c895ff0f4070381f17472f0;hp=0040912f6b1e6da9f59b9cf582a39d42d3861784;hpb=c36423577d5b8501af78cc2f8a7db1e43eacdf0d;p=aaf%2Fauthz.git

diff --git a/auth/auth-service/src/main/java/org/onap/aaf/auth/service/AAF_Service.java b/auth/auth-service/src/main/java/org/onap/aaf/auth/service/AAF_Service.java
index 0040912f..40640007 100644
--- a/auth/auth-service/src/main/java/org/onap/aaf/auth/service/AAF_Service.java
+++ b/auth/auth-service/src/main/java/org/onap/aaf/auth/service/AAF_Service.java
@@ -21,8 +21,6 @@
 
 package org.onap.aaf.auth.service;
 
-import java.io.File;
-
 import javax.servlet.Filter;
 
 import org.onap.aaf.auth.cache.Cache;
@@ -56,6 +54,7 @@ import org.onap.aaf.auth.service.facade.AuthzFacadeFactory;
 import org.onap.aaf.auth.service.facade.AuthzFacade_2_0;
 import org.onap.aaf.auth.service.mapper.Mapper.API;
 import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.LocatorException;
 import org.onap.aaf.cadi.PropAccess;
 import org.onap.aaf.cadi.aaf.v2_0.AAFTrustChecker;
 import org.onap.aaf.cadi.aaf.v2_0.AbsAAFLocator;
@@ -159,22 +158,31 @@ public class AAF_Service extends AbsService<AuthzEnv,AuthzTrans> {
 	}
 	
 	@Override
-	public Filter[] filters() throws CadiException {
-		final String domain = FQI.reverseDomain(access.getProperty("aaf_root_ns","org.osaaf.aaf"));
+	public Filter[] _filters(Object ... additionalTafLurs) throws CadiException, LocatorException {
+		final String domain = FQI.reverseDomain(access.getProperty(Config.AAF_ROOT_NS,Config.AAF_ROOT_NS_DEF));
 		try {
-				return new Filter[] {new AuthzTransFilter(env, null /* no connection to AAF... it is AAF */,
-						new AAFTrustChecker((Env)env),
-						new DirectAAFLur(env,question), // Note, this will be assigned by AuthzTransFilter to TrustChecker
-						//new DirectOAuthTAF(env,question,OAFacadeFactory.directV1_0(oauthService)),
-						new BasicHttpTaf(env, directAAFUserPass,
-							domain,Long.parseLong(env.getProperty(Config.AAF_CLEAN_INTERVAL, Config.AAF_CLEAN_INTERVAL_DEF)),
-							false)
-					)};
+        	Object[] atl=new Object[additionalTafLurs.length+2];
+        	atl[0]=new DirectAAFLur(env,question); // Note, this will be assigned by AuthzTransFilter to TrustChecker
+			atl[1]= new BasicHttpTaf(env, directAAFUserPass,
+					domain,Long.parseLong(env.getProperty(Config.AAF_CLEAN_INTERVAL, Config.AAF_CLEAN_INTERVAL_DEF)),
+					false);
+
+	        if(additionalTafLurs.length>0) {
+	        	System.arraycopy(additionalTafLurs, 0, atl, 2, additionalTafLurs.length);
+	        }
+	        
+			return new Filter[] {
+				new AuthzTransFilter(env,aafCon(),
+	        		new AAFTrustChecker((Env)env),
+	        		atl
+	        )};
 		} catch (NumberFormatException e) {
 			throw new CadiException("Invalid Property information", e);
 		}
 	}
 
+
+
 	@SuppressWarnings("unchecked")
 	@Override
 	public Registrant<AuthzEnv>[] registrants(final int port) throws CadiException {
@@ -216,19 +224,9 @@ public class AAF_Service 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, "authz");
+			Log4JLogIt logIt = new Log4JLogIt(args, "authz");
 			PropAccess propAccess = new PropAccess(logIt,args);
- 		
+			
  			AbsService<AuthzEnv, AuthzTrans> service = new AAF_Service(new AuthzEnv(propAccess));
 			JettyServiceStarter<AuthzEnv,AuthzTrans> jss = new JettyServiceStarter<AuthzEnv,AuthzTrans>(service);
 			jss.start();