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=aa5c1dafc8285442f2d20e070e048feedb626d2b;hb=4a5f63f7f149ecba9556ee67a4ca00fb51845bf0;hp=bfdb977db224faf6cf8dc2b47c9fecc5ef40df8b;hpb=f0306f11ef4146a17485c96f6770c74315305dee;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 bfdb977d..aa5c1daf 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
@@ -23,6 +23,7 @@
 package org.onap.aaf.auth.cm;
 
 import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.TreeMap;
@@ -39,6 +40,7 @@ import org.onap.aaf.auth.cm.facade.FacadeFactory;
 import org.onap.aaf.auth.cm.mapper.Mapper.API;
 import org.onap.aaf.auth.cm.service.CMService;
 import org.onap.aaf.auth.cm.service.Code;
+import org.onap.aaf.auth.cm.validation.CertmanValidator;
 import org.onap.aaf.auth.dao.CassAccess;
 import org.onap.aaf.auth.dao.cass.LocateDAO;
 import org.onap.aaf.auth.direct.DirectLocatorCreator;
@@ -71,6 +73,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 String CM_ALLOW_TMP = "cm_allow_tmp";
     private static final Map<String,CA> certAuths = new TreeMap<>();
     public static  Facade1_0 facade1_0; // this is the default Facade
     public static  Facade1_0 facade1_0_XML; // this is the XML Facade
@@ -105,6 +108,13 @@ public class AAF_CM extends AbsService<AuthzEnv, AuthzTrans> {
         if (aafEnv==null) {
             throw new APIException("aaf_env needs to be set");
         }
+        
+        // Check for allowing /tmp in Properties
+        String allowTmp = env.getProperty(CM_ALLOW_TMP);
+        if("true".equalsIgnoreCase(allowTmp)) {
+        	CertmanValidator.allowTmp();
+        }
+
 
         // Initialize Facade for all uses
         AuthzTrans trans = env.newTrans();
@@ -139,8 +149,12 @@ public class AAF_CM extends AbsService<AuthzEnv, AuthzTrans> {
                         pinst[1]= key.substring(idx+1);
                         pinst[2]= aafEnv;
                         pinst[3] = multiParams; 
-                        CA ca = cons.newInstance(pinst);
-                        certAuths.put(ca.getName(),ca);
+                        try {
+                        	CA ca = cons.newInstance(pinst);
+                            certAuths.put(ca.getName(),ca);
+                        } catch (InvocationTargetException e) {
+                    		access.log(e, "Loading", segs[0]);
+                        }
                     }
                 }
             }
@@ -225,7 +239,7 @@ public class AAF_CM extends AbsService<AuthzEnv, AuthzTrans> {
     @Override
     public Registrant<AuthzEnv>[] registrants(final int port) throws CadiException, LocatorException {
         return new Registrant[] {
-            new DirectRegistrar(access,locateDAO,app_name,app_version,port)
+            new DirectRegistrar(access,locateDAO,port)
         };
     }
 
@@ -236,16 +250,18 @@ public class AAF_CM extends AbsService<AuthzEnv, AuthzTrans> {
     }
 
     public static void main(final String[] args) {
-      
         try {
             Log4JLogIt logIt = new Log4JLogIt(args, "cm");
             PropAccess propAccess = new PropAccess(logIt,args);
-
-             AAF_CM service = new AAF_CM(new AuthzEnv(propAccess));
-            JettyServiceStarter<AuthzEnv,AuthzTrans> jss = new JettyServiceStarter<AuthzEnv,AuthzTrans>(service);
-            jss.start();
-        } catch (Exception e) {
-            envLog.error().log(e);
+            try {
+	            new JettyServiceStarter<AuthzEnv,AuthzTrans>(
+	            	new AAF_CM(new AuthzEnv(propAccess)),true)
+	            		.start();
+	        } catch (Exception e) {
+	            propAccess.log(e);
+	        }
+        } catch (APIException e) {
+        	e.printStackTrace(System.err);
         }
     }
 }