From e21f64ab09c3e522a5443b4d444f066cca49bf2e Mon Sep 17 00:00:00 2001 From: bjorn Date: Wed, 22 Oct 2008 09:36:05 +0000 Subject: [PATCH] Reorganize GWT stuff into a reusable module and one application module. --- src/server/Makefile | 7 +++++-- src/server/gwt-client/Translate-compile | 2 +- src/server/gwt-client/Translate-shell | 2 +- src/server/gwt-client/Translate-shell-external | 2 +- .../src/se/chalmers/cs/gf/gwt/Translate.gwt.xml | 8 ++++++++ .../TranslateApp.gwt.xml} | 16 ++++++++-------- .../client/CompletionOracle.java | 2 +- .../cs/gf/{gwt_translate => gwt}/client/GF.java | 2 +- .../{gwt_translate => gwt}/client/GFRequest.java | 2 +- .../client/TranslateApp.java} | 4 ++-- .../{gwt_translate => gwt}/public/Translate.css | 0 .../{gwt_translate => gwt}/public/Translate.html | 2 +- 12 files changed, 30 insertions(+), 19 deletions(-) create mode 100644 src/server/gwt-client/src/se/chalmers/cs/gf/gwt/Translate.gwt.xml rename src/server/gwt-client/src/se/chalmers/cs/gf/{gwt_translate/Translate.gwt.xml => gwt/TranslateApp.gwt.xml} (53%) rename src/server/gwt-client/src/se/chalmers/cs/gf/{gwt_translate => gwt}/client/CompletionOracle.java (97%) rename src/server/gwt-client/src/se/chalmers/cs/gf/{gwt_translate => gwt}/client/GF.java (99%) rename src/server/gwt-client/src/se/chalmers/cs/gf/{gwt_translate => gwt}/client/GFRequest.java (84%) rename src/server/gwt-client/src/se/chalmers/cs/gf/{gwt_translate/client/Translate.java => gwt/client/TranslateApp.java} (98%) rename src/server/gwt-client/src/se/chalmers/cs/gf/{gwt_translate => gwt}/public/Translate.css (100%) rename src/server/gwt-client/src/se/chalmers/cs/gf/{gwt_translate => gwt}/public/Translate.html (96%) diff --git a/src/server/Makefile b/src/server/Makefile index 76f1d1ab8..4ccf57182 100644 --- a/src/server/Makefile +++ b/src/server/Makefile @@ -1,6 +1,6 @@ GFCFLAGS = +RTS -K100M -RTS --cpu -.PHONY: pgf.fcgi run +.PHONY: pgf.fcgi run gf-gwt.jar pgf.fcgi: cabal install @@ -35,7 +35,7 @@ test.pgf: LangEng-parse.pgf LangGer-parse.pgf run: pgf.fcgi @echo '*********************************************' - @echo 'See http://localhost:41296/gwt-client/www/se.chalmers.cs.gf.gwt_translate.Translate/Translate.html' + @echo 'See http://localhost:41296/gwt-client/www/se.chalmers.cs.gf.gwt.TranslateApp/Translate.html' @echo '*********************************************' lighttpd -f lighttpd.conf -D @@ -47,6 +47,9 @@ gwt-installball: pgf.fcgi gwt mv tmp/gwt-client/Translate.html tmp/gwt-client/index.html (cd tmp && tar -zcf ../gwt-client-installball.tar.gz gwt-client) +gf-gwt.jar: + jar -cf $@ -C gwt-client/src se + clean: cabal clean -rm -f pgf.fcgi \ No newline at end of file diff --git a/src/server/gwt-client/Translate-compile b/src/server/gwt-client/Translate-compile index d98e10016..1601fd40e 100644 --- a/src/server/gwt-client/Translate-compile +++ b/src/server/gwt-client/Translate-compile @@ -1,3 +1,3 @@ #!/bin/sh APPDIR=`dirname $0`; -java -XstartOnFirstThread -Xmx256M -cp "$APPDIR/src:$APPDIR/bin:/Users/bringert/src/gwt-mac-1.5.2/gwt-user.jar:/Users/bringert/src/gwt-mac-1.5.2/gwt-dev-mac.jar" com.google.gwt.dev.GWTCompiler -out "$APPDIR/www" "$@" se.chalmers.cs.gf.gwt_translate.Translate; +java -XstartOnFirstThread -Xmx256M -cp "$APPDIR/src:$APPDIR/bin:/Users/bringert/src/gwt-mac-1.5.2/gwt-user.jar:/Users/bringert/src/gwt-mac-1.5.2/gwt-dev-mac.jar" com.google.gwt.dev.GWTCompiler -out "$APPDIR/www" "$@" se.chalmers.cs.gf.gwt.TranslateApp; diff --git a/src/server/gwt-client/Translate-shell b/src/server/gwt-client/Translate-shell index 668700d52..e9761c769 100644 --- a/src/server/gwt-client/Translate-shell +++ b/src/server/gwt-client/Translate-shell @@ -1,3 +1,3 @@ #!/bin/sh APPDIR=`dirname $0`; -java -XstartOnFirstThread -Xmx256M -cp "$APPDIR/src:$APPDIR/bin:/Users/bringert/src/gwt-mac-1.5.2/gwt-user.jar:/Users/bringert/src/gwt-mac-1.5.2/gwt-dev-mac.jar" com.google.gwt.dev.GWTShell -out "$APPDIR/www" "$@" se.chalmers.cs.gf.gwt_translate.Translate/Translate.html; +java -XstartOnFirstThread -Xmx256M -cp "$APPDIR/src:$APPDIR/bin:/Users/bringert/src/gwt-mac-1.5.2/gwt-user.jar:/Users/bringert/src/gwt-mac-1.5.2/gwt-dev-mac.jar" com.google.gwt.dev.GWTShell -out "$APPDIR/www" "$@" se.chalmers.cs.gf.gwt.TranslateApp/Translate.html; diff --git a/src/server/gwt-client/Translate-shell-external b/src/server/gwt-client/Translate-shell-external index e97c13d1d..ec1910dc2 100644 --- a/src/server/gwt-client/Translate-shell-external +++ b/src/server/gwt-client/Translate-shell-external @@ -1,3 +1,3 @@ #!/bin/sh APPDIR=`dirname $0`; -java -XstartOnFirstThread -Xmx256M -cp "$APPDIR/src:$APPDIR/bin:/Users/bringert/src/gwt-mac-1.5.2/gwt-user.jar:/Users/bringert/src/gwt-mac-1.5.2/gwt-dev-mac.jar" com.google.gwt.dev.GWTShell -out "$APPDIR/www" -noserver "$@" http://localhost:41296/gwt-client/www/se.chalmers.cs.gf.gwt_translate.Translate/Translate.html; +java -XstartOnFirstThread -Xmx256M -cp "$APPDIR/src:$APPDIR/bin:/Users/bringert/src/gwt-mac-1.5.2/gwt-user.jar:/Users/bringert/src/gwt-mac-1.5.2/gwt-dev-mac.jar" com.google.gwt.dev.GWTShell -out "$APPDIR/www" -noserver "$@" http://localhost:41296/gwt-client/www/se.chalmers.cs.gf.gwt.TranslateApp/Translate.html; diff --git a/src/server/gwt-client/src/se/chalmers/cs/gf/gwt/Translate.gwt.xml b/src/server/gwt-client/src/se/chalmers/cs/gf/gwt/Translate.gwt.xml new file mode 100644 index 000000000..959f16040 --- /dev/null +++ b/src/server/gwt-client/src/se/chalmers/cs/gf/gwt/Translate.gwt.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/server/gwt-client/src/se/chalmers/cs/gf/gwt_translate/Translate.gwt.xml b/src/server/gwt-client/src/se/chalmers/cs/gf/gwt/TranslateApp.gwt.xml similarity index 53% rename from src/server/gwt-client/src/se/chalmers/cs/gf/gwt_translate/Translate.gwt.xml rename to src/server/gwt-client/src/se/chalmers/cs/gf/gwt/TranslateApp.gwt.xml index 49b229a66..717629e74 100644 --- a/src/server/gwt-client/src/se/chalmers/cs/gf/gwt_translate/Translate.gwt.xml +++ b/src/server/gwt-client/src/se/chalmers/cs/gf/gwt/TranslateApp.gwt.xml @@ -1,24 +1,24 @@ - - - + + + - - - + + + - + - + diff --git a/src/server/gwt-client/src/se/chalmers/cs/gf/gwt_translate/client/CompletionOracle.java b/src/server/gwt-client/src/se/chalmers/cs/gf/gwt/client/CompletionOracle.java similarity index 97% rename from src/server/gwt-client/src/se/chalmers/cs/gf/gwt_translate/client/CompletionOracle.java rename to src/server/gwt-client/src/se/chalmers/cs/gf/gwt/client/CompletionOracle.java index 5df8f1413..6fc8a930a 100644 --- a/src/server/gwt-client/src/se/chalmers/cs/gf/gwt_translate/client/CompletionOracle.java +++ b/src/server/gwt-client/src/se/chalmers/cs/gf/gwt/client/CompletionOracle.java @@ -1,4 +1,4 @@ -package se.chalmers.cs.gf.gwt_translate.client; +package se.chalmers.cs.gf.gwt.client; import com.google.gwt.user.client.ui.SuggestOracle; diff --git a/src/server/gwt-client/src/se/chalmers/cs/gf/gwt_translate/client/GF.java b/src/server/gwt-client/src/se/chalmers/cs/gf/gwt/client/GF.java similarity index 99% rename from src/server/gwt-client/src/se/chalmers/cs/gf/gwt_translate/client/GF.java rename to src/server/gwt-client/src/se/chalmers/cs/gf/gwt/client/GF.java index 74f38219c..a8533406e 100644 --- a/src/server/gwt-client/src/se/chalmers/cs/gf/gwt_translate/client/GF.java +++ b/src/server/gwt-client/src/se/chalmers/cs/gf/gwt/client/GF.java @@ -1,4 +1,4 @@ -package se.chalmers.cs.gf.gwt_translate.client; +package se.chalmers.cs.gf.gwt.client; import com.google.gwt.http.client.*; import com.google.gwt.core.client.GWT; diff --git a/src/server/gwt-client/src/se/chalmers/cs/gf/gwt_translate/client/GFRequest.java b/src/server/gwt-client/src/se/chalmers/cs/gf/gwt/client/GFRequest.java similarity index 84% rename from src/server/gwt-client/src/se/chalmers/cs/gf/gwt_translate/client/GFRequest.java rename to src/server/gwt-client/src/se/chalmers/cs/gf/gwt/client/GFRequest.java index 1f2d32086..de30f803a 100644 --- a/src/server/gwt-client/src/se/chalmers/cs/gf/gwt_translate/client/GFRequest.java +++ b/src/server/gwt-client/src/se/chalmers/cs/gf/gwt/client/GFRequest.java @@ -1,4 +1,4 @@ -package se.chalmers.cs.gf.gwt_translate.client; +package se.chalmers.cs.gf.gwt.client; import com.google.gwt.http.client.*; diff --git a/src/server/gwt-client/src/se/chalmers/cs/gf/gwt_translate/client/Translate.java b/src/server/gwt-client/src/se/chalmers/cs/gf/gwt/client/TranslateApp.java similarity index 98% rename from src/server/gwt-client/src/se/chalmers/cs/gf/gwt_translate/client/Translate.java rename to src/server/gwt-client/src/se/chalmers/cs/gf/gwt/client/TranslateApp.java index a27b7ba75..d96db4365 100644 --- a/src/server/gwt-client/src/se/chalmers/cs/gf/gwt_translate/client/Translate.java +++ b/src/server/gwt-client/src/se/chalmers/cs/gf/gwt/client/TranslateApp.java @@ -1,4 +1,4 @@ -package se.chalmers.cs.gf.gwt_translate.client; +package se.chalmers.cs.gf.gwt.client; import com.google.gwt.core.client.EntryPoint; import com.google.gwt.user.client.ui.Button; @@ -28,7 +28,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -public class Translate implements EntryPoint { +public class TranslateApp implements EntryPoint { private static final String gfBaseURL = "/pgf"; private static final String pgfName = "grammar.pgf"; diff --git a/src/server/gwt-client/src/se/chalmers/cs/gf/gwt_translate/public/Translate.css b/src/server/gwt-client/src/se/chalmers/cs/gf/gwt/public/Translate.css similarity index 100% rename from src/server/gwt-client/src/se/chalmers/cs/gf/gwt_translate/public/Translate.css rename to src/server/gwt-client/src/se/chalmers/cs/gf/gwt/public/Translate.css diff --git a/src/server/gwt-client/src/se/chalmers/cs/gf/gwt_translate/public/Translate.html b/src/server/gwt-client/src/se/chalmers/cs/gf/gwt/public/Translate.html similarity index 96% rename from src/server/gwt-client/src/se/chalmers/cs/gf/gwt_translate/public/Translate.html rename to src/server/gwt-client/src/se/chalmers/cs/gf/gwt/public/Translate.html index d9bd6cef9..f3fc1da8c 100644 --- a/src/server/gwt-client/src/se/chalmers/cs/gf/gwt_translate/public/Translate.html +++ b/src/server/gwt-client/src/se/chalmers/cs/gf/gwt/public/Translate.html @@ -19,7 +19,7 @@ - +