r20538: Web Application Framework

- correct an error message in the JSON-RPC server

- provide a common RPC request function

- make it easier to have multiple pending RPC requests.  this allows an
  application-specified request to return "not logged in"; authentication
  information to be requested and sent; and the original request to be
  reissued.

- in statistics module, if a time is provided as zero, leave it blank rather
  than displaying 1 Jan 1970.  this showed up in the last_used_at field in the
  SMB status report.

- clean up makefile: remove no-longer-used hard-coded path and install target;
  remove "chmod" and "nice" commands which were part of the original skeleton,
  since that is not deemed appropriate for samba makefiles
(This used to be commit 339ee73ce2809905f608b1003cc645231f256420)

1 files changed, 6 insertions, 18 deletions

diff --git a/webapps/swat/Makefile b/webapps/swat/Makefile
index bf8af850ff..c993dde825 100644
--- a/webapps/swat/Makefile
+++ b/webapps/swat/Makefile
@@ -10,7 +10,6 @@ OPTIMIZESTRINGS = false
 OPTIMIZEVARIABLES = false
 SOURCELOADER=
 NICE=10
-LOCALINSTALLDIR = /usr/local/samba/share/swat/apps/swat
 
 
 ###################################################################################
@@ -116,7 +115,7 @@ distclean: realclean
 ###################################################################################
 
 generate-script-source:
-	@chmod u+x $(GENERATOR) && nice -n $(NICE) $(GENERATOR) \
+	@$(GENERATOR) \
 	  --script-input $(FRAMEWORK)/source/class \
 	  --source-script-path ../$(FRAMEWORK)/source/class \
 	  --script-input $(API)/source/class \
@@ -136,7 +135,7 @@ generate-script-source:
 #      --resource-output defined for one set, it must be defined for each set
 #
 generate-script-build:
-	@chmod u+x $(GENERATOR) && nice -n $(NICE) $(GENERATOR) \
+	@$(GENERATOR) \
 	  --script-input $(FRAMEWORK)/source/class \
 	  --resource-input $(FRAMEWORK)/source/resource \
 	  --resource-output build/resource \
@@ -155,7 +154,7 @@ generate-script-build:
 	  --add-new-lines
 
 generate-api-build:
-	@chmod u+x $(GENERATOR) && nice -n $(NICE) $(GENERATOR) \
+	@$(GENERATOR) \
 	  --script-input $(FRAMEWORK)/source/class \
 	  --resource-input $(FRAMEWORK)/source/resource \
 	  --resource-output api/resource/qooxdoo \
@@ -172,7 +171,7 @@ generate-api-build:
 	  --cache-directory $(CACHE)
 
 generate-api-data:
-	@chmod u+x $(GENERATOR) && nice -n $(NICE) $(GENERATOR) \
+	@$(GENERATOR) \
 	  --script-input $(FRAMEWORK)/source/class \
 	  --script-input $(API)/source/class \
 	  --script-input source/class \
@@ -181,7 +180,7 @@ generate-api-data:
 	  --cache-directory $(CACHE)
 
 generate-pretty:
-	@chmod u+x $(GENERATOR) && nice -n $(NICE) $(GENERATOR) \
+	@$(GENERATOR) \
 	  --script-input source/class \
 	  --script-input $(FRAMEWORK)/source/class \
 	  --include-without-dependencies api.* \
@@ -189,7 +188,7 @@ generate-pretty:
 	  --cache-directory $(CACHE)
 
 generate-fix:
-	@chmod u+x $(GENERATOR) && nice -n $(NICE) $(GENERATOR) \
+	@$(GENERATOR) \
 	  --script-input source/class \
 	  --script-input $(FRAMEWORK)/source/class \
 	  --include-without-dependencies api.* \
@@ -234,14 +233,3 @@ info-source:
 	@echo "****************************************************************************"
 	@echo "  GENERATING SWAT WEB APPLICATION SOURCE"
 	@echo "****************************************************************************"
-
-###################################################################################
-# INSTALL TARGETS (for developer use only)
-###################################################################################
-
-install:	
-	@echo "****************************************************************************"
-	@echo "  INSTALLING SWAT"
-	@echo "****************************************************************************"
-	@echo "  * Installing swat files..."
-	@rsync -av --exclude=crystalsvg --delete build/ $(LOCALINSTALLDIR)