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=6077b39d03825d9569254933c9b96016c7e5f51c;hb=de75a11f03d87b53f7a2b5525c8fc66f6053aef2;hp=128c1f9b96a9646ca8dc720aa391edabf2f0f76d;hpb=4b5a7d721d994a49057e9bfb403c7bff1b376660;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 128c1f9b..6077b39d 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
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -44,25 +44,22 @@ import org.onap.aaf.cadi.PropAccess;
 import org.onap.aaf.cadi.config.Config;
 import org.onap.aaf.cadi.register.Registrant;
 import org.onap.aaf.cadi.register.RemoteRegistrant;
-import org.onap.aaf.misc.env.APIException;
-
 
 public class AAF_FS extends AbsService<AuthzEnv, AuthzTrans>  {
 
-    public AAF_FS(final AuthzEnv env) throws APIException, IOException, CadiException {
+    public AAF_FS(final AuthzEnv env) throws IOException, CadiException {
         super(env.access(),env);
         try {
-            ///////////////////////  
-            // File Server 
+            ///////////////////////
+            // File Server
             ///////////////////////
             // creates StaticSlot, needed for CachingFileAccess, and sets to public Dir
             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) {
+            CachingFileAccess<AuthzTrans> cfa = new CachingFileAccess<>(env);
+            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));
@@ -71,7 +68,7 @@ public class AAF_FS extends AbsService<AuthzEnv, AuthzTrans>  {
             e.printStackTrace();
         }
     }
-    
+
     private static class Redirect extends HttpCode<AuthzTrans, AAF_FS> {
         private final String url;
 
@@ -86,7 +83,7 @@ public class AAF_FS extends AbsService<AuthzEnv, AuthzTrans>  {
             resp.sendRedirect(url);
         }
     };
-    
+
     @Override
     public Filter[] _filters(Object ... additionalTafLurs) throws CadiException, LocatorException {
         // Note: No TAFs and Lurs on FileServer
@@ -99,18 +96,21 @@ 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)
         };
     }
-    
+
     public static void main(final String[] args) {
         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();
         }