Switch to new Locate Features

[aaf/authz.git] / auth / auth-fs / src / main / java / org / onap / aaf / auth / fs / AAF_FS.java

diff --git a/auth/auth-fs/src/main/java/org/onap/aaf/auth/fs/AAF_FS.java b/auth/auth-fs/src/main/java/org/onap/aaf/auth/fs/AAF_FS.java
index 128c1f9..b56fc03 100644 (file)
--- a/auth/auth-fs/src/main/java/org/onap/aaf/auth/fs/AAF_FS.java
+++ b/auth/auth-fs/src/main/java/org/onap/aaf/auth/fs/AAF_FS.java
@@ -59,10 +59,9 @@ public class AAF_FS extends AbsService<AuthzEnv, AuthzTrans>  {
             env.staticSlot(CachingFileAccess.CFA_WEB_PATH,"aaf_public_dir");
 
             CachingFileAccess<AuthzTrans> cfa = new CachingFileAccess<AuthzTrans>(env);
-            route(env,GET,"/:key", cfa); 
-            route(env,GET,"/:key/:cmd", cfa);
-            final String aaf_locate_url = access.getProperty(Config.AAF_LOCATE_URL, null);
-            if(aaf_locate_url == null) {
+            route(env,GET,"/:key*", cfa);
+            final String aaf_locate_url = Config.getAAFLocateUrl(access);
+            if (aaf_locate_url == null) {
                 access.printf(Level.WARN, "Redirection requires property %s",Config.AAF_LOCATE_URL);
             } else {
                 route(env,GET,"/", new Redirect(this,aaf_locate_url));
@@ -99,7 +98,7 @@ public class AAF_FS extends AbsService<AuthzEnv, AuthzTrans>  {
     @Override
     public Registrant<AuthzEnv>[] registrants(final int port) throws CadiException, LocatorException {
         return new Registrant[] {
-            new RemoteRegistrant<AuthzEnv>(aafCon(),app_name,app_version,port)
+            new RemoteRegistrant<AuthzEnv>(aafCon(),port)
         };
     }