Update Jetty to 8.1.3.v20120416

Jetty 8.1.3 comes with Juno M7 and this version can be installed from
http://download.eclipse.org/jetty/updates/jetty-bundles-8.x/8.1.3.v20120416/

Change-Id: Ifc4bfbb3efbab0f5bfbde74f0b2ddc5a2f9ee6a5
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
index 6c53e59446ca72f0b96a1c165ce7c5003b9c8931..8588fd4741a22f08a4ba01ef5b988da8c266705d 100644 (file)
--- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
@@ -11,8 +11,8 @@ Export-Package:
  org.eclipse.jgit.http.server.resolver;version="2.0.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: javax.servlet;version="[2.5.0,3.0.0)",
- javax.servlet.http;version="[2.5.0,3.0.0)",
+Import-Package: javax.servlet;version="[3.0.0,4.0.0)",
+ javax.servlet.http;version="[3.0.0,4.0.0)",
  org.eclipse.jgit.errors;version="[2.0.0,2.1.0)",
  org.eclipse.jgit.lib;version="[2.0.0,2.1.0)",
  org.eclipse.jgit.nls;version="[2.0.0,2.1.0)",

diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml
index ec2bfc27181bce0a0de38c1c839038d4bcf2f7c6..d82ecc0c8f96c9b97b77db7a5fdd92845c3613bb 100644 (file)
--- a/org.eclipse.jgit.http.server/pom.xml
+++ b/org.eclipse.jgit.http.server/pom.xml
@@ -75,7 +75,7 @@
 
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
   </dependencies>

diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
index f015d7b24a03cc4906ee17cb512bbc8ac1417376..e3489249689dfc7cd840079609cc56e07442ab56 100644 (file)
--- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
@@ -6,21 +6,16 @@ Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: %provider_name
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: javax.servlet;version="[2.5.0,3.0.0)",
- javax.servlet.http;version="[2.5.0,3.0.0)",
- org.eclipse.jetty.continuation;version="[7.1.0,7.6.0)",
- org.eclipse.jetty.http;version="[7.1.0,7.6.0)",
- org.eclipse.jetty.http.security;version="[7.1.0,7.6.0)",
- org.eclipse.jetty.io;version="[7.1.0,7.6.0)",
- org.eclipse.jetty.security;version="[7.1.0,7.6.0)",
- org.eclipse.jetty.security.authentication;version="[7.1.0,7.6.0)",
- org.eclipse.jetty.server;version="[7.1.0,7.6.0)",
- org.eclipse.jetty.server.handler;version="[7.1.0,7.6.0)",
- org.eclipse.jetty.server.nio;version="[7.1.0,7.6.0)",
- org.eclipse.jetty.servlet;version="[7.1.0,7.6.0)",
- org.eclipse.jetty.util.component;version="[7.1.0,7.6.0)",
- org.eclipse.jetty.util.log;version="[7.1.0,7.6.0)",
- org.eclipse.jetty.util.thread;version="[7.1.0,7.6.0)",
+Import-Package: javax.servlet;version="[3.0.0,4.0.0)",
+ javax.servlet.http;version="[3.0.0,4.0.0)",
+ org.eclipse.jetty.continuation;version="[8.1.0,9.0.0)",
+ org.eclipse.jetty.client.security;version="[8.1.0,9.0.0)",
+ org.eclipse.jetty.http;version="[8.1.0,9)",
+ org.eclipse.jetty.http.ssl;version="[8.1.0,9.0.0)",
+ org.eclipse.jetty.io;version="[8.1.0,9)",
+ org.eclipse.jetty.server.handler;version="[8.1.0,9.0.0)",
+ org.eclipse.jetty.servlet;version="[8.1.0,9.0.0)",
+ org.eclipse.jetty.util;version="[8.1.0,9.0.0)",
  org.eclipse.jgit.errors;version="[2.0.0,2.1.0)",
  org.eclipse.jgit.http.server;version="[2.0.0,2.1.0)",
  org.eclipse.jgit.http.server.glue;version="[2.0.0,2.1.0)",
@@ -37,3 +32,4 @@ Import-Package: javax.servlet;version="[2.5.0,3.0.0)",
  org.eclipse.jgit.util;version="[2.0.0,2.1.0)",
  org.hamcrest.core;version="[1.1.0,2.0.0)",
  org.junit;version="[4.0.0,5.0.0)"
+Require-Bundle: org.eclipse.jetty.server;bundle-version="[8.1.0,9.0.0)"

diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/GitServletInitTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/GitServletInitTest.java
index 78db5747f7aef6b07c048862b36a344585a97a99..9dfb199425da11109c0ac1a6d6e32f35a3d0f41a 100644 (file)
--- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/GitServletInitTest.java
+++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/GitServletInitTest.java
@@ -43,7 +43,6 @@
 
 package org.eclipse.jgit.http.test;
 
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -53,6 +52,7 @@ import javax.servlet.ServletException;
 
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.util.MultiException;
 import org.eclipse.jgit.http.server.GitServlet;
 import org.eclipse.jgit.junit.http.AppServer;
 import org.eclipse.jgit.junit.http.MockServletConfig;
@@ -100,15 +100,28 @@ public class GitServletInitTest {
                ServletContextHandler app = server.addContext("/");
                ServletHolder s = app.addServlet(GitServlet.class, "/git");
                s.setInitOrder(1);
+               s.getServletHandler().setStartWithUnavailable(false);
 
-               server.setUp();
-
-               List<RecordingLogger.Warning> events = RecordingLogger.getWarnings();
-               assertFalse("Servlet started without base-path", events.isEmpty());
-
-               Throwable why = events.get(0).getCause();
-               assertTrue("Caught ServletException", why instanceof ServletException);
-               assertTrue("Wanted base-path", why.getMessage().contains("base-path"));
+               try {
+                       server.setUp();
+               } catch (Exception e) {
+                       Throwable why = null;
+                       if (e instanceof MultiException) {
+                               MultiException multi = (MultiException) e;
+                               List<Throwable> reasons = multi.getThrowables();
+                               why = reasons.get(0);
+                               assertTrue("Expected ServletException",
+                                               why instanceof ServletException);
+                       } else if (e instanceof ServletException)
+                               why = e;
+
+                       if (why != null) {
+                               assertTrue("Wanted base-path",
+                                               why.getMessage().contains("base-path"));
+                               return;
+                       }
+               }
+               fail("Expected ServletException complaining about unset base-path");
        }
 
        @Test

diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java
index 2a39c9f39cbd1447dc0d1f192d9e9e38ffdd779f..4db7430ba9b925dfec4ebc8e64dce341da7c17a5 100644 (file)
--- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java
+++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java
@@ -57,9 +57,11 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.net.URISyntaxException;
 import java.util.Collections;
+import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
 
+import javax.servlet.DispatcherType;
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
@@ -70,7 +72,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.jetty.servlet.FilterHolder;
-import org.eclipse.jetty.servlet.FilterMapping;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jgit.errors.RemoteRepositoryException;
@@ -89,9 +90,9 @@ import org.eclipse.jgit.lib.Ref;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.revwalk.RevBlob;
 import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.storage.file.ReflogEntry;
 import org.eclipse.jgit.storage.file.FileBasedConfig;
 import org.eclipse.jgit.storage.file.FileRepository;
+import org.eclipse.jgit.storage.file.ReflogEntry;
 import org.eclipse.jgit.storage.file.ReflogReader;
 import org.eclipse.jgit.transport.FetchConnection;
 import org.eclipse.jgit.transport.HttpTransport;
@@ -160,7 +161,8 @@ public class SmartClientSmartServerTest extends HttpTestCase {
                        public void destroy() {
                                //
                        }
-               }), "/" + srcName + "/git-upload-pack", FilterMapping.DEFAULT);
+               }), "/" + srcName + "/git-upload-pack", EnumSet
+                               .of(DispatcherType.REQUEST));
                broken.addServlet(new ServletHolder(gs), "/*");
 
                server.setUp();

diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
index 5257d7f9fddd6845ca27e2e2e26541c14ec62739..e46a4494355ec5b180c9c1ba84790806a346eacf 100644 (file)
--- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
@@ -7,21 +7,21 @@ Bundle-Localization: plugin
 Bundle-Vendor: %provider_name
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: javax.servlet;version="[2.5.0,3.0.0)",
- javax.servlet.http;version="[2.5.0,3.0.0)",
- org.eclipse.jetty.continuation;version="[7.1.0,7.6.0)",
- org.eclipse.jetty.http;version="[7.1.0,7.6.0)",
- org.eclipse.jetty.http.security;version="[7.1.0,7.6.0)",
- org.eclipse.jetty.io;version="[7.1.0,7.6.0)",
- org.eclipse.jetty.security;version="[7.1.0,7.6.0)",
- org.eclipse.jetty.security.authentication;version="[7.1.0,7.6.0)",
- org.eclipse.jetty.server;version="[7.1.0,7.6.0)",
- org.eclipse.jetty.server.handler;version="[7.1.0,7.6.0)",
- org.eclipse.jetty.server.nio;version="[7.1.0,7.6.0)",
- org.eclipse.jetty.servlet;version="[7.1.0,7.6.0)",
- org.eclipse.jetty.util.component;version="[7.1.0,7.6.0)",
- org.eclipse.jetty.util.log;version="[7.1.0,7.6.0)",
- org.eclipse.jetty.util.thread;version="[7.1.0,7.6.0)",
+Import-Package: javax.servlet;version="[3.0.0,4.0.0)",
+ javax.servlet.http;version="[3.0.0,4.0.0)",
+ org.eclipse.jetty.client.security;version="[8.1.0,9.0.0)",
+ org.eclipse.jetty.http;version="[8.1.0,9.0.0)",
+ org.eclipse.jetty.http.ssl;version="[8.1.0,9.0.0)",
+ org.eclipse.jetty.io;version="[8.1.0,9.0.0)",
+ org.eclipse.jetty.security;version="[8.1.0,9.0.0)",
+ org.eclipse.jetty.security.authentication;version="[8.1.0,9.0.0)",
+ org.eclipse.jetty.server.handler;version="[8.1.0,9.0.0)",
+ org.eclipse.jetty.servlet;version="[8.1.0,9.0.0)",
+ org.eclipse.jetty.util;version="[8.1.0,9.0.0)",
+ org.eclipse.jetty.util.component;version="[8.1.0,9.0.0)",
+ org.eclipse.jetty.util.log;version="[8.1.0,9.0.0)",
+ org.eclipse.jetty.util.security;version="[8.1.0,9.0.0)",
+ org.eclipse.jetty.util.thread;version="[8.1.0,9.0.0)",
  org.eclipse.jgit.errors;version="[2.0.0,2.1.0)",
  org.eclipse.jgit.http.server;version="[2.0.0,2.1.0)",
  org.eclipse.jgit.http.server.resolver;version="[2.0.0,2.1.0)",
@@ -33,3 +33,4 @@ Import-Package: javax.servlet;version="[2.5.0,3.0.0)",
  org.eclipse.jgit.transport.resolver;version="[2.0.0,2.1.0)",
  org.junit;version="[4.0.0,5.0.0)"
 Export-Package: org.eclipse.jgit.junit.http;version="2.0.0"
+Require-Bundle: org.eclipse.jetty.server;bundle-version="[8.1.0,9.0.0)"

diff --git a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java
index 1e7a6e79aa6fa8ae103d32b9e5fe39aadab11826..04ccc14addda313c9f116740fe335bf4cd33e10c 100644 (file)
--- a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java
+++ b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java
@@ -54,8 +54,6 @@ import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.jetty.http.security.Constraint;
-import org.eclipse.jetty.http.security.Password;
 import org.eclipse.jetty.security.Authenticator;
 import org.eclipse.jetty.security.ConstraintMapping;
 import org.eclipse.jetty.security.ConstraintSecurityHandler;
@@ -67,6 +65,8 @@ import org.eclipse.jetty.server.UserIdentity;
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
 import org.eclipse.jetty.server.nio.SelectChannelConnector;
 import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.util.security.Constraint;
+import org.eclipse.jetty.util.security.Password;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
 import org.eclipse.jgit.transport.URIish;
 

diff --git a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/TestRequestLog.java b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/TestRequestLog.java
index f71bc9350f744108a6c83817cae6081b5557235f..14ea03a921a1231ea50c954ef86226f3bebf1a61 100644 (file)
--- a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/TestRequestLog.java
+++ b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/TestRequestLog.java
@@ -48,11 +48,11 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Semaphore;
 
+import javax.servlet.DispatcherType;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.eclipse.jetty.server.DispatcherType;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.handler.HandlerWrapper;

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml
index b811608a2e1ba9b4a22d4bd93f0bdf9d7df88bd9..cfdc3cf5499162ed7495860b6d295d1666fa345d 100644 (file)
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml
@@ -75,6 +75,11 @@
       <artifactId>org.eclipse.jgit.http.server</artifactId>
       <version>2.0.0-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>${servlet-api-version}</version>
+    </dependency>
   </dependencies>
 
 </project>

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
index f088af195372c6c39528c34f3d1e8821ba1852ab..c001a56e5545598289410978e0c32bcd14ca893e 100644 (file)
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
@@ -81,6 +81,11 @@
       <artifactId>org.eclipse.jgit.http.server</artifactId>
       <version>2.0.0-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>${servlet-api-version}</version>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml
index 3fb354e915634deff56df2456e099481bf8c775a..c59f0a0348eb1a5b53e2ced205145d69760ee715 100644 (file)
--- a/org.eclipse.jgit.packaging/pom.xml
+++ b/org.eclipse.jgit.packaging/pom.xml
@@ -61,6 +61,8 @@
   <properties>
     <tycho-version>0.14.1</tycho-version>
     <eclipse-site>http://download.eclipse.org/releases/indigo</eclipse-site>
+    <jetty-version>8.1.3.v20120416</jetty-version>
+    <servlet-api-version>3.0.1</servlet-api-version>
   </properties>
 
   <modules>
@@ -72,10 +74,15 @@
 
   <repositories>
     <repository>
-      <id>indigo</id>
+      <id>eclipse</id>
       <layout>p2</layout>
       <url>${eclipse-site}</url>
     </repository>
+    <repository>
+      <id>jetty</id>
+      <layout>p2</layout>
+      <url>http://download.eclipse.org/jetty/updates/jetty-bundles-8.x/${jetty-version}/</url>
+    </repository>
   </repositories>
 
   <dependencies>
@@ -151,6 +158,11 @@
                 <ws>win32</ws>
                 <arch>x86_64</arch>
               </environment>
+              <environment>
+                <os>macosx</os>
+                <ws>cocoa</ws>
+                <arch>x86</arch>
+              </environment>
               <environment>
                 <os>macosx</os>
                 <ws>cocoa</ws>

diff --git a/pom.xml b/pom.xml
index 390ddb95ff4b0c2a88c3de3b19502bd34c20a8fa..60db93505a2efcf9844b3ef80915bdc0970a4f1b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -172,8 +172,8 @@
     <jsch-version>0.1.44-1</jsch-version>
     <junit-version>4.5</junit-version>
     <args4j-version>2.0.12</args4j-version>
-    <servlet-api-version>2.5</servlet-api-version>
-    <jetty-version>7.1.6.v20100715</jetty-version>
+    <servlet-api-version>3.0.1</servlet-api-version>
+    <jetty-version>8.1.3.v20120416</jetty-version>
     <protobuf-version>2.4.0a</protobuf-version>
     <clirr-version>2.3</clirr-version>
   </properties>
@@ -183,6 +183,10 @@
       <id>jgit-repository</id>
       <url>http://download.eclipse.org/jgit/maven</url>
     </repository>
+    <repository>
+      <id>jetty-repository</id>
+      <url>http://download.eclipse.org/jetty/updates/jetty-bundles-8.x/${jetty-version}/</url>
+    </repository>
   </repositories>
 
   <build>
@@ -397,7 +401,7 @@
 
       <dependency>
         <groupId>javax.servlet</groupId>
-        <artifactId>servlet-api</artifactId>
+        <artifactId>javax.servlet-api</artifactId>
         <version>${servlet-api-version}</version>
       </dependency>