Code Review
/
aaf
/
authz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove Tabs, per Jococo
[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
26e4929
..
df05da9
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,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);
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 {
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);
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();
}
} catch (Exception e) {
e.printStackTrace();
}