java : vaadin : clean up ant tasks, support runnable jar

3 files changed, 11 insertions, 10 deletions

diff --git a/java/vaadin/src/main/resources/logback-test.xml b/java/vaadin/src/main/resources/logback-test.xml
index 4c53061..a8fcf4b 100644
--- a/java/vaadin/src/main/resources/logback-test.xml
+++ b/java/vaadin/src/main/resources/logback-test.xml
@@ -13,16 +13,9 @@
         </then>
     </if>
 
-    <if condition='isDefined("TEST_DB")'>
-        <then>
-            <property name="LOG_LEVEL" value="DEBUG" />
-            <property name="LOG_REF" value="FILE" />
-            <property name="LOG_FILE" value="./tests/logs" />
-        </then>
-    </if>
-
-    <if condition='isDefined("TEST_PDF")'>
+    <if condition='isDefined("TEST")'>
         <then>
+            <property name="LOG_FILE" value="/tmp/${app.name}.log" />
             <property name="LOG_LEVEL" value="DEBUG" />
             <property name="LOG_REF" value="STDOUT" />
         </then>
diff --git a/java/vaadin/src/run/java/ch/asynk/Main.java b/java/vaadin/src/run/java/ch/asynk/Main.java
index 5686ecc..faf1f72 100644
--- a/java/vaadin/src/run/java/ch/asynk/Main.java
+++ b/java/vaadin/src/run/java/ch/asynk/Main.java
@@ -6,6 +6,8 @@ public class Main
 {
     public static void main(String[] args) throws Exception
     {
-        new VaadinJettyServer(8080, HelloWorld.class, "./src/main/WebContent/").start();
+        String webRoot = System.getProperty("WEBROOT");
+        if (webRoot == null) webRoot = "./src/main/WebContent/";
+        new VaadinJettyServer(8080, HelloWorld.class, webRoot).start();
     }
 }
diff --git a/java/vaadin/src/run/resources/jetty-logging.properties b/java/vaadin/src/run/resources/jetty-logging.properties
new file mode 100644
index 0000000..71495db
--- /dev/null
+++ b/java/vaadin/src/run/resources/jetty-logging.properties
@@ -0,0 +1,6 @@
+# Configure for System.err output
+org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
+# Configure StdErrLog to log all jetty namespace at default of WARN or above
+org.eclipse.jetty.LEVEL=WARN
+# Configure StdErrLog to log websocket specific namespace at DEBUG or above
+org.eclipse.jetty.websocket.LEVEL=INFO