fix foam build

Makefile

@@ -23,8 +23,12 @@ foam2_MAVEN_DEPS = \
 	commons-codec:commons-codec:1.11 \
 	commons-io:commons-io:2.6 \
 	org.apache-extras.beanshell:bsh:2.0b6 \
-	com.google.api-client:google-api-client:1.22.0 \
-	com.google.oauth-client:google-oauth-client-jetty:1.22.0 \
+	com.google.api-client:google-api-client:1.30.9 \
+	com.google.oauth-client:google-oauth-client:1.30.6 \
+	com.google.oauth-client:google-oauth-client-java6:1.30.6 \
+	com.google.oauth-client:google-oauth-client-jetty:1.30.6 \
+	com.google.http-client:google-http-client:1.34.2 \
+	com.google.http-client:google-http-client-jackson2:1.34.2 \
 	com.google.apis:google-api-services-sheets:v4-rev578-1.22.0 \
 	com.google.apis:google-api-services-drive:v3-rev72-1.22.0 \
 	org.jtwig:jtwig-core:5.86.1.RELEASE \
@@ -89,4 +93,4 @@ run: nanos $(foam2_JAR)
 	./$< -d --datadir src
 
 test: nanos $(foam2_JAR)
-	./$< -t --datadir src
+	./$< -t --datadir src

README.md

@@ -58,7 +58,7 @@ To access, run the following in the parent directory of foam2:
 
 * Run foam2/./tools/nanos.sh
 
-* Visit http://localhost:8080/static/foam2/src/foam/nanos/controller/index.html
+* Visit http://localhost:8080/src/foam/nanos/controller/index.html
 
 ## Style Guide
 

src/services

@@ -66,7 +66,6 @@ p({
     auth = new foam.nanos.auth.twofactor.TwoFactorAuthService.Builder(x)
       .setDelegate(auth)
       .build();
-    return auth;
     auth = new foam.nanos.auth.SystemAuthService.Builder(x)
       .setDelegate(auth)
       .build();
@@ -667,8 +666,8 @@ p({
       .setRuler(false)
       .build();
 
-    dao = new foam.dao.ValidatingDAO(x, dao);
     dao.addPropertyIndex(new foam.core.PropertyInfo[] { foam.nanos.ruler.Rule.NAME });
+    dao = new foam.dao.ValidatingDAO(x, dao);
 
     return dao;
   """,
@@ -1037,4 +1036,4 @@ p({
     "tokensFolderPath":"/tmp"
   },
   "documentation": "Service for setting authorization request parameters which are required in order to retrieve access token. To download credentials visit Google Developers Console"
-})
+})