strange, i placed your recommended logger settings under systemPropertyVariables
and see no log for the timeout issue Anyway I am going to cancel the vote and have to roll it again Thanks -Dan On Wed, Dec 28, 2016 at 6:18 AM, Michael Osipov <micha...@apache.org> wrote: > Am 2016-12-28 um 15:07 schrieb Olivier Lamy: > >> 2017 is in few days so maybe java 1.7 shouldn't be a big problem.... >> > > While this is correct, I don't want to change 10 things at once. At last, > if no one changes the code to 1.7, there won't be any benefit. I'd move > this for n+1 release. > > Michael > > On Wed, 28 Dec 2016 at 11:09 am, Michael Osipov <micha...@apache.org> >> wrote: >> >> Am 2016-12-28 um 08:54 schrieb Olivier Lamy: >> >> Hi >>> >> >> What about at least Jetty 9.2? (8.x is not anymore supported) >>> >> >> >> >> Wagon is still Java 1.6, therefore I had to stick to Jetty 8. >> >> Moving from 8 to 9 is easier than from 6 to 9. >> >> >> >> See: >> >> https://www.eclipse.org/jetty/documentation/9.3.x/what-jetty-version.html >> >> >> >> On 26 December 2016 at 10:58, <micha...@apache.org> wrote: >>> >> >> >>> >> Repository: maven-wagon >>>> >>> >> Updated Branches: >>>> >>> >> refs/heads/jetty-8 [created] e707a2691 >>>> >>> >> >>>> >> >>>> >> [WAGON-474] Upgrade and revise all tests for Jetty 8 >>>> >>> >> >>>> >> * Upgrade all test code to Jetty 8.1.22 and Servlet 3.0 >>>> >>> >> * Unify variable names in redirect usecases to realServer and >>>> >>> >> redirectServer >>>> >>> >> * RedirectHandler: redirect code is passed but completely ignored because >>>> >>> >> sendRedirect() always sends 302 >>>> >>> >> * Chronologically sort checkHandlerResult() calls >>>> >>> >> ** Set redirect code (See Other (303)) as requested >>>> >>> >> ** Update checkHandlerResult() for requested status codes rather sent >>>> >>> >> chosen by server (mismatched previously) >>>> >>> >> * testPreemptiveAuthentication*(): properly check for OK for GET and >>>> >>> >> CREATED for PUT instead of OK only for both >>>> >>> >> * WebDavWagonTest: replace status code literal for >>>> >>> >> HttpServletResponse.SC_* for better readability >>>> >>> >> * testRedirect*(): add more checkHandlerResults >>>> >>> >> >>>> >> >>>> >> Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo >>>> >>> >> Commit: >>>> >>> http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/2e1c807e >> >> Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/2e1c807e >>>> >>> >> Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/2e1c807e >>>> >>> >> >>>> >> Branch: refs/heads/jetty-8 >>>> >>> >> Commit: 2e1c807e5345a1999376771f8b378b8cd3328fee >>>> >>> >> Parents: b451e41 >>>> >>> >> Author: Michael Osipov <micha...@apache.org> >>>> >>> >> Authored: Mon Dec 26 00:55:09 2016 +0100 >>>> >>> >> Committer: Michael Osipov <micha...@apache.org> >>>> >>> >> Committed: Mon Dec 26 00:55:09 2016 +0100 >>>> >>> >> >>>> >> ---------------------------------------------------------------------- >>>> >>> >> pom.xml | 14 +- >>>> >>> >> wagon-provider-test/pom.xml | 8 +- >>>> >>> >> .../maven/wagon/http/HttpWagonTestCase.java | 273 >>>> >>> ++++++++++--------- >> >> wagon-providers/wagon-http-lightweight/pom.xml | 4 +- >>>> >>> >> .../http/LightweightHttpsWagonTest.java | 6 +- >>>> >>> >> wagon-providers/wagon-http/pom.xml | 8 +- >>>> >>> >> .../http/HttpWagonHttpServerTestCase.java | 14 +- >>>> >>> >> .../http/HttpWagonReasonPhraseTest.java | 2 +- >>>> >>> >> .../providers/http/HttpWagonTimeoutTest.java | 2 +- >>>> >>> >> .../http/HttpsWagonPreemptiveTest.java | 6 +- >>>> >>> >> .../wagon/providers/http/HttpsWagonTest.java | 6 +- >>>> >>> >> .../providers/http/HugeFileDownloadTest.java | 14 +- >>>> >>> >> wagon-providers/wagon-ssh/pom.xml | 8 +- >>>> >>> >> .../ssh/jsch/ScpWagonWithProxyTest.java | 16 +- >>>> >>> >> wagon-providers/wagon-webdav-jackrabbit/pom.xml | 8 +- >>>> >>> >> .../wagon/providers/webdav/WebDavWagonTest.java | 73 ++--- >>>> >>> >> .../providers/webdav/WebDavsWagonTest.java | 6 +- >>>> >>> >> wagon-tcks/wagon-tck-http/pom.xml | 12 +- >>>> >>> >> .../wagon/tck/http/fixture/ServerFixture.java | 52 ++-- >>>> >>> >> 19 files changed, 278 insertions(+), 254 deletions(-) >>>> >>> >> ---------------------------------------------------------------------- >>>> >>> >> >>>> >> >>>> >> http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/2e1c807e/pom.xml >>>> >>> >> ---------------------------------------------------------------------- >>>> >>> >> diff --git a/pom.xml b/pom.xml >>>> >>> >> index e127da4..a90a1ba 100644 >>>> >>> >> --- a/pom.xml >>>> >>> >> +++ b/pom.xml >>>> >>> >> @@ -313,14 +313,14 @@ under the License. >>>> >>> >> </dependency> >>>> >>> >> >>>> >> <dependency> >>>> >>> >> - <groupId>org.mortbay.jetty</groupId> >>>> >>> >> - <artifactId>jetty</artifactId> >>>> >>> >> - <version>6.1.26</version> >>>> >>> >> + <groupId>org.eclipse.jetty.aggregate</groupId> >>>> >>> >> + <artifactId>jetty-all</artifactId> >>>> >>> >> + <version>8.1.22.v20160922</version> >>>> >>> >> </dependency> >>>> >>> >> <dependency> >>>> >>> >> - <groupId>org.mortbay.jetty</groupId> >>>> >>> >> - <artifactId>servlet-api</artifactId> >>>> >>> >> - <version>2.5-20081211</version> >>>> >>> >> + <groupId>javax.servlet</groupId> >>>> >>> >> + <artifactId>javax.servlet-api</artifactId> >>>> >>> >> + <version>3.0.1</version> >>>> >>> >> </dependency> >>>> >>> >> </dependencies> >>>> >>> >> </dependencyManagement> >>>> >>> >> @@ -565,5 +565,5 @@ under the License. >>>> >>> >> </reporting> >>>> >>> >> </profile> >>>> >>> >> </profiles> >>>> >>> >> - >>>> >>> >> + >>>> >>> >> </project> >>>> >>> >> >>>> >> http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/ >>>> >>> >> 2e1c807e/wagon-provider-test/pom.xml >>>> >>> >> ---------------------------------------------------------------------- >>>> >>> >> diff --git a/wagon-provider-test/pom.xml b/wagon-provider-test/pom.xml >>>> >>> >> index b19e7ac..9b0f4e5 100644 >>>> >>> >> --- a/wagon-provider-test/pom.xml >>>> >>> >> +++ b/wagon-provider-test/pom.xml >>>> >>> >> @@ -51,12 +51,12 @@ under the License. >>>> >>> >> <scope>compile</scope> >>>> >>> >> </dependency> >>>> >>> >> <dependency> >>>> >>> >> - <groupId>org.mortbay.jetty</groupId> >>>> >>> >> - <artifactId>jetty</artifactId> >>>> >>> >> + <groupId>org.eclipse.jetty.aggregate</groupId> >>>> >>> >> + <artifactId>jetty-all</artifactId> >>>> >>> >> </dependency> >>>> >>> >> <dependency> >>>> >>> >> - <groupId>org.mortbay.jetty</groupId> >>>> >>> >> - <artifactId>servlet-api</artifactId> >>>> >>> >> + <groupId>javax.servlet</groupId> >>>> >>> >> + <artifactId>javax.servlet-api</artifactId> >>>> >>> >> </dependency> >>>> >>> >> <dependency> >>>> >>> >> <groupId>org.slf4j</groupId> >>>> >>> >> >>>> >> http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/ >>>> >>> >> 2e1c807e/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/ >>>> >>> >> HttpWagonTestCase.java >>>> >>> >> ---------------------------------------------------------------------- >>>> >>> >> diff --git 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 >>>> >>> >> index dfc499e..cf479fd 100644 >>>> >>> >> --- 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,21 @@ import org.apache.maven.wagon.resource.Resource; >>>> >>> >> 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.security.ConstraintMapping; >>>> >>> >> +import org.eclipse.jetty.security.ConstraintSecurityHandler; >>>> >>> >> +import org.eclipse.jetty.security.HashLoginService; >>>> >>> >> +import org.eclipse.jetty.security.SecurityHandler; >>>> >>> >> +import org.eclipse.jetty.security.authentication.BasicAuthenticator; >>>> >>> >> +import org.eclipse.jetty.server.Request; >>>> >>> >> +import org.eclipse.jetty.server.Response; >>>> >>> >> +import org.eclipse.jetty.server.Server; >>>> >>> >> +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.servlet.DefaultServlet; >>>> >>> >> +import org.eclipse.jetty.servlet.ServletContextHandler; >>>> >>> >> +import org.eclipse.jetty.servlet.ServletHolder; >>>> >>> >> >>>> >> import javax.servlet.ServletException; >>>> >>> >> import javax.servlet.http.HttpServletRequest; >>>> >>> >> @@ -99,9 +100,12 @@ public abstract class HttpWagonTestCase >>>> >>> >> server = new Server( 0 ); >>>> >>> >> >>>> >> PutHandler putHandler = new PutHandler( repositoryDirectory ); >>>> >>> >> - server.addHandler( putHandler ); >>>> >>> >> >>>> >> - createContext( server, repositoryDirectory ); >>>> >>> >> + ServletContextHandler context = createContext( server, >>>> >>> >> repositoryDirectory ); >>>> >>> >> + HandlerCollection handlers = new HandlerCollection(); >>>> >>> >> + handlers.addHandler( putHandler ); >>>> >>> >> + handlers.addHandler( context ); >>>> >>> >> + server.setHandler( handlers ); >>>> >>> >> >>>> >> addConnectors( server ); >>>> >>> >> >>>> >> @@ -120,13 +124,14 @@ public abstract class HttpWagonTestCase >>>> >>> >> return server.getConnectors()[0].getLocalPort(); >>>> >>> >> } >>>> >>> >> >>>> >> - protected void createContext( Server server, File >>>> >>> repositoryDirectory >> >> ) >>>> >>> >> + protected ServletContextHandler createContext( Server server, File >>>> >>> >> repositoryDirectory ) >>>> >>> >> throws IOException >>>> >>> >> { >>>> >>> >> - Context root = new Context( server, "/", Context.SESSIONS ); >>>> >>> >> + ServletContextHandler root = new ServletContextHandler( >>>> >>> >> ServletContextHandler.SESSIONS ); >>>> >>> >> root.setResourceBase( repositoryDirectory.getAbsolutePath() ); >>>> >>> >> ServletHolder servletHolder = new ServletHolder( new >>>> >>> >> DefaultServlet() ); >>>> >>> >> root.addServlet( servletHolder, "/*" ); >>>> >>> >> + return root; >>>> >>> >> } >>>> >>> >> >>>> >> protected void tearDownWagonTestingFixtures() >>>> >>> >> @@ -216,7 +221,7 @@ public abstract class HttpWagonTestCase >>>> >>> >> server.setHandler( handler ); >>>> >>> >> addConnectors( server ); >>>> >>> >> server.start(); >>>> >>> >> - wagon.connect( new Repository( "id", getProtocol() + >>>> >>> >> "://localhost:" >>>> >>> >> + wagon.connect( new Repository( "id", getProtocol() + >>>> >>> >> "://localhost:" >>>> >>> >> + server.getConnectors()[0].getLocalPort() ) ); >>>> >>> >> wagon.getToStream( "resource", new ByteArrayOutputStream() ); >>>> >>> >> wagon.disconnect(); >>>> >>> >> @@ -309,19 +314,19 @@ public abstract class HttpWagonTestCase >>>> >>> >> >>>> >> AbstractHandler handler = new AbstractHandler() >>>> >>> >> { >>>> >>> >> - public void handle( String s, HttpServletRequest >>>> >>> request, >> >> HttpServletResponse response, int i ) >>>> >>> >> - throws IOException, ServletException >>>> >>> >> + public void handle( String target, Request baseRequest, >>>> >>> >> HttpServletRequest request, >>>> >>> >> + HttpServletResponse response ) throws IOException, >>>> >>> >> ServletException >>>> >>> >> { >>>> >>> >> if ( called.get() ) >>>> >>> >> { >>>> >>> >> response.setStatus( HttpServletResponse.SC_OK ); >>>> >>> >> - ( (Request) request ).setHandled( true ); >>>> >>> >> + baseRequest.setHandled( true ); >>>> >>> >> } >>>> >>> >> else >>>> >>> >> { >>>> >>> >> called.set( true ); >>>> >>> >> response.setStatus( SC_TOO_MANY_REQUESTS ); >>>> >>> >> - ( (Request) request ).setHandled( true ); >>>> >>> >> + baseRequest.setHandled( true ); >>>> >>> >> >>>> >> } >>>> >>> >> } >>>> >>> >> @@ -456,19 +461,19 @@ public abstract class HttpWagonTestCase >>>> >>> >> >>>> >> AbstractHandler handler = new AbstractHandler() >>>> >>> >> { >>>> >>> >> - public void handle( String s, HttpServletRequest >>>> >>> request, >> >> HttpServletResponse response, int i ) >>>> >>> >> - throws IOException, ServletException >>>> >>> >> + public void handle( String target, Request baseRequest, >>>> >>> >> HttpServletRequest request, >>>> >>> >> + HttpServletResponse response ) throws IOException, >>>> >>> >> ServletException >>>> >>> >> { >>>> >>> >> if ( called.get() ) >>>> >>> >> { >>>> >>> >> response.setStatus( >>>> >>> HttpServletResponse.SC_INTERNAL_SERVER_ERROR >> >> ); >>>> >>> >> - ( (Request) request ).setHandled( true ); >>>> >>> >> + baseRequest.setHandled( true ); >>>> >>> >> } >>>> >>> >> else >>>> >>> >> { >>>> >>> >> called.set( true ); >>>> >>> >> response.setStatus( SC_TOO_MANY_REQUESTS ); >>>> >>> >> - ( (Request) request ).setHandled( true ); >>>> >>> >> + baseRequest.setHandled( true ); >>>> >>> >> } >>>> >>> >> } >>>> >>> >> }; >>>> >>> >> @@ -543,12 +548,13 @@ public abstract class HttpWagonTestCase >>>> >>> >> Server server = new Server( getTestRepositoryPort() ); >>>> >>> >> >>>> >> String localRepositoryPath = FileTestUtils. >>>> >>> >> getTestOutputDir().toString(); >>>> >>> >> - Context root = new Context( server, "/", Context.SESSIONS ); >>>> >>> >> + ServletContextHandler root = new ServletContextHandler( >>>> >>> >> ServletContextHandler.SESSIONS ); >>>> >>> >> root.setResourceBase( localRepositoryPath ); >>>> >>> >> ServletHolder servletHolder = new ServletHolder( new >>>> >>> >> DefaultServlet() ); >>>> >>> >> servletHolder.setInitParameter( "gzip", "true" ); >>>> >>> >> root.addServlet( servletHolder, "/*" ); >>>> >>> >> addConnectors( server ); >>>> >>> >> + server.setHandler( root ); >>>> >>> >> server.start(); >>>> >>> >> >>>> >> try >>>> >>> >> @@ -655,12 +661,12 @@ public abstract class HttpWagonTestCase >>>> >>> >> { >>>> >>> >> StreamingWagon wagon = (StreamingWagon) getWagon(); >>>> >>> >> >>>> >> - Server server = new Server( 0 ); >>>> >>> >> + Server realServer = new Server( 0 ); >>>> >>> >> TestHeaderHandler handler = new TestHeaderHandler(); >>>> >>> >> >>>> >> - server.setHandler( handler ); >>>> >>> >> - addConnectors( server ); >>>> >>> >> - server.start(); >>>> >>> >> + realServer.setHandler( handler ); >>>> >>> >> + addConnectors( realServer ); >>>> >>> >> + realServer.start(); >>>> >>> >> >>>> >> Server redirectServer = new Server( 0 ); >>>> >>> >> >>>> >> @@ -679,10 +685,10 @@ public abstract class HttpWagonTestCase >>>> >>> >> protocol = "https"; >>>> >>> >> } >>>> >>> >> >>>> >> - String redirectUrl = protocol + "://localhost:" + >>>> >>> >> server.getConnectors()[0].getLocalPort(); >>>> >>> >> + String redirectUrl = protocol + "://localhost:" + >>>> >>> >> realServer.getConnectors()[0].getLocalPort(); >>>> >>> >> >>>> >> RedirectHandler redirectHandler = >>>> >>> >> - new RedirectHandler( "Found", >>>> >>> HttpServletResponse.SC_SEE_OTHER, >> >> redirectUrl, null ); >>>> >>> >> + new RedirectHandler( "See Other", >>>> >>> HttpServletResponse.SC_SEE_OTHER, >> >> redirectUrl, null ); >>>> >>> >> >>>> >> redirectServer.setHandler( redirectHandler ); >>>> >>> >> >>>> >> @@ -702,14 +708,14 @@ public abstract class HttpWagonTestCase >>>> >>> >> String found = FileUtils.fileRead( tmpResult ); >>>> >>> >> assertEquals( "found:'" + found + "'", "Hello, World!", >>>> >>> found >> >> ); >>> >>>
