This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository wagon2.
commit 4c1f9e16e318cacec1384cc546c0244c40f2b603 Author: Emmanuel Bourg <[email protected]> Date: Tue May 17 18:19:51 2016 +0200 Transition to Jetty 8 --- debian/changelog | 7 + debian/control | 4 +- debian/maven.rules | 2 +- debian/patches/jetty-compatibility.patch | 455 +++++++++++++++++++++++++++++++ debian/patches/series | 1 + 5 files changed, 466 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index a21d8c9..0fb1af9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +wagon2 (2.10-4) UNRELEASED; urgency=medium + + * Team upload. + * Transition to Jetty 8 + + -- Emmanuel Bourg <[email protected]> Tue, 17 May 2016 16:07:44 +0200 + wagon2 (2.10-3) unstable; urgency=medium * Team upload. diff --git a/debian/control b/debian/control index b83819a..f8ab253 100644 --- a/debian/control +++ b/debian/control @@ -17,8 +17,8 @@ Build-Depends-Indep: default-jdk-doc, libeasymock-java (>= 3.2), libhttpclient-java (>= 4.3.1), libjaxen-java, - libjetty-java, - libjetty-java-doc, + libjetty8-java, + libjetty8-extra-java, libjsoup-java, libmaven-install-plugin-java, libmaven-javadoc-plugin-java, diff --git a/debian/maven.rules b/debian/maven.rules index 9fb5303..bb6321e 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -45,5 +45,5 @@ org.codehaus.plexus plexus-component-metadata jar s/.*/1.5.5/ * * org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * * commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * * s/easymock/org.easymock/ easymock * s/.*/debian/ * * -org.mortbay.jetty * * s/6\..*/6.x/ * * +s/org.mortbay.jetty/org.eclipse.jetty/ s/jetty/jetty-webapp/ * s/.*/debian/ * * s/org.apache.geronimo.specs/javax.servlet/ s/geronimo-servlet_2.5_spec/servlet-api/ jar s/.*/2.5/ * * diff --git a/debian/patches/jetty-compatibility.patch b/debian/patches/jetty-compatibility.patch new file mode 100644 index 0000000..d315e1c --- /dev/null +++ b/debian/patches/jetty-compatibility.patch @@ -0,0 +1,455 @@ +Description: Upgrade to Jetty 8 +Author: Emmanuel Bourg <[email protected]> +Forwarded: no +--- a/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java ++++ b/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java +@@ -34,20 +34,22 @@ + import org.codehaus.plexus.util.FileUtils; + import org.codehaus.plexus.util.IOUtil; + import org.codehaus.plexus.util.StringUtils; +-import org.mortbay.jetty.Handler; +-import org.mortbay.jetty.HttpConnection; +-import org.mortbay.jetty.Request; +-import org.mortbay.jetty.Response; +-import org.mortbay.jetty.Server; +-import org.mortbay.jetty.handler.AbstractHandler; +-import org.mortbay.jetty.handler.HandlerCollection; +-import org.mortbay.jetty.security.Constraint; +-import org.mortbay.jetty.security.ConstraintMapping; +-import org.mortbay.jetty.security.HashUserRealm; +-import org.mortbay.jetty.security.SecurityHandler; +-import org.mortbay.jetty.servlet.Context; +-import org.mortbay.jetty.servlet.DefaultServlet; +-import org.mortbay.jetty.servlet.ServletHolder; ++import org.eclipse.jetty.server.Handler; ++import org.eclipse.jetty.server.Request; ++import org.eclipse.jetty.server.Response; ++import org.eclipse.jetty.server.Server; ++import org.eclipse.jetty.server.UserIdentity; ++import org.eclipse.jetty.server.handler.AbstractHandler; ++import org.eclipse.jetty.server.handler.HandlerCollection; ++import org.eclipse.jetty.util.security.Constraint; ++import org.eclipse.jetty.util.security.Password; ++import org.eclipse.jetty.security.ConstraintMapping; ++import org.eclipse.jetty.security.HashLoginService; ++import org.eclipse.jetty.security.SecurityHandler; ++import org.eclipse.jetty.security.ConstraintSecurityHandler; ++import org.eclipse.jetty.servlet.ServletContextHandler; ++import org.eclipse.jetty.servlet.DefaultServlet; ++import org.eclipse.jetty.servlet.ServletHolder; + + import javax.servlet.ServletException; + import javax.servlet.ServletInputStream; +@@ -99,7 +101,7 @@ + server = new Server( 0 ); + + PutHandler putHandler = new PutHandler( repositoryDirectory ); +- server.addHandler( putHandler ); ++ server.setHandler( putHandler ); + + createContext( server, repositoryDirectory ); + +@@ -123,7 +125,7 @@ + protected void createContext( Server server, File repositoryDirectory ) + throws IOException + { +- Context root = new Context( server, "/", Context.SESSIONS ); ++ ServletContextHandler root = new ServletContextHandler( server, "/", ServletContextHandler.SESSIONS ); + root.setResourceBase( repositoryDirectory.getAbsolutePath() ); + ServletHolder servletHolder = new ServletHolder( new DefaultServlet() ); + root.addServlet( servletHolder, "/*" ); +@@ -309,7 +311,7 @@ + + AbstractHandler handler = new AbstractHandler() + { +- public void handle( String s, HttpServletRequest request, HttpServletResponse response, int i ) ++ public void handle( String s, Request baseRequest, HttpServletRequest request, HttpServletResponse response ) + throws IOException, ServletException + { + if ( called.get() ) +@@ -456,7 +458,7 @@ + + AbstractHandler handler = new AbstractHandler() + { +- public void handle( String s, HttpServletRequest request, HttpServletResponse response, int i ) ++ public void handle( String s, Request baseRequest, HttpServletRequest request, HttpServletResponse response ) + throws IOException, ServletException + { + if ( called.get() ) +@@ -543,7 +545,7 @@ + Server server = new Server( getTestRepositoryPort() ); + + String localRepositoryPath = FileTestUtils.getTestOutputDir().toString(); +- Context root = new Context( server, "/", Context.SESSIONS ); ++ ServletContextHandler root = new ServletContextHandler( server, "/", ServletContextHandler.SESSIONS ); + root.setResourceBase( localRepositoryPath ); + ServletHolder servletHolder = new ServletHolder( new DefaultServlet() ); + servletHolder.setInitParameter( "gzip", "true" ); +@@ -1122,13 +1124,13 @@ + this.repositoryDirectory = repositoryDirectory; + } + +- public void handle( String s, HttpServletRequest req, HttpServletResponse resp, int i ) ++ public void handle( String s, Request baseRequest, HttpServletRequest req, HttpServletResponse resp ) + throws IOException, ServletException + { + if ( req.getRequestURI().contains( "redirectRequest" ) ) + { + PutHandler putHandler = new PutHandler( this.repositoryDirectory ); +- putHandler.handle( s, req, resp, i ); ++ putHandler.handle( s, baseRequest, req, resp ); + handlerRequestResponses.add( + new HandlerRequestResponse( req.getMethod(), ( (Response) resp ).getStatus(), + req.getRequestURI() ) ); +@@ -1342,7 +1344,7 @@ + + assertEquals( "top secret", IOUtil.toString( in ) ); + +- TestSecurityHandler securityHandler = (TestSecurityHandler) ( (Context) server.getHandler() ).getHandler(); ++ TestSecurityHandler securityHandler = (TestSecurityHandler) ( (ServletContextHandler) server.getHandler() ).getHandler(); + testPreemptiveAuthenticationGet( securityHandler, supportPreemptiveAuthenticationGet() ); + + } +@@ -1393,7 +1395,7 @@ + + assertEquals( "top secret", out.toString( "US-ASCII" ) ); + +- TestSecurityHandler securityHandler = (TestSecurityHandler) ( (Context) server.getHandler() ).getHandler(); ++ TestSecurityHandler securityHandler = (TestSecurityHandler) ( (ServletContextHandler) server.getHandler() ).getHandler(); + testPreemptiveAuthenticationGet( securityHandler, supportPreemptiveAuthenticationGet() ); + } + finally +@@ -1483,9 +1485,9 @@ + + SecurityHandler sh = createSecurityHandler(); + +- Context root = new Context( Context.SESSIONS ); ++ ServletContextHandler root = new ServletContextHandler( ServletContextHandler.SESSIONS ); + root.setContextPath( "/" ); +- root.addHandler( sh ); ++ root.setHandler( sh ); + root.setResourceBase( localRepositoryPath ); + ServletHolder servletHolder = new ServletHolder( new DefaultServlet() ); + root.addServlet( servletHolder, "/*" ); +@@ -1587,7 +1589,7 @@ + + AbstractHandler handler = new AbstractHandler() + { +- public void handle( String s, HttpServletRequest request, HttpServletResponse response, int i ) ++ public void handle( String s, Request baseRequest, HttpServletRequest request, HttpServletResponse response ) + throws IOException, ServletException + { + if ( called.get() ) +@@ -1908,7 +1910,7 @@ + this.status = status; + } + +- 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 + { + if ( status != 0 ) +@@ -1968,12 +1970,9 @@ + this.resourceBase = repositoryDirectory; + } + +- 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 + { +- Request baseRequest = +- request instanceof Request ? (Request) request : HttpConnection.getCurrentConnection().getRequest(); +- + if ( baseRequest.isHandled() || !"PUT".equals( baseRequest.getMethod() ) ) + { + return; +@@ -2017,7 +2016,7 @@ + + List<HandlerRequestResponse> handlerRequestResponses = new ArrayList<HandlerRequestResponse>(); + +- 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 + { + System.out.println( " handle proxy request" ); +@@ -2035,7 +2034,7 @@ + } + handlerRequestResponses.add( + new HandlerRequestResponse( request.getMethod(), HttpServletResponse.SC_OK, request.getRequestURI() ) ); +- super.handle( target, request, response, dispatch ); ++ super.handle( target, baseRequest, request, response ); + } + } + +@@ -2054,7 +2053,7 @@ + { + } + +- 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 + { + headers = new HashMap<String, String>(); +@@ -2102,10 +2101,9 @@ + cm.setPathSpec( "/*" ); + + TestSecurityHandler sh = new TestSecurityHandler(); +- HashUserRealm hashUserRealm = new HashUserRealm( "MyRealm" ); +- hashUserRealm.put( "user", "secret" ); +- hashUserRealm.addUserToRole( "user", "admin" ); +- sh.setUserRealm( hashUserRealm ); ++ HashLoginService hashLoginService = new HashLoginService( "MyRealm" ); ++ hashLoginService.putUser( "user", new Password( "secret" ), new String[]{ "admin" } ); ++ sh.setLoginService( hashLoginService ); + sh.setConstraintMappings( new ConstraintMapping[]{ cm } ); + return sh; + } +@@ -2115,17 +2113,17 @@ + */ + @SuppressWarnings( "checkstyle:visibilitymodifier" ) + public static class TestSecurityHandler +- extends SecurityHandler ++ extends ConstraintSecurityHandler + { + + public List<HandlerRequestResponse> handlerRequestResponses = new ArrayList<HandlerRequestResponse>(); + + @Override +- 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 + { + String method = request.getMethod(); +- super.handle( target, request, response, dispatch ); ++ super.handle( target, baseRequest, request, response ); + + handlerRequestResponses.add( + new HandlerRequestResponse( method, ( (Response) response ).getStatus(), request.getRequestURI() ) ); +--- a/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ServerFixture.java ++++ b/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ServerFixture.java +@@ -20,23 +20,23 @@ + */ + + import org.apache.log4j.Logger; +-import org.mortbay.jetty.Connector; +-import org.mortbay.jetty.Handler; +-import org.mortbay.jetty.Server; +-import org.mortbay.jetty.handler.DefaultHandler; +-import org.mortbay.jetty.handler.HandlerCollection; +-import org.mortbay.jetty.nio.SelectChannelConnector; +-import org.mortbay.jetty.security.Constraint; +-import org.mortbay.jetty.security.ConstraintMapping; +-import org.mortbay.jetty.security.HashUserRealm; +-import org.mortbay.jetty.security.SecurityHandler; +-import org.mortbay.jetty.security.SslSocketConnector; +-import org.mortbay.jetty.servlet.AbstractSessionManager; +-import org.mortbay.jetty.servlet.FilterHolder; +-import org.mortbay.jetty.servlet.FilterMapping; +-import org.mortbay.jetty.servlet.ServletHolder; +-import org.mortbay.jetty.servlet.SessionHandler; +-import org.mortbay.jetty.webapp.WebAppContext; ++import org.eclipse.jetty.server.Connector; ++import org.eclipse.jetty.server.Handler; ++import org.eclipse.jetty.server.Server; ++import org.eclipse.jetty.server.handler.DefaultHandler; ++import org.eclipse.jetty.server.handler.HandlerCollection; ++import org.eclipse.jetty.server.nio.SelectChannelConnector; ++import org.eclipse.jetty.util.security.Constraint; ++import org.eclipse.jetty.security.ConstraintMapping; ++import org.eclipse.jetty.security.HashLoginService; ++import org.eclipse.jetty.security.ConstraintSecurityHandler; ++import org.eclipse.jetty.server.ssl.SslSocketConnector; ++import org.eclipse.jetty.server.session.AbstractSessionManager; ++import org.eclipse.jetty.servlet.FilterHolder; ++import org.eclipse.jetty.servlet.FilterMapping; ++import org.eclipse.jetty.servlet.ServletHolder; ++import org.eclipse.jetty.server.session.SessionHandler; ++import org.eclipse.jetty.webapp.WebAppContext; + + import javax.servlet.Filter; + import javax.servlet.Servlet; +@@ -67,9 +67,9 @@ + + private final WebAppContext webappContext; + +- private final HashUserRealm securityRealm; ++ private final HashLoginService securityRealm; + +- private final SecurityHandler securityHandler; ++ private final ConstraintSecurityHandler securityHandler; + + private int filterCount = 0; + +@@ -114,11 +114,11 @@ + cm.setConstraint( constraint ); + cm.setPathSpec( "/protected/*" ); + +- securityHandler = new SecurityHandler(); ++ securityHandler = new ConstraintSecurityHandler(); + +- securityRealm = new HashUserRealm( "Test Server" ); ++ securityRealm = new HashLoginService( "Test Server" ); + +- securityHandler.setUserRealm( securityRealm ); ++ securityHandler.setLoginService( securityRealm ); + securityHandler.setConstraintMappings( new ConstraintMapping[]{ cm } ); + + webappContext = new WebAppContext(); +@@ -127,7 +127,7 @@ + File base = getResource( SERVER_ROOT_RESOURCE_PATH ); + logger.info( "docroot: " + base ); + webappContext.setWar( base.getAbsolutePath() ); +- webappContext.addHandler( securityHandler ); ++ webappContext.setHandler( securityHandler ); + + SessionHandler sessionHandler = webappContext.getSessionHandler(); + ( (AbstractSessionManager) sessionHandler.getSessionManager() ).setUsingCookies( false ); +@@ -159,8 +159,7 @@ + + public void addUser( final String user, final String password ) + { +- securityRealm.put( user, password ); +- securityRealm.addUserToRole( user, "allowed" ); ++ securityRealm.putUser( user, new org.eclipse.jetty.util.security.Password( password ), new String[]{ "allowed" } ); + } + + public Server getServer() +--- a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HugeFileDownloadTest.java ++++ b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HugeFileDownloadTest.java +@@ -24,10 +24,10 @@ + import org.apache.maven.wagon.observers.Debug; + import org.apache.maven.wagon.repository.Repository; + import org.codehaus.plexus.PlexusTestCase; +-import org.mortbay.jetty.Server; +-import org.mortbay.jetty.servlet.Context; +-import org.mortbay.jetty.servlet.DefaultServlet; +-import org.mortbay.jetty.servlet.ServletHolder; ++import org.eclipse.jetty.server.Server; ++import org.eclipse.jetty.servlet.ServletContextHandler; ++import org.eclipse.jetty.servlet.DefaultServlet; ++import org.eclipse.jetty.servlet.ServletHolder; + + import javax.servlet.ServletException; + import javax.servlet.http.HttpServlet; +@@ -61,7 +61,7 @@ + + server = new Server( 0 ); + +- Context root = new Context( server, "/", Context.SESSIONS ); ++ ServletContextHandler root = new ServletContextHandler( server, "/", ServletContextHandler.SESSIONS ); + root.setResourceBase( new File( getBasedir(), "target" ).getAbsolutePath() ); + ServletHolder servletHolder = new ServletHolder( new DefaultServlet() ); + root.addServlet( servletHolder, "/*" ); +@@ -103,7 +103,7 @@ + + server = new Server( 0 ); + +- Context root = new Context( server, "/", Context.SESSIONS ); ++ ServletContextHandler root = new ServletContextHandler( server, "/", ServletContextHandler.SESSIONS ); + root.setResourceBase( new File( getBasedir(), "target" ).getAbsolutePath() ); + ServletHolder servletHolder = new ServletHolder( new HttpServlet() + { +--- a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonHttpServerTestCase.java ++++ b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonHttpServerTestCase.java +@@ -21,9 +21,9 @@ + + import org.apache.maven.wagon.Wagon; + import org.codehaus.plexus.PlexusTestCase; +-import org.mortbay.jetty.Server; +-import org.mortbay.jetty.handler.ResourceHandler; +-import org.mortbay.jetty.servlet.Context; ++import org.eclipse.jetty.server.Server; ++import org.eclipse.jetty.server.handler.ResourceHandler; ++import org.eclipse.jetty.servlet.ServletContextHandler; + + /** + * User: jdumay Date: 24/01/2008 Time: 18:15:53 +@@ -37,7 +37,7 @@ + + protected ResourceHandler resourceHandler; + +- protected Context context; ++ protected ServletContextHandler context; + + protected void setUp() + throws Exception +@@ -45,10 +45,10 @@ + super.setUp(); + server = new Server( httpServerPort ); + +- context = new Context( server, "/", Context.SESSIONS ); ++ context = new ServletContextHandler( server, "/", ServletContextHandler.SESSIONS ); + + resourceHandler = new ResourceHandler(); +- server.addHandler( resourceHandler ); ++ server.setHandler( resourceHandler ); + } + + protected Wagon getWagon() +--- a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpsWagonPreemptiveTest.java ++++ b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpsWagonPreemptiveTest.java +@@ -20,9 +20,9 @@ + */ + + import org.apache.maven.wagon.Wagon; +-import org.mortbay.jetty.Connector; +-import org.mortbay.jetty.Server; +-import org.mortbay.jetty.security.SslSocketConnector; ++import org.eclipse.jetty.server.Connector; ++import org.eclipse.jetty.server.Server; ++import org.eclipse.jetty.server.ssl.SslSocketConnector; + + public class HttpsWagonPreemptiveTest + extends HttpWagonTest +--- a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTimeoutTest.java ++++ b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTimeoutTest.java +@@ -23,7 +23,7 @@ + import org.apache.maven.wagon.TransferFailedException; + import org.apache.maven.wagon.Wagon; + import org.apache.maven.wagon.repository.Repository; +-import org.mortbay.jetty.servlet.ServletHolder; ++import org.eclipse.jetty.servlet.ServletHolder; + + import java.io.File; + import java.util.Random; +--- a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpsWagonTest.java ++++ b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpsWagonTest.java +@@ -19,9 +19,9 @@ + * under the License. + */ + +-import org.mortbay.jetty.Connector; +-import org.mortbay.jetty.Server; +-import org.mortbay.jetty.security.SslSocketConnector; ++import org.eclipse.jetty.server.Connector; ++import org.eclipse.jetty.server.Server; ++import org.eclipse.jetty.server.ssl.SslSocketConnector; + + public class HttpsWagonTest + extends HttpWagonTest +--- a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonReasonPhraseTest.java ++++ b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonReasonPhraseTest.java +@@ -24,7 +24,7 @@ + import org.apache.maven.wagon.Wagon; + import org.apache.maven.wagon.authorization.AuthorizationException; + import org.apache.maven.wagon.repository.Repository; +-import org.mortbay.jetty.servlet.ServletHolder; ++import org.eclipse.jetty.servlet.ServletHolder; + + import java.io.File; + +--- a/wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/LightweightHttpsWagonTest.java ++++ b/wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/LightweightHttpsWagonTest.java +@@ -19,9 +19,9 @@ + * under the License. + */ + +-import org.mortbay.jetty.Connector; +-import org.mortbay.jetty.Server; +-import org.mortbay.jetty.security.SslSocketConnector; ++import org.eclipse.jetty.server.Connector; ++import org.eclipse.jetty.server.Server; ++import org.eclipse.jetty.server.ssl.SslSocketConnector; + + public class LightweightHttpsWagonTest + extends LightweightHttpWagonTest diff --git a/debian/patches/series b/debian/patches/series index 79f0825..89f6325 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ no_mina_sshd.diff no_itcould_webdav.diff fix_compilation_issues.patch network_dependent_test_disabled.patch +jetty-compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/wagon2.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
