Refine Agent to create CADI Configs

[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..8371ff1 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;
 
@@ -31,6 +30,7 @@ import javax.servlet.Filter;
 import org.onap.aaf.auth.cache.Cache;
 import org.onap.aaf.auth.cache.Cache.Dated;
 import org.onap.aaf.auth.dao.CassAccess;
+import org.onap.aaf.auth.dao.cass.ConfigDAO;
 import org.onap.aaf.auth.dao.cass.LocateDAO;
 import org.onap.aaf.auth.direct.DirectLocatorCreator;
 import org.onap.aaf.auth.direct.DirectRegistrar;
@@ -42,7 +42,7 @@ import org.onap.aaf.auth.locate.api.API_Api;
 import org.onap.aaf.auth.locate.api.API_Find;
 import org.onap.aaf.auth.locate.api.API_Proxy;
 import org.onap.aaf.auth.locate.facade.LocateFacadeFactory;
-import org.onap.aaf.auth.locate.facade.LocateFacade_1_0;
+import org.onap.aaf.auth.locate.facade.LocateFacade_1_1;
 import org.onap.aaf.auth.locate.mapper.Mapper.API;
 import org.onap.aaf.auth.rserv.HttpMethods;
 import org.onap.aaf.auth.server.AbsService;
@@ -62,6 +62,7 @@ import org.onap.aaf.cadi.register.Registrant;
 import org.onap.aaf.misc.env.APIException;
 import org.onap.aaf.misc.env.Data;
 import org.onap.aaf.misc.env.Env;
+import org.onap.aaf.misc.rosetta.env.RosettaEnv;
 
 import com.datastax.driver.core.Cluster;
 
@@ -69,8 +70,8 @@ public class AAF_Locate extends AbsService<AuthzEnv, AuthzTrans> {
        private static final String DOT_LOCATOR = ".locator";
 
        private static final String USER_PERMS = "userPerms";
-       private LocateFacade_1_0 facade; // this is the default Facade
-       private LocateFacade_1_0 facade_1_0_XML;
+       private LocateFacade_1_1 facade; // this is the default Facade
+       private LocateFacade_1_1 facade_1_1_XML;
        public Map<String, Dated> cacheUser;
        public final AAFAuthn<?> aafAuthn;
        public final AAFLurPerm aafLurPerm;
@@ -78,6 +79,7 @@ public class AAF_Locate extends AbsService<AuthzEnv, AuthzTrans> {
        public final long expireIn;
        private final Cluster cluster;
        public final LocateDAO locateDAO;
+       public final ConfigDAO configDAO;
        private Locator<URI> dal;
        private final String aaf_service_name;
        private final String aaf_gui_name;
@@ -104,6 +106,7 @@ public class AAF_Locate extends AbsService<AuthzEnv, AuthzTrans> {
 
                cluster = org.onap.aaf.auth.dao.CassAccess.cluster(env,null);
                locateDAO = new LocateDAO(trans,cluster,CassAccess.KEYSPACE);
+               configDAO = new ConfigDAO(trans,locateDAO); // same stuff
 
                // Have AAFLocator object Create DirectLocators for Location needs
                AbsAAFLocator.setCreator(new DirectLocatorCreator(env, locateDAO));
@@ -113,8 +116,8 @@ public class AAF_Locate extends AbsService<AuthzEnv, AuthzTrans> {
                aafAuthn = aafCon().newAuthn(aafLurPerm);
 
 
-               facade = LocateFacadeFactory.v1_0(env,locateDAO,trans,Data.TYPE.JSON);   // Default Facade
-               facade_1_0_XML = LocateFacadeFactory.v1_0(env,locateDAO,trans,Data.TYPE.XML);
+               facade = LocateFacadeFactory.v1_1(env,this,trans,Data.TYPE.JSON);   // Default Facade
+               facade_1_1_XML = LocateFacadeFactory.v1_1(env,this,trans,Data.TYPE.XML);
 
                synchronized(env) {
                        if(cacheUser == null) {
@@ -167,7 +170,7 @@ public class AAF_Locate extends AbsService<AuthzEnv, AuthzTrans> {
 
                // setup Application API HTML ContentTypes for XML and Route
                application = applicationXML(respCls, version);
-               route(env,meth,path,code.clone(facade_1_0_XML,false),application,"text/xml;version="+version);
+               route(env,meth,path,code.clone(facade_1_1_XML,false),application,"text/xml;version="+version);
                
                // Add other Supported APIs here as created
        }
@@ -203,11 +206,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 +237,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));