From 1203d31d77642cdeb0f44ae18c22afe41fb11703 Mon Sep 17 00:00:00 2001 From: bjorn Date: Thu, 20 Nov 2008 14:06:06 +0000 Subject: [PATCH] gwt: rearragne html files and paths to get nicer URLs. --- src/server/README | 4 ++-- src/server/gwt/Fridge-compile | 2 +- src/server/gwt/Fridge-shell-external | 2 +- src/server/gwt/FridgeApp.launch | 2 +- src/server/gwt/Translate-compile | 2 +- src/server/gwt/Translate-shell-external | 2 +- src/server/gwt/TranslateApp.launch | 2 +- .../public/Fridge.html => www/fridge/index.html} | 2 +- .../Translate.html => www/translate/index.html} | 2 +- src/server/lighttpd.conf | 15 ++++++++------- 10 files changed, 18 insertions(+), 17 deletions(-) rename src/server/gwt/{src/se/chalmers/cs/gf/gwt/public/Fridge.html => www/fridge/index.html} (94%) rename src/server/gwt/{src/se/chalmers/cs/gf/gwt/public/Translate.html => www/translate/index.html} (94%) diff --git a/src/server/README b/src/server/README index 5dcbcf720..a3247c78d 100644 --- a/src/server/README +++ b/src/server/README @@ -49,11 +49,11 @@ - GWT translator: $ make gwt-translate - Then see http://localhost:41296/gwt/www/se.chalmers.cs.gf.gwt.TranslateApp/Translate.html + Then see http://localhost:41296/translate/ - GWT fridge poetry: $ make gwt-fridge - Then see http://localhost:41296/gwt/www/se.chalmers.cs.gf.gwt.FridgeApp/Fridge.html + Then see http://localhost:41296/fridge/ diff --git a/src/server/gwt/Fridge-compile b/src/server/gwt/Fridge-compile index 7e9af5d2c..89a7f5fb9 100644 --- a/src/server/gwt/Fridge-compile +++ b/src/server/gwt/Fridge-compile @@ -16,4 +16,4 @@ fi LIBS=$APPDIR/lib/gwt-dnd-2.5.6.jar -java $GWT_JAVA_OPTS -Xmx256M -cp "$APPDIR/src:$APPDIR/bin:$LIBS:$GWT_CLASSPATH" com.google.gwt.dev.GWTCompiler -out "$APPDIR/www" "$@" se.chalmers.cs.gf.gwt.FridgeApp; +java $GWT_JAVA_OPTS -Xmx256M -cp "$APPDIR/src:$APPDIR/bin:$LIBS:$GWT_CLASSPATH" com.google.gwt.dev.GWTCompiler -out "$APPDIR/www/fridge" "$@" se.chalmers.cs.gf.gwt.FridgeApp; diff --git a/src/server/gwt/Fridge-shell-external b/src/server/gwt/Fridge-shell-external index 5434038b9..1209047ed 100644 --- a/src/server/gwt/Fridge-shell-external +++ b/src/server/gwt/Fridge-shell-external @@ -16,4 +16,4 @@ fi LIBS=$APPDIR/lib/gwt-dnd-2.5.6.jar -java $GWT_JAVA_OPTS -Xmx256M -cp "$APPDIR/src:$APPDIR/bin:$LIBS:$GWT_CLASSPATH" com.google.gwt.dev.GWTShell -out "$APPDIR/www" -noserver "$@" http://localhost:41296/gwt/www/se.chalmers.cs.gf.gwt.FridgeApp/Fridge.html; +java $GWT_JAVA_OPTS -Xmx256M -cp "$APPDIR/src:$APPDIR/bin:$LIBS:$GWT_CLASSPATH" com.google.gwt.dev.GWTShell -out "$APPDIR/www" -noserver "$@" http://localhost:41296/fridge/; diff --git a/src/server/gwt/FridgeApp.launch b/src/server/gwt/FridgeApp.launch index 69acf02d0..dc0d1fe68 100644 --- a/src/server/gwt/FridgeApp.launch +++ b/src/server/gwt/FridgeApp.launch @@ -15,7 +15,7 @@ - + diff --git a/src/server/gwt/Translate-compile b/src/server/gwt/Translate-compile index 3feec0315..42c02da33 100644 --- a/src/server/gwt/Translate-compile +++ b/src/server/gwt/Translate-compile @@ -16,4 +16,4 @@ fi LIBS=$APPDIR/lib/gwt-dnd-2.5.6.jar -java $GWT_JAVA_OPTS -Xmx256M -cp "$APPDIR/src:$APPDIR/bin:$LIBS:$GWT_CLASSPATH" com.google.gwt.dev.GWTCompiler -out "$APPDIR/www" "$@" se.chalmers.cs.gf.gwt.TranslateApp; +java $GWT_JAVA_OPTS -Xmx256M -cp "$APPDIR/src:$APPDIR/bin:$LIBS:$GWT_CLASSPATH" com.google.gwt.dev.GWTCompiler -out "$APPDIR/www/translate" "$@" se.chalmers.cs.gf.gwt.TranslateApp; diff --git a/src/server/gwt/Translate-shell-external b/src/server/gwt/Translate-shell-external index fc2688bd4..b1e58f019 100644 --- a/src/server/gwt/Translate-shell-external +++ b/src/server/gwt/Translate-shell-external @@ -16,4 +16,4 @@ fi LIBS=$APPDIR/lib/gwt-dnd-2.5.6.jar -java $GWT_JAVA_OPTS -Xmx256M -cp "$APPDIR/src:$APPDIR/bin:$LIBS:$GWT_CLASSPATH" com.google.gwt.dev.GWTShell -out "$APPDIR/www" -noserver "$@" http://localhost:41296/gwt/www/se.chalmers.cs.gf.gwt.TranslateApp/Translate.html; +java $GWT_JAVA_OPTS -Xmx256M -cp "$APPDIR/src:$APPDIR/bin:$LIBS:$GWT_CLASSPATH" com.google.gwt.dev.GWTShell -out "$APPDIR/www" -noserver "$@" http://localhost:41296/translate/; diff --git a/src/server/gwt/TranslateApp.launch b/src/server/gwt/TranslateApp.launch index 8eff471c2..bde6c0643 100644 --- a/src/server/gwt/TranslateApp.launch +++ b/src/server/gwt/TranslateApp.launch @@ -15,7 +15,7 @@ - + diff --git a/src/server/gwt/src/se/chalmers/cs/gf/gwt/public/Fridge.html b/src/server/gwt/www/fridge/index.html similarity index 94% rename from src/server/gwt/src/se/chalmers/cs/gf/gwt/public/Fridge.html rename to src/server/gwt/www/fridge/index.html index 2686838f6..b530946d5 100644 --- a/src/server/gwt/src/se/chalmers/cs/gf/gwt/public/Fridge.html +++ b/src/server/gwt/www/fridge/index.html @@ -19,7 +19,7 @@ - + diff --git a/src/server/gwt/src/se/chalmers/cs/gf/gwt/public/Translate.html b/src/server/gwt/www/translate/index.html similarity index 94% rename from src/server/gwt/src/se/chalmers/cs/gf/gwt/public/Translate.html rename to src/server/gwt/www/translate/index.html index f3fc1da8c..8bad4c250 100644 --- a/src/server/gwt/src/se/chalmers/cs/gf/gwt/public/Translate.html +++ b/src/server/gwt/www/translate/index.html @@ -19,7 +19,7 @@ - + diff --git a/src/server/lighttpd.conf b/src/server/lighttpd.conf index 2ecdeabe5..d6f001afc 100644 --- a/src/server/lighttpd.conf +++ b/src/server/lighttpd.conf @@ -1,4 +1,4 @@ -#Run with (with -D for no-daemon) +# Run with (with -D for no-daemon) # /usr/sbin/lighttpd -f lighttpd.conf -D # @@ -10,14 +10,11 @@ server.modules = ( ) var.basedir = var.CWD -server.document-root = basedir +server.document-root = basedir + "/gwt/www" -## where to send error-messages to server.errorlog = basedir + "/error.log" -# files to check for if .../ is requested -index-file.names = ( "index.php", "index.html", - "index.htm", "default.htm" ) +index-file.names = ( "index.html" ) ## set the event-handler (read the performance section in the manual) # server.event-handler = "freebsd-kqueue" # needed on OS X # Crashes on osx @@ -40,8 +37,12 @@ mimetype.assign = ( accesslog.filename = basedir + "/access.log" +debug.log-request-header = "disable" +debug.log-response-header = "disable" +debug.log-request-handling = "disable" + $HTTP["host"] =~ "^(.*)$" { - url.redirect = ( "^/$" => "http://%1/gwt/www/se.chalmers.cs.gf.gwt.TranslateApp/Translate.html" ) + url.redirect = ( "^/$" => "http://%1/translate/" ) } fastcgi.debug = 0