Skip to content

Commit

Permalink
Merge branch 'jetty-12.0.x' of https://github.com/eclipse/jetty.project
Browse files Browse the repository at this point in the history
… into jetty-12.0.x-old-docs-remove-logging-sections

* 'jetty-12.0.x' of https://github.com/eclipse/jetty.project:
  Rename process to handle (jetty#9385)
  Bump maven-deploy-plugin from 3.0.0 to 3.1.0
  Bump asciidoctorj-diagram from 2.2.3 to 2.2.4
  Bump jakarta.servlet.jsp-api from 3.0.0 to 3.1.1
  Bump maven-invoker-plugin from 3.4.0 to 3.5.0
  Bump maven.surefire.plugin.version from 3.0.0-M8 to 3.0.0-M9
  Bump maven-javadoc-plugin from 3.4.1 to 3.5.0
  Bump tycho-p2-repository-plugin from 3.0.1 to 3.0.2
  Bump maven.version from 3.8.7 to 3.9.0
  Remove jetty-ant (jetty#9382)
  Added inceptionDates.csv
  Issue jetty#9336 - remember ContentSources to fail from ChunksPart
  • Loading branch information
Greg Poulos committed Feb 16, 2023
2 parents 7505193 + 0ca6295 commit 1ca6761
Show file tree
Hide file tree
Showing 347 changed files with 5,886 additions and 7,430 deletions.
1 change: 1 addition & 0 deletions build/build-resources/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- versions for these plugins are not based on parent pom -->
<maven.remote-resources.plugin.version>3.0.0</maven.remote-resources.plugin.version>
<maven.surefire.plugin.version>3.0.0-M9</maven.surefire.plugin.version>
<maven.deploy.skip>true</maven.deploy.skip>
<maven.javadoc.skip>true</maven.javadoc.skip>
<skipTests>true</skipTests>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public class HandlerDocs
public static class HelloHandler0 extends Handler.Abstract
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
response.setStatus(200);
response.getHeaders().add(HttpHeader.CONTENT_LENGTH, "text/plain");
Expand All @@ -51,7 +51,7 @@ public boolean process(Request request, Response response, Callback callback) th
public static class HelloHandler1 extends Handler.Abstract
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
response.setStatus(200);
response.getHeaders().add(HttpHeader.CONTENT_LENGTH, "text/plain");
Expand All @@ -63,7 +63,7 @@ public boolean process(Request request, Response response, Callback callback)
public static class HelloHandler2 extends Handler.Abstract.NonBlocking
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
response.setStatus(200);
response.getHeaders().add(HttpHeader.CONTENT_LENGTH, "text/plain");
Expand All @@ -75,7 +75,7 @@ public boolean process(Request request, Response response, Callback callback)
public static class HelloHandler3 extends Handler.Abstract.NonBlocking
{
@Override
public boolean process(Request request, Response response, Callback callback) throws IOException
public boolean handle(Request request, Response response, Callback callback) throws IOException
{
response.setStatus(200);
response.getHeaders().add(HttpHeader.CONTENT_LENGTH, "text/plain");
Expand All @@ -98,7 +98,7 @@ public boolean process(Request request, Response response, Callback callback) th
public static class HelloHandler4 extends Handler.Abstract
{
@Override
public boolean process(Request request, Response response, Callback callback) throws IOException
public boolean handle(Request request, Response response, Callback callback) throws IOException
{
response.setStatus(200);
response.getHeaders().add(HttpHeader.CONTENT_LENGTH, "text/plain");
Expand All @@ -119,7 +119,7 @@ public boolean process(Request request, Response response, Callback callback) th
public static class HelloHandler5 extends Handler.Abstract.NonBlocking
{
@Override
public boolean process(Request request, Response response, Callback callback) throws IOException
public boolean handle(Request request, Response response, Callback callback) throws IOException
{
response.setStatus(200);
response.getHeaders().add(HttpHeader.CONTENT_LENGTH, "text/plain");
Expand Down Expand Up @@ -160,7 +160,7 @@ public void cancel()
public static class DiscriminatingGreeterHandler extends Handler.Abstract.NonBlocking
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
if (!HttpMethod.GET.is(request.getMethod()) || !"greeting".equals(Request.getPathInContext(request)))
return false;
Expand All @@ -175,7 +175,7 @@ public boolean process(Request request, Response response, Callback callback)
public static class EchoHandler extends Handler.Abstract.NonBlocking
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
response.setStatus(200);
response.getHeaders().put(HttpHeader.CONTENT_TYPE, request.getHeaders().get(HttpHeader.CONTENT_TYPE));
Expand All @@ -192,7 +192,7 @@ public boolean process(Request request, Response response, Callback callback)
public static class RootHandler extends Handler.Sequence
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
final StringBuilder index = new StringBuilder();
index.append("<h2>Handler Demos</h2>\n<ul>\n");
Expand All @@ -202,7 +202,7 @@ public boolean process(Request request, Response response, Callback callback) th
String name = handler.getClass().getSimpleName().replace("Handler", "");
String path = "/" + name;
if (Request.getPathInContext(request).equals(name))
return handler.process(request, response, callback);
return handler.handle(request, response, callback);

index.append("<li><a href=\"")
.append(URIUtil.addPaths(request.getContext().getContextPath(), path))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public void simple() throws Exception
server.setHandler(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
// Succeed the callback to write the response.
callback.succeeded();
Expand Down Expand Up @@ -478,7 +478,7 @@ public void handlerTree()
class LoggingHandler extends Handler.Abstract
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
callback.succeeded();
return true;
Expand All @@ -488,7 +488,7 @@ public boolean process(Request request, Response response, Callback callback) th
class App1Handler extends Handler.Abstract
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
callback.succeeded();
return true;
Expand All @@ -498,7 +498,7 @@ public boolean process(Request request, Response response, Callback callback) th
class App2Handler extends Handler.Abstract
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
callback.succeeded();
return true;
Expand All @@ -525,7 +525,7 @@ class MyHandler extends Handler.Abstract
{
@Override
// tag::handlerAPI[]
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
return true;
}
Expand All @@ -539,7 +539,7 @@ public void handlerHello() throws Exception
class HelloWorldHandler extends Handler.Abstract
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
response.setStatus(200);
response.getHeaders().put(HttpHeader.CONTENT_TYPE, "text/html; charset=UTF-8");
Expand Down Expand Up @@ -576,7 +576,7 @@ public void handlerFilter() throws Exception
class HelloWorldHandler extends Handler.Abstract
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
return true;
}
Expand All @@ -586,7 +586,7 @@ public boolean process(Request request, Response response, Callback callback)
class FilterHandler extends Handler.Wrapper
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
String path = Request.getPathInContext(request);
if (path.startsWith("/old_path/"))
Expand All @@ -608,7 +608,7 @@ public HttpURI getHttpURI()
}

// Forward to the next Handler.
return super.process(request, response, callback);
return super.handle(request, response, callback);
}
}

Expand All @@ -631,7 +631,7 @@ public void contextHandler() throws Exception
class ShopHandler extends Handler.Abstract
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
// Implement the shop, remembering to complete the callback.
return true;
Expand Down Expand Up @@ -660,7 +660,7 @@ public void contextHandlerCollection() throws Exception
class ShopHandler extends Handler.Abstract
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
// Implement the shop, remembering to complete the callback.
return true;
Expand All @@ -670,7 +670,7 @@ public boolean process(Request request, Response response, Callback callback) th
class RESTHandler extends Handler.Abstract
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
// Implement the REST APIs, remembering to complete the callback.
return true;
Expand Down Expand Up @@ -849,7 +849,7 @@ public void contextGzipHandler() throws Exception
class ShopHandler extends Handler.Abstract
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
// Implement the shop, remembering to complete the callback.
return true;
Expand All @@ -859,7 +859,7 @@ public boolean process(Request request, Response response, Callback callback) th
class RESTHandler extends Handler.Abstract
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
// Implement the REST APIs, remembering to complete the callback.
return true;
Expand Down
Loading

0 comments on commit 1ca6761

Please sign in to comment.