diff -Nru apache-curator-2.2.0-incubating/curator-x-discovery-server/pom.xml apache-curator-2.2.0-incubating-gil/curator-x-discovery-server/pom.xml
--- apache-curator-2.2.0-incubating/curator-x-discovery-server/pom.xml 2013-07-31 19:12:34.000000000 +0200
+++ apache-curator-2.2.0-incubating-gil/curator-x-discovery-server/pom.xml 2013-10-11 00:50:27.293103260 +0200
@@ -100,9 +100,16 @@
</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.0.3</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>9.0.3</version>
<scope>test</scope>
</dependency>
diff -Nru apache-curator-2.2.0-incubating/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestMapsWithJersey.java apache-curator-2.2.0-incubating-gil/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestMapsWithJersey.java
--- apache-curator-2.2.0-incubating/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestMapsWithJersey.java 2013-06-29 19:58:12.000000000 +0200
+++ apache-curator-2.2.0-incubating-gil/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestMapsWithJersey.java 2013-10-11 01:31:17.896361960 +0200
@@ -40,9 +40,9 @@
import org.apache.curator.x.discovery.server.entity.ServiceNames;
import org.apache.curator.x.discovery.server.mocks.MockServiceDiscovery;
import org.apache.curator.x.discovery.strategies.RandomStrategy;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.servlet.Context;
-import org.mortbay.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -93,7 +93,7 @@
port = InstanceSpec.getRandomPort();
server = new Server(port);
- Context root = new Context(server, "/", Context.SESSIONS);
+ ServletContextHandler root = new ServletContextHandler(server, "/", ServletContextHandler.SESSIONS);
root.addServlet(new ServletHolder(container), "/*");
server.start();
}
diff -Nru apache-curator-2.2.0-incubating/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestObjectPayloadWithJersey.java apache-curator-2.2.0-incubating-gil/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestObjectPayloadWithJersey.java
--- apache-curator-2.2.0-incubating/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestObjectPayloadWithJersey.java 2013-06-29 19:58:12.000000000 +0200
+++ apache-curator-2.2.0-incubating-gil/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestObjectPayloadWithJersey.java 2013-10-11 01:31:45.104703519 +0200
@@ -26,9 +26,9 @@
import junit.framework.Assert;
import org.apache.curator.test.InstanceSpec;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.servlet.Context;
-import org.mortbay.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
@@ -94,7 +94,7 @@
port = InstanceSpec.getRandomPort();
server = new Server(port);
- Context root = new Context(server, "/", Context.SESSIONS);
+ ServletContextHandler root = new ServletContextHandler(server, "/", ServletContextHandler.SESSIONS);
root.addServlet(new ServletHolder(container), "/*");
server.start();
}
diff -Nru apache-curator-2.2.0-incubating/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestStringsWithJersey.java apache-curator-2.2.0-incubating-gil/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestStringsWithJersey.java
--- apache-curator-2.2.0-incubating/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestStringsWithJersey.java 2013-06-29 19:58:12.000000000 +0200
+++ apache-curator-2.2.0-incubating-gil/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestStringsWithJersey.java 2013-10-11 01:03:11.767769021 +0200
@@ -39,9 +39,9 @@
import com.sun.jersey.api.core.DefaultResourceConfig;
import com.sun.jersey.spi.container.servlet.ServletContainer;
import junit.framework.Assert;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.servlet.Context;
-import org.mortbay.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -91,7 +91,7 @@
port = InstanceSpec.getRandomPort();
server = new Server(port);
- Context root = new Context(server, "/", Context.SESSIONS);
+ ServletContextHandler root = new ServletContextHandler(server, "/", ServletContextHandler.SESSIONS);
root.addServlet(new ServletHolder(container), "/*");
server.start();
}
diff -Nru apache-curator-2.2.0-incubating/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java apache-curator-2.2.0-incubating-gil/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java
--- apache-curator-2.2.0-incubating/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java 2013-06-29 19:58:12.000000000 +0200
+++ apache-curator-2.2.0-incubating-gil/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java 2013-10-11 01:04:35.885692654 +0200
@@ -30,9 +30,9 @@
import org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher;
import org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap;
import org.jboss.resteasy.spi.ResteasyProviderFactory;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.servlet.Context;
-import org.mortbay.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -64,7 +64,7 @@
port = InstanceSpec.getRandomPort();
server = new Server(port);
- Context root = new Context(server, "/", Context.SESSIONS);
+ ServletContextHandler root = new ServletContextHandler(server, "/", ServletContextHandler.SESSIONS);
root.getInitParams().put("javax.ws.rs.Application", RestEasyApplication.class.getName());
root.addServlet(new ServletHolder(dispatcher), "/*");
root.addEventListener(new ResteasyBootstrap());