One line error page. Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/5dbd74f7 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/5dbd74f7 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/5dbd74f7
Branch: refs/heads/master Commit: 5dbd74f7c40729d6af24f2316fee97e9a3d87080 Parents: 3ebff38 Author: Andy Seaborne <[email protected]> Authored: Wed Aug 3 23:51:26 2016 +0100 Committer: Andy Seaborne <[email protected]> Committed: Wed Aug 3 23:51:26 2016 +0100 ---------------------------------------------------------------------- .../jena/fuseki/jetty/FusekiErrorHandler.java | 6 ++- .../jena/fuseki/jetty/FusekiErrorHandler1.java | 57 ++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/5dbd74f7/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/FusekiErrorHandler.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/FusekiErrorHandler.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/FusekiErrorHandler.java index 40361de..5ec3882 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/FusekiErrorHandler.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/FusekiErrorHandler.java @@ -35,6 +35,10 @@ import org.eclipse.jetty.server.Request ; import org.eclipse.jetty.server.Response ; import org.eclipse.jetty.server.handler.ErrorHandler ; +/** The usual Fuseki error handler. + * Outputs a plain text message. + */ + public class FusekiErrorHandler extends ErrorHandler { public FusekiErrorHandler() {} @@ -58,7 +62,7 @@ public class FusekiErrorHandler extends ErrorHandler handleErrorPage(request, writer, response.getStatus(), reason) ; if ( ! Fuseki.VERSION.equalsIgnoreCase("development") && - ! Fuseki.VERSION.equals("${project.version}") ) + ! Fuseki.VERSION.equals("${project.version}") ) { writer.write("\n") ; writer.write("\n") ; http://git-wip-us.apache.org/repos/asf/jena/blob/5dbd74f7/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/FusekiErrorHandler1.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/FusekiErrorHandler1.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/FusekiErrorHandler1.java new file mode 100644 index 0000000..bc9eba0 --- /dev/null +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/FusekiErrorHandler1.java @@ -0,0 +1,57 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.jena.fuseki.jetty; + +import static java.lang.String.format ; + +import java.io.IOException ; + +import javax.servlet.http.HttpServletRequest ; +import javax.servlet.http.HttpServletResponse ; + +import org.apache.jena.fuseki.servlets.ServletOps ; +import org.apache.jena.web.HttpSC ; +import org.eclipse.jetty.http.HttpMethod ; +import org.eclipse.jetty.http.MimeTypes ; +import org.eclipse.jetty.server.Request ; +import org.eclipse.jetty.server.Response ; +import org.eclipse.jetty.server.handler.ErrorHandler ; + +/** One line Fuseki error handler */ +public class FusekiErrorHandler1 extends ErrorHandler +{ + public FusekiErrorHandler1() {} + + @Override + public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException + { + String method = request.getMethod(); + + if ( !method.equals(HttpMethod.GET.asString()) + && !method.equals(HttpMethod.POST.asString()) + && !method.equals(HttpMethod.HEAD.asString()) ) + return ; + + response.setContentType(MimeTypes.Type.TEXT_PLAIN_UTF_8.asString()) ; + ServletOps.setNoCache(response) ; + int code = response.getStatus() ; + String message=(response instanceof Response)?((Response)response).getReason(): HttpSC.getMessage(code) ; + response.getOutputStream().print(format("Error %d: %s\n", code, message)) ; + } +}
