Issue 527:update to official build of jetty

compute/src/test/java/org/jclouds/compute/BaseComputeServiceLiveTest.java

@@ -1,6 +1,6 @@
 /**
  *
- * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
  *
  * ====================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,6 @@
  * limitations under the License.
  * ====================================================================
  */
-
 package org.jclouds.compute;
 
 import static com.google.common.base.Preconditions.checkNotNull;

core/pom.xml

@@ -99,8 +99,8 @@
             <version>1.0</version>
         </dependency>
         <dependency>
-            <groupId>org.mortbay.jetty</groupId>
+            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-ssl</artifactId>
+            <artifactId>jetty-security</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

core/src/test/java/org/jclouds/http/BackoffLimitedRetryJavaTest.java

@@ -1,6 +1,6 @@
 /**
  *
- * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
  *
  * ====================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,6 @@
  * limitations under the License.
  * ====================================================================
  */
-
 package org.jclouds.http;
 
 import static org.testng.Assert.assertEquals;
@@ -29,9 +28,9 @@ import java.util.concurrent.ExecutionException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.eclipse.jetty.server.Request;
 import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule;
 import org.jclouds.http.handlers.BackoffLimitedRetryHandler;
-import org.mortbay.jetty.Request;
 import org.testng.annotations.Test;
 
 import com.google.inject.Module;

core/src/test/java/org/jclouds/http/BaseJettyTest.java

@@ -1,6 +1,6 @@
 /**
  *
- * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
  *
  * ====================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,6 @@
  * limitations under the License.
  * ====================================================================
  */
-
 package org.jclouds.http;
 
 import static com.google.common.base.Throwables.propagate;
@@ -46,6 +45,12 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.ws.rs.core.HttpHeaders;
 
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.AbstractHandler;
+import org.eclipse.jetty.server.ssl.SslSocketConnector;
 import org.jclouds.Constants;
 import org.jclouds.crypto.CryptoStreams;
 import org.jclouds.io.InputSuppliers;
@@ -53,12 +58,6 @@ import org.jclouds.rest.RestContext;
 import org.jclouds.rest.RestContextBuilder;
 import org.jclouds.rest.RestContextSpec;
 import org.jclouds.util.Strings2;
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.Request;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.handler.AbstractHandler;
-import org.mortbay.jetty.ssl.SslSocketConnector;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Optional;
@@ -87,7 +86,7 @@ public abstract class BaseJettyTest {
    static final Pattern actionPattern = Pattern.compile("/objects/(.*)/action/([a-z]*);?(.*)");
 
    @BeforeTest
-   @Parameters( { "test-jetty-port" })
+   @Parameters({ "test-jetty-port" })
    public void setUpJetty(@Optional("8123") final int testPort) throws Exception {
       this.testPort = testPort;
 
@@ -96,8 +95,8 @@ public abstract class BaseJettyTest {
       md5 = CryptoStreams.md5Base64(oneHundredOneConstitutions);
 
       Handler server1Handler = new AbstractHandler() {
-         public void handle(String target, HttpServletRequest request, HttpServletResponse response, int dispatch)
+         public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
-                  throws IOException, ServletException {
+               throws IOException, ServletException {
             if (failIfNoContentLength(request, response)) {
                return;
             } else if (target.indexOf("sleep") > 0) {
@@ -187,7 +186,7 @@ public abstract class BaseJettyTest {
             }
          } else {
             for (String header : new String[] { "Content-Disposition", HttpHeaders.CONTENT_LANGUAGE,
-                     HttpHeaders.CONTENT_ENCODING })
+                  HttpHeaders.CONTENT_ENCODING })
                if (request.getHeader(header) != null) {
                   response.addHeader("x-" + header, request.getHeader(header));
                }
@@ -207,8 +206,8 @@ public abstract class BaseJettyTest {
 
    protected void setupAndStartSSLServer(final int testPort) throws Exception {
       Handler server2Handler = new AbstractHandler() {
-         public void handle(String target, HttpServletRequest request, HttpServletResponse response, int dispatch)
+         public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
-                  throws IOException, ServletException {
+               throws IOException, ServletException {
             if (request.getMethod().equals("PUT")) {
                if (request.getContentLength() > 0) {
                   response.setStatus(HttpServletResponse.SC_OK);
@@ -262,12 +261,12 @@ public abstract class BaseJettyTest {
    }
 
    public static RestContextBuilder<IntegrationTestClient, IntegrationTestAsyncClient> newBuilder(int testPort,
-            Properties properties, Module... connectionModules) {
+         Properties properties, Module... connectionModules) {
       properties.setProperty(Constants.PROPERTY_TRUST_ALL_CERTS, "true");
       properties.setProperty(Constants.PROPERTY_RELAX_HOSTNAME, "true");
       RestContextSpec<IntegrationTestClient, IntegrationTestAsyncClient> contextSpec = contextSpec("test",
-               "http://localhost:" + testPort, "1", "", "identity", null, IntegrationTestClient.class,
+            "http://localhost:" + testPort, "1", "", "identity", null, IntegrationTestClient.class,
-               IntegrationTestAsyncClient.class, ImmutableSet.<Module> copyOf(connectionModules));
+            IntegrationTestAsyncClient.class, ImmutableSet.<Module> copyOf(connectionModules));
       return createContextBuilder(contextSpec, properties);
    }
 
@@ -293,7 +292,7 @@ public abstract class BaseJettyTest {
     */
    protected boolean failEveryTenRequests(HttpServletRequest request, HttpServletResponse response) throws IOException {
       if (cycle.incrementAndGet() % 10 == 0) {
-         response.sendError(500);
+         response.sendError(500, "unlucky 10");
          ((Request) request).setHandled(true);
          return true;
       }
@@ -301,7 +300,7 @@ public abstract class BaseJettyTest {
    }
 
    protected boolean redirectEveryTwentyRequests(HttpServletRequest request, HttpServletResponse response)
-            throws IOException {
+         throws IOException {
       if (cycle.incrementAndGet() % 20 == 0) {
          response.sendRedirect("http://localhost:" + (testPort + 1) + "/");
          ((Request) request).setHandled(true);
@@ -325,7 +324,7 @@ public abstract class BaseJettyTest {
       if (realHeaders.get(CONTENT_LENGTH) == null) {
          response.getWriter().println("no content length!");
          response.getWriter().println(realHeaders.toString());
-         response.sendError(500);
+         response.sendError(500, "no content length!");
          ((Request) request).setHandled(true);
          return true;
       }

core/src/test/java/org/jclouds/http/functions/ParseURIFromListOrLocationHeaderIf20xTest.java

@@ -1,6 +1,6 @@
 /**
  *
- * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
  *
  * ====================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,6 @@
  * limitations under the License.
  * ====================================================================
  */
-
 package org.jclouds.http.functions;
 
 import static org.easymock.EasyMock.expect;
@@ -33,11 +32,11 @@ import java.util.concurrent.TimeoutException;
 import javax.inject.Provider;
 import javax.ws.rs.core.UriBuilder;
 
+import org.eclipse.jetty.http.HttpHeaders;
 import org.jclouds.http.HttpResponse;
 import org.jclouds.io.Payload;
 import org.jclouds.rest.internal.GeneratedHttpRequest;
 import org.jclouds.util.Strings2;
-import org.mortbay.jetty.HttpHeaders;
 import org.testng.annotations.Test;
 
 import com.google.common.base.Function;

core/src/test/java/org/jclouds/rest/BaseRestClientTest.java

@@ -1,6 +1,6 @@
 /**
  *
- * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
  *
  * ====================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,13 +16,12 @@
  * limitations under the License.
  * ====================================================================
  */
-
 package org.jclouds.rest;
 
 import static com.google.common.base.Throwables.propagate;
 import static org.easymock.classextension.EasyMock.createMock;
 import static org.jclouds.http.HttpUtils.sortAndConcatHeadersIntoString;
-import static org.mortbay.jetty.HttpHeaders.TRANSFER_ENCODING;
+import static org.eclipse.jetty.http.HttpHeaders.TRANSFER_ENCODING;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNull;
 

core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java

@@ -1,6 +1,6 @@
 /**
  *
- * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ * Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
  *
  * ====================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,6 @@
  * limitations under the License.
  * ====================================================================
  */
-
 package org.jclouds.rest.internal;
 
 import static com.google.common.base.Charsets.UTF_8;
@@ -77,6 +76,7 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.UriBuilder;
 
 import org.easymock.IArgumentMatcher;
+import org.eclipse.jetty.http.HttpHeaders;
 import org.jclouds.concurrent.Timeout;
 import org.jclouds.crypto.Crypto;
 import org.jclouds.date.DateService;
@@ -134,7 +134,6 @@ import org.jclouds.rest.binders.BindToJsonPayload;
 import org.jclouds.rest.binders.BindToStringPayload;
 import org.jclouds.rest.config.RestClientModule;
 import org.jclouds.util.Strings2;
-import org.mortbay.jetty.HttpHeaders;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;

drivers/apachehc/pom.xml

@@ -65,8 +65,8 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>org.mortbay.jetty</groupId>
+            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-ssl</artifactId>
+            <artifactId>jetty-security</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

drivers/enterprise/pom.xml

@@ -62,24 +62,14 @@
             <artifactId>jclouds-joda</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-            <version>1.6.2</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>jclouds-bouncycastle</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.bouncycastle</groupId>
+            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>bcprov-jdk15</artifactId>
+            <artifactId>jetty-security</artifactId>
-            <version>1.44</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty-ssl</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

drivers/gae/pom.xml

@@ -65,8 +65,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.mortbay.jetty</groupId>
+            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-ssl</artifactId>
+            <artifactId>jetty-security</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

project/pom.xml

@@ -193,9 +193,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.mortbay.jetty</groupId>
+                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-ssl</artifactId>
+                <artifactId>jetty-security</artifactId>
-                <version>7.0.0.pre5</version>
+                <version>7.4.0.RC0</version>
             </dependency>
             <dependency>
                 <groupId>com.jcraft</groupId>
@@ -208,7 +208,7 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>5.14.10</version>
+            <version>6.0.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

sandbox-drivers/asynchttpclient/pom.xml

@@ -64,8 +64,8 @@
             <version>1.4.1</version>
         </dependency>
         <dependency>
-            <groupId>org.mortbay.jetty</groupId>
+            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-ssl</artifactId>
+            <artifactId>jetty-security</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>