Upgrade to servlet 3.0, jetty 9, and java 7

This patch upgrades spark to Servlet 3.0 and Jetty 9, and Java 7. Issue: 43
perwendel · Mar 12, 2013 · 96b5af6 · 96b5af6
1 parent 4ae2a19
commit 96b5af6
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -29,7 +29,7 @@
         </developers>
 
 	<properties>
-		<jetty.version>8.1.9.v20130131</jetty.version>
+		<jetty.version>9.0.0.v20130308</jetty.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
@@ -49,7 +49,13 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.eclipse.jetty.aggregate</groupId>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-server</artifactId>
+			<version>${jetty.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-webapp</artifactId>
 			<version>${jetty.version}</version>
 		</dependency>
@@ -95,12 +101,22 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.3.2</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.7</source>
+					<target>1.7</target>
 					<optimize>true</optimize>
 					<debug>true</debug>
 				</configuration>
 			</plugin>
+			<plugin>
+				<inherited>true</inherited>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.14</version>
+				<configuration>
+					<forkCount>1</forkCount>
+					<reuseForks>false</reuseForks>
+				</configuration>
+			</plugin>
 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>

diff --git a/src/main/java/spark/webserver/SparkServerImpl.java b/src/main/java/spark/webserver/SparkServerImpl.java
@@ -19,7 +19,7 @@
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.bio.SocketConnector;
+import org.eclipse.jetty.server.ServerConnector;
 
 /**
  * Spark server implementation
@@ -57,10 +57,11 @@ public void ignite(String host) {
 
     @Override
     public void ignite(String host, int port) {
-        SocketConnector connector = new SocketConnector();
+    	Server server = new Server();
+        ServerConnector connector = new ServerConnector(server);
 
         // Set some timeout options to make debugging easier.
-        connector.setMaxIdleTime(1000 * 60 * 60);
+        connector.setIdleTimeout(1000 * 60 * 60);
         connector.setSoLingerTime(-1);
         connector.setHost(host);
         connector.setPort(port);

diff --git a/src/test/java/spark/servlet/ServletTest.java b/src/test/java/spark/servlet/ServletTest.java
@@ -9,7 +9,7 @@
 
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.bio.SocketConnector;
+import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.webapp.WebAppContext;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -37,10 +37,11 @@ public static void tearDown() {
     public static void setup() {
 		testUtil = new SparkTestUtil(PORT);
 
-		SocketConnector connector = new SocketConnector();
+		final Server server = new Server();
+        ServerConnector connector = new ServerConnector(server);
 
 		// Set some timeout options to make debugging easier.
-		connector.setMaxIdleTime(1000 * 60 * 60);
+		connector.setIdleTimeout(1000 * 60 * 60);
 		connector.setSoLingerTime(-1);
 		connector.setPort(PORT);
 		server.setConnectors(new Connector[] { connector });