diff options
Diffstat (limited to 'org.eclipse.jgit.http.test')
| -rw-r--r-- | org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 27 | ||||
| -rw-r--r-- | org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java | 8 |
2 files changed, 19 insertions, 16 deletions
diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index e348924968..bb9d304771 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -6,16 +6,22 @@ Bundle-Version: 2.0.0.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 -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)", +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,8.0.0)", + org.eclipse.jetty.http;version="[7.1.0,8.0.0)", + org.eclipse.jetty.io;version="[7.1.0,8.0.0)", + org.eclipse.jetty.security;version="[7.1.0,8.0.0)", + org.eclipse.jetty.security.authentication;version="[7.1.0,8.0.0)", + org.eclipse.jetty.server;version="[7.1.0,8.0.0)", + org.eclipse.jetty.server.handler;version="[7.1.0,8.0.0)", + org.eclipse.jetty.server.nio;version="[7.1.0,8.0.0)", + org.eclipse.jetty.servlet;version="[7.1.0,8.0.0)", + org.eclipse.jetty.util;version="[7.1.0,8.0.0)", + org.eclipse.jetty.util.component;version="[7.1.0,8.0.0)", + org.eclipse.jetty.util.log;version="[7.1.0,8.0.0)", + org.eclipse.jetty.util.security;version="[7.1.0,8.0.0)", + org.eclipse.jetty.util.thread;version="[7.1.0,8.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)", @@ -32,4 +38,3 @@ Import-Package: javax.servlet;version="[3.0.0,4.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/SmartClientSmartServerTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java index 4db7430ba9..2a39c9f39c 100644 --- 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,11 +57,9 @@ 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; @@ -72,6 +70,7 @@ 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; @@ -90,9 +89,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; @@ -161,8 +160,7 @@ public class SmartClientSmartServerTest extends HttpTestCase { public void destroy() { // } - }), "/" + srcName + "/git-upload-pack", EnumSet - .of(DispatcherType.REQUEST)); + }), "/" + srcName + "/git-upload-pack", FilterMapping.DEFAULT); broken.addServlet(new ServletHolder(gs), "/*"); server.setUp(); |