X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Fcore%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Fconfig%2FConfig.java;h=adb69184abc3e9be68cf2e658a5b2b7fee9d0faf;hb=f6f44f558ce4f04605269f71a10d6df054295f6a;hp=f74f194b7dd02846cf0bd50741bec3f00ed8e353;hpb=ba989d05eca8d2a98c51ed9d38c4c3345db23349;p=aaf%2Fauthz.git

diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java b/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java
index f74f194b..adb69184 100644
--- a/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java
+++ b/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java
@@ -565,7 +565,7 @@ public class Config {
             }
             access.log(Level.INIT, sb);
 
-            Locator<URI> locator = loadLocator(si, logProp(rph, Config.getAAFLocateUrl(access), null));
+            Locator<URI> locator = loadLocator(si, aafURL);
             
             taf = new HttpEpiTaf(access,locator, tc, htarray); // ok to pass locator == null
             String level = logProp(access, CADI_LOGLEVEL, null);
@@ -850,6 +850,21 @@ public class Config {
         if (_url==null) {
             access.log(Level.INIT,"No URL passed to 'loadLocator'. Disabled");
         } else {
+        	try {
+    			Class<?> aalCls = Class.forName("org.onap.aaf.cadi.aaf.v2_0.AbsAAFLocator");
+    			Method aalMth = aalCls.getMethod("create", String.class,String.class);
+    			int colon = _url.lastIndexOf(':');
+    			if(colon>=0) {
+    				String version = _url.substring(colon+1);
+    				int slash = _url.lastIndexOf('/',colon);
+    				if(slash>=0) {
+    					Object aal = aalMth.invoke(null/*static*/, _url.substring(slash+1, colon),version);
+    					return (Locator<URI>)aal;
+    				}
+    			}
+    		} catch (ClassNotFoundException | NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+    			access.log(Level.DEBUG, "Configured AbsAAFLocator not found.  Continuing Locator creation");
+    		}
 //            String url = _url.replace("/AAF_NS.", "/%C%CID%AAF_NS.");
 //            String root_ns = access.getProperty(Config.AAF_ROOT_NS, null);
         	String url;