Changeset 879 for trunk/autoquest-htmlmonitor/src/main/java/de/ugoe

Timestamp:

10/15/12 14:53:44 (12 years ago)

Author:

pharms

Message:

• changed implementation so that java script is served by server itself and that it determines the servers location through its own URL

Location:

trunk/autoquest-htmlmonitor

Files:

• . (modified) (1 prop)
• src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorServer.java (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorServlet.java (modified) (5 diffs)

trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorServer.java

@@ -9 +9 @@
 /**
  * <p>
- * this is the web server, that receives the client messages. It is initialized with a port on
- * which it shall listen, as well as a message listener to forward the received messages to.
- * Internally it starts a jetty web server with a single {@link HtmlMonitorServlet} to receive
- * the messages.
+ * this is the web server, that receives the client messages. It also provides the java script
+ * that is used by the client via the URL /script/autoquest-htmlmonitor.js. It is initialized
+ * with a port on which it shall listen, as well as a message listener to forward the received
+ * messages to. Internally it starts a jetty web server with a single {@link HtmlMonitorServlet}
+ * to receive the messages as well as a .
  * </p>
  * 

trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorServlet.java

@@ -1 +1 @@
 package de.ugoe.cs.autoquest.htmlmonitor;
 
+import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.PrintWriter;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -24 +27 @@
 /**
  * <p>
- * the servlet deployed in the web server that receives all client messages. The messages are
- * parsed, validated, and forwarded to the provided message listener. If a message is not valid,
- * it is discarded. If an event in a message is not valid, it is discarded. Messages are only
- * received via the POST HTTP method.
+ * the servlet deployed in the web server that receives all client messages and returns the client
+ * java script. The messages are parsed, validated, and forwarded to the provided message listener.
+ * If a message is not valid, it is discarded. If an event in a message is not valid, it is
+ * discarded. Messages are only received via the POST HTTP method. The GET HTTP method is only
+ * implemented for returning the client java script.
  * </p>
  * 
@@ -37 +41 @@
     private static final long serialVersionUID = 1L;
     
+    /**  */
+    private static final boolean DO_TRACE = false;
+    
     /**
      * the message listener to forward received messages to.
@@ -51 +58 @@
     HtmlMonitorServlet(HtmlMonitorMessageListener messageListener) {
         this.messageListener = messageListener;
+    }
+
+    /* (non-Javadoc)
+     * @see org.mortbay.jetty.servlet.DefaultServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+     */
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
+        throws ServletException, IOException
+    {
+        if ((request.getPathInfo() != null) &&
+            (request.getPathInfo().endsWith("/script/autoquest-htmlmonitor.js")))
+        {
+            InputStream script = null;
+            
+            try {
+                script = this.getClass().getClassLoader().getResourceAsStream
+                     ("autoquest-htmlmonitor.js");
+            
+                if (script == null) {
+                    Console.printerrln("could not read autoquest-htmlmonitor.js from classpath");
+                }
+                else {
+                    BufferedReader reader = new BufferedReader(new InputStreamReader(script));
+                    PrintWriter output = response.getWriter();
+                    String line;
+                    
+                    while ((line = reader.readLine()) != null) {
+                        output.println(line);
+                    }
+                    
+                    output.close();
+                }
+            }
+            catch (Exception e) {
+                Console.printerrln("could not read autoquest-htmlmonitor.js from classpath: " + e);
+                Console.logException(e);
+            }
+            finally {
+                if (script != null) {
+                    script.close();
+                }
+            }
+        }
     }
 
@@ -87 +137 @@
      */
     private void handleJSONObject(JSONObject object) {
-        dumpJSONObject(object, "");
+        if (DO_TRACE) {
+            dumpJSONObject(object, "");
+        }
         
         JSONObject message = assertValue(object, "message", JSONObject.class);