X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-fs%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Ffs%2FAAF_FS.java;h=df05da933f501f1b1cea15a75687e61d13373003;hb=3d1706fcbe7f95830ff6fd23cf679ee55c6d0595;hp=26e492909b09ef24c6357a268bfdc1d0cdbf835f;hpb=12414fe43077e12d7ef711951b1633ad31d73573;p=aaf%2Fauthz.git

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 26e49290..df05da93 100644
--- 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,9 +59,8 @@ 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);
+            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 {
@@ -107,10 +106,13 @@ public class AAF_FS extends AbsService<AuthzEnv, AuthzTrans>  {
         try {
             Log4JLogIt logIt = new Log4JLogIt(args, "fs");
             PropAccess propAccess = new PropAccess(logIt,args);
-
-             AAF_FS service = new AAF_FS(new AuthzEnv(propAccess));
-            JettyServiceStarter<AuthzEnv,AuthzTrans> jss = new JettyServiceStarter<AuthzEnv,AuthzTrans>(service);
-            jss.insecure().start();
+            try {
+                new JettyServiceStarter<AuthzEnv,AuthzTrans>(
+                    new AAF_FS(new AuthzEnv(propAccess)),false)
+                        .start();
+            } catch (Exception e) {
+                propAccess.log(e);
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }