import java.util.concurrent.ConcurrentHashMap;
import org.onap.aaf.auth.env.AuthzTrans;
+import org.onap.aaf.cadi.config.Config;
import org.onap.aaf.cadi.util.FQI;
import org.onap.aaf.cadi.util.Split;
import org.onap.aaf.misc.env.Env;
}
}
}
+ if(firstOrg==null) { // attempt to load DefaultOrg
+ try {
+ Class<?> cls = Class.forName("org.onap.aaf.org.DefaultOrg");
+ @SuppressWarnings("unchecked")
+ Constructor<Organization> cnst = (Constructor<Organization>)cls.getConstructor(Env.class,String.class);
+ String realm = env.getProperty(Config.AAF_DEFAULT_REALM,"people.osaaf.org");
+ defaultOrg = cnst.newInstance(env,realm);
+ } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | NoSuchMethodException | SecurityException | IllegalArgumentException | InvocationTargetException e) {
+ env.warn().log("Not Organization Moduled linked in",e);
+ }
+ }
if (defaultOrg == null) {
defaultOrg = firstOrg;
}
}
Organization org = orgs.get(orgNS);
if (org == null) {
- env.debug().printf("Attempting to instantiate Organization %s\n",orgNS);
+ env.debug().printf("Attempting to instantiate Organization %s",orgNS);
String orgClass = env.getProperty(ORGANIZATION_DOT+orgNS);
if (orgClass == null) {
- env.warn().log("There is no Organization." + orgNS + " property");
+ env.warn().printf("There is no Organization.%s property",orgNS);
} else {
try {
Class<?> orgCls = Class.forName(orgClass);
if ((isDefault="true".equalsIgnoreCase(env.getProperty(orgNS+".default")))) {
defaultOrg = org;
}
- env.init().printf("Instantiated %s with %s%s\n",orgNS,orgClass,(isDefault?" as default":""));
+ env.init().printf("Instantiated %s with %s%s",orgNS,orgClass,(isDefault?" as default":""));
}
if (org==null) {
if (defaultOrg!=null) {