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)

diff --git a/source4/autogen.sh b/source4/autogen.sh
index a88e5577c4d1129d183df5f761830db5803774d9..8d842a9cb5c9ff9b7e73ba4c0d2f3edafe2224e0 100755 (executable)
--- 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 c763d6b0891a21aa5c79a343cff5bf0847864c32..25a43dba2472c4498794164fcbf4391a9a7d672f 100644 (file)
--- 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 83bc38dbc01a179251f62e8ef6352e5c80995140..3e89f084b30dbae173dba59b81094c9c6db93e87 100644 (file)
--- 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 (file)
index 2bb39fc..0000000
Binary files a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/api.pyc and /dev/null differ

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 (file)
index 6d2ef53..0000000
Binary files a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/comment.pyc and /dev/null differ

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 (file)
index 371a29b..0000000
Binary files a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/compiler.pyc and /dev/null differ

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 (file)
index 44a5131..0000000
Binary files a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/config.pyc and /dev/null differ

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 (file)
index 3d4a983..0000000
Binary files a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/filetool.pyc and /dev/null differ

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 (file)
index 51d49a8..0000000
Binary files a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/loader.pyc and /dev/null differ

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 (file)
index 93f461b..0000000
Binary files a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/mapper.pyc and /dev/null differ

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 (file)
index 78885cb..0000000
Binary files a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/migrator.pyc and /dev/null differ

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 (file)
index 5de4c4c..0000000
Binary files a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/obfuscator.pyc and /dev/null differ

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 (file)
index 7f63b30..0000000
Binary files a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/optparseext.pyc and /dev/null differ

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 (file)
index 4c08b8e..0000000
Binary files a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/resources.pyc and /dev/null differ

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 (file)
index e6cbe3d..0000000
Binary files a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/settings.pyc and /dev/null differ

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 (file)
index 57ada1c..0000000
Binary files a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/stringoptimizer.pyc and /dev/null differ

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 (file)
index baba625..0000000
Binary files a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/textile.pyc and /dev/null differ

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 (file)
index 7df9a3c..0000000
Binary files a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/textutil.pyc and /dev/null differ

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 (file)
index b4b81bd..0000000
Binary files a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/tokenizer.pyc and /dev/null differ

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 (file)
index 888c97c..0000000
Binary files a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/tree.pyc and /dev/null differ

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 (file)
index 6e142ea..0000000
Binary files a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/treegenerator.pyc and /dev/null differ

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 (file)
index 5e31ca7..0000000
Binary files a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/tool/modules/variableoptimizer.pyc and /dev/null differ

diff --git a/webapps/swat/source/class/swat/main/Main.js b/webapps/swat/source/class/swat/main/Main.js
index dc3bbc031e73969294b3f7c028bd9f8928e12e85..d8cfaac139dfadad025a6a54b265d59b352eba22 100644 (file)
--- 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)