Changeset 1351

Timestamp:

01/31/14 11:48:49 (10 years ago)

Author:

pharms

Message:

• update to newer Jetty version

Location:

trunk/autoquest-htmlmonitor

Files:

• pom.xml (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorServer.java (modified) (3 diffs)
• src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorServlet.java (modified) (1 diff)

trunk/autoquest-htmlmonitor/pom.xml

@@ -43 +43 @@
         </dependency>
         <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty</artifactId>
-            <version>6.1.22</version>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
+            <version>9.1.0.M0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-servlet</artifactId>
+            <version>9.1.0.M0</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-servlets</artifactId>
-            <version>8.1.7.v20120910</version>
+            <version>9.1.0.M0</version>
         </dependency>
         <dependency>

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

@@ -15 +15 @@
 package de.ugoe.cs.autoquest.htmlmonitor;
 
+import java.util.EnumSet;
+
+import javax.servlet.DispatcherType;
+
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.servlet.FilterHolder;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jetty.servlets.CrossOriginFilter;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.servlet.Context;
-import org.mortbay.jetty.servlet.FilterHolder;
-import org.mortbay.jetty.servlet.ServletHolder;
 
 import de.ugoe.cs.util.console.Console;
@@ -90 +93 @@
         server.addConnector(connector);*/
 
-        Context root = new Context(server, "/", Context.SESSIONS);
+        ServletContextHandler root = new ServletContextHandler(server, "/", ServletContextHandler.SESSIONS);
 
         HtmlMonitorServlet servlet = new HtmlMonitorServlet(messageListener);
@@ -100 +103 @@
         filterHolder.setInitParameter("allowedOrigins", "*");
         filterHolder.setInitParameter("allowedMethods", "GET,POST");
-        root.addFilter(filterHolder, "/*", Handler.ALL);
+        root.addFilter(filterHolder, "/*", EnumSet.allOf(DispatcherType.class));
     }
 

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

@@ -33 +33 @@
 import javax.servlet.http.HttpServletResponse;
 
+import org.eclipse.jetty.servlet.DefaultServlet;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.JSONValue;
 import org.json.simple.parser.ParseException;
-import org.mortbay.jetty.servlet.DefaultServlet;
 
 import de.ugoe.cs.util.FileTools;