r20519: Web Application Framework

- No path given to web server means use old scripts (missed check-in)

- Build Web Application (qooxdoo stuff) from autogen.sh since python isn't
  available or is differently-configured on various build-farm machines

- Don't continually check in generated files

- Properly identify SWAT "Statistics" module as "Status and Statistics"
(This used to be commit 9d89b7663af218ee6ed941ac6c0597fab93cd03b)

23 files changed, 18 insertions, 16 deletions

diff --git a/source4/autogen.sh b/source4/autogen.sh
index a88e5577c4..8d842a9cb5 100755
--- a/source4/autogen.sh
+++ b/source4/autogen.sh
@@ -63,6 +63,9 @@ $AUTOCONF $IPATHS || exit 1
 
 rm -rf autom4te*.cache
 
+echo "$0: building Web Application Framework (SWAT)"
+make -C ../webapps/swat distclean build || exit 1
+
 echo "Now run ./configure and then make."
 exit 0
 
diff --git a/source4/script/installwebapps.sh b/source4/script/installwebapps.sh
index c763d6b089..25a43dba24 100644
--- a/source4/script/installwebapps.sh
+++ b/source4/script/installwebapps.sh
@@ -6,7 +6,9 @@ SRCDIR=$2
 echo Installing web application files in $WEBAPPSDIR
 
 cd $SRCDIR/../webapps/swat || exit 1
-make build || exit 1
+
+# building the web application framework is now done by autogen.sh
+#make build || exit 1
 
 mkdir -p $WEBAPPSDIR || exit 1
 
@@ -21,26 +23,23 @@ installdir() {
 }
 
 # install our web application
-cd build
+cd build || exit 1
 installdir `find . -type f -print`
-cd ..
-
-# install all .esp files (there are none in the webapp build dir)
-installdir `find . -name '*.esp'`
 
-# install .js and .esp files from the scripting dir
-cd ..
+# install files from the 'scripting', 'style' and 'images' directories
+cd ../.. || exit 1
 installdir `find scripting -name '*.js'`
 installdir `find scripting -name '*.esp'`
-
-# install .css files from the style dir
 installdir `find style -name '*.css'`
+installdir `find images -name '*.png'`
+installdir `find images -name '*.gif'`
+installdir `find images -name '*.ico'`
 
-# install files from the images dir
-installdir `find images -type f -print`
+# install the old installation scripts, since there's no replacement yet
+installdir `find install -name '*.esp'`
 
-# install the login script, for authentication of static pages
-installdir `find . -name 'login.esp'`
+# install top-level scripts
+installdir index.esp login.esp logout.esp menu.js
 
 cat << EOF
 ======================================================================
diff --git a/source4/web_server/http.c b/source4/web_server/http.c
index 83bc38dbc0..3e89f084b3 100644
--- a/source4/web_server/http.c
+++ b/source4/web_server/http.c
@@ -126,7 +126,7 @@ static const char *http_local_path(struct websrv_context *web,
 	if (path == NULL) return NULL;
 
 	if (directory_exist(path)) {
-		path = talloc_asprintf_append(path, "/index.html");
+		path = talloc_asprintf_append(path, "/index.esp");
 	}
 	return path;
 }
diff --git a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/api.pyc b/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/api.pyc
deleted file mode 100644
index 2bb39fc2cd..0000000000
--- a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/api.pyc
+++ /dev/null
diff --git a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/comment.pyc b/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/comment.pyc
deleted file mode 100644
index 6d2ef53cb6..0000000000
--- a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/comment.pyc
+++ /dev/null
diff --git a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/compiler.pyc b/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/compiler.pyc
deleted file mode 100644
index 371a29bc06..0000000000
--- a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/compiler.pyc
+++ /dev/null
diff --git a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/config.pyc b/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/config.pyc
deleted file mode 100644
index 44a5131104..0000000000
--- a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/config.pyc
+++ /dev/null
diff --git a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/filetool.pyc b/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/filetool.pyc
deleted file mode 100644
index 3d4a983e3c..0000000000
--- a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/filetool.pyc
+++ /dev/null
diff --git a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/loader.pyc b/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/loader.pyc
deleted file mode 100644
index 51d49a8ad2..0000000000
--- a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/loader.pyc
+++ /dev/null
diff --git a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/mapper.pyc b/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/mapper.pyc
deleted file mode 100644
index 93f461bc8e..0000000000
--- a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/mapper.pyc
+++ /dev/null
diff --git a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/migrator.pyc b/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/migrator.pyc
deleted file mode 100644
index 78885cb200..0000000000
--- a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/migrator.pyc
+++ /dev/null
diff --git a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/obfuscator.pyc b/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/obfuscator.pyc
deleted file mode 100644
index 5de4c4c0c9..0000000000
--- a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/obfuscator.pyc
+++ /dev/null
diff --git a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/optparseext.pyc b/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/optparseext.pyc
deleted file mode 100644
index 7f63b3058c..0000000000
--- a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/optparseext.pyc
+++ /dev/null
diff --git a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/resources.pyc b/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/resources.pyc
deleted file mode 100644
index 4c08b8e634..0000000000
--- a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/resources.pyc
+++ /dev/null
diff --git a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/settings.pyc b/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/settings.pyc
deleted file mode 100644
index e6cbe3d3ae..0000000000
--- a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/settings.pyc
+++ /dev/null
diff --git a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/stringoptimizer.pyc b/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/stringoptimizer.pyc
deleted file mode 100644
index 57ada1ceb7..0000000000
--- a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/stringoptimizer.pyc
+++ /dev/null
diff --git a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/textile.pyc b/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/textile.pyc
deleted file mode 100644
index baba6254d3..0000000000
--- a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/textile.pyc
+++ /dev/null
diff --git a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/textutil.pyc b/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/textutil.pyc
deleted file mode 100644
index 7df9a3c20a..0000000000
--- a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/textutil.pyc
+++ /dev/null
diff --git a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/tokenizer.pyc b/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/tokenizer.pyc
deleted file mode 100644
index b4b81bd063..0000000000
--- a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/tokenizer.pyc
+++ /dev/null
diff --git a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/tree.pyc b/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/tree.pyc
deleted file mode 100644
index 888c97c5e2..0000000000
--- a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/tree.pyc
+++ /dev/null
diff --git a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/treegenerator.pyc b/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/treegenerator.pyc
deleted file mode 100644
index 6e142ea91e..0000000000
--- a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/treegenerator.pyc
+++ /dev/null
diff --git a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/variableoptimizer.pyc b/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/variableoptimizer.pyc
deleted file mode 100644
index 5e31ca7bc0..0000000000
--- a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/variableoptimizer.pyc
+++ /dev/null
diff --git a/webapps/swat/source/class/swat/main/Main.js b/webapps/swat/source/class/swat/main/Main.js
index dc3bbc031e..d8cfaac139 100644
--- a/webapps/swat/source/class/swat/main/Main.js
+++ b/webapps/swat/source/class/swat/main/Main.js
@@ -26,7 +26,7 @@ function()
  */
 
 //#require(swat.module.statistics.Statistics)
-new swat.module.Module("Statistics",
+new swat.module.Module("Status and Statistics",
                        swat.module.statistics.Statistics);
 
 //#require(swat.module.ldbbrowse.LdbBrowse)