diff --git a/.github_changelog_generator b/.github_changelog_generator
index 073fac8..19e45d2 100644
--- a/.github_changelog_generator
+++ b/.github_changelog_generator
@@ -1 +1 @@
-future-release=1.0.6
+future-release=1.1.0
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 61a9130..fb7f4a8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 2ce963b..c55072b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,8 @@
-
+
+
+
+
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15337f6..5a59454 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
# Changelog
-## [1.0.5](https://github.com/ethauvin/HttpStatus/tree/1.0.5) (2021-03-19)
+## [1.0.5](https://github.com/ethauvin/HttpStatus/tree/1.0.5) (2021-03-20)
[Full Changelog](https://github.com/ethauvin/HttpStatus/compare/1.0.4...1.0.5)
diff --git a/LICENSE.txt b/LICENSE.txt
index 2fba8ed..bc71010 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2015-2021, Erik C. Thauvin (erik@thauvin.net)
+Copyright (c) 2015-2022, Erik C. Thauvin (erik@thauvin.net)
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/README.md b/README.md
index a8f2c4c..cabb8b2 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ Include the following in your `build.gradle` file:
```gradle
dependencies {
- implementation 'net.thauvin.erik.httpstatus:httpstatus:1.0.6'
+ implementation 'net.thauvin.erik.httpstatus:httpstatus:1.1.0'
}
```
@@ -47,7 +47,7 @@ or as a Maven artifact:
net.thauvin.erik.httpstatus
httpstatus
- 1.0.6
+ 1.1.0
```
@@ -250,7 +250,7 @@ Status Code | Reason
You can query the reason phrase for status codes as follows:
```sh
-$ java -jar httpstatus-1.0.6.jar 404 500
+$ java -jar httpstatus-1.1.0.jar 404 500
404: Not Found
500: Internal Server Error
```
@@ -258,7 +258,7 @@ $ java -jar httpstatus-1.0.6.jar 404 500
If no status code is specified, all will be printed:
```sh
-$ java -jar httpstatus-1.0.6.jar
+$ java -jar httpstatus-1.1.0.jar
100: Continue
101: Switching Protocols
102: Processing
diff --git a/appveyor.yml b/appveyor.yml
index 877b3ed..9747d51 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -16,7 +16,7 @@ test_script:
branches:
only:
- master
- - 1.0.6-dev
+ - 1.1.0-dev
cache:
- C:\Users\appveyor\.gradle
diff --git a/build.gradle b/build.gradle
index 9b02669..12a7d51 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,8 +8,8 @@ plugins {
id 'pmd'
id 'com.github.ben-manes.versions' version '0.42.0'
id 'net.thauvin.erik.gradle.semver' version '1.0.4'
- id 'com.github.spotbugs' version '5.0.6'
- id 'org.sonarqube' version '3.3'
+ id 'com.github.spotbugs' version '5.0.10'
+ id 'org.sonarqube' version '3.4.0.2513'
}
import com.github.spotbugs.snom.SpotBugsTask
@@ -33,8 +33,8 @@ mainClassName = 'net.thauvin.erik.httpstatus.Reasons'
ext {
versions = [
- pmd: '6.35.0',
- spotbugs: '4.6.0'
+ pmd : '6.47.0',
+ spotbugs: '4.7.1'
]
}
@@ -45,9 +45,13 @@ repositories {
}
dependencies {
- compileOnly 'javax.servlet:javax.servlet-api:4.0.1'
- compileOnly 'javax.servlet.jsp:jsp-api:2.2.1-b03'
- compileOnly 'javax.el:javax.el-api:3.0.1-b06'
+// compileOnly 'javax.servlet:javax.servlet-api:4.0.1'
+// compileOnly 'javax.servlet.jsp:jsp-api:2.2.1-b03'
+// compileOnly 'javax.el:javax.el-api:3.0.1-b06'
+
+ compileOnly 'jakarta.servlet:jakarta.servlet-api:6.0.0'
+ compileOnly 'jakarta.servlet.jsp:jakarta.servlet.jsp-api:3.1.0'
+ compileOnly 'jakarta.el:jakarta.el-api:5.0.1'
spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.12.0'
spotbugsPlugins 'com.mebigfatguy.sb-contrib:sb-contrib:7.4.7'
@@ -55,7 +59,7 @@ dependencies {
compileOnly "com.github.spotbugs:spotbugs-annotations:$versions.spotbugs"
testCompileOnly "com.github.spotbugs:spotbugs-annotations:$versions.spotbugs"
- testImplementation 'org.testng:testng:7.5'
+ testImplementation 'org.testng:testng:7.6.1'
}
tasks.withType(JavaCompile) {
@@ -63,8 +67,8 @@ tasks.withType(JavaCompile) {
}
java {
- sourceCompatibility = JavaVersion.VERSION_1_8
- targetCompatibility = JavaVersion.VERSION_1_8
+ sourceCompatibility = JavaVersion.VERSION_11
+ targetCompatibility = JavaVersion.VERSION_11
withJavadocJar()
withSourcesJar()
}
@@ -106,7 +110,7 @@ spotbugs {
}
pmd {
- toolVersion = versions.pmd
+ toolVersion = versions.pmd
ignoreFailures = true
ruleSets = []
ruleSetFiles = files("${projectDir}/config/pmd.xml")
@@ -160,7 +164,7 @@ publishing {
url = project.version.contains('SNAPSHOT')
? 'https://oss.sonatype.org/content/repositories/snapshots/'
: 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
- }
+ }
credentials(PasswordCredentials)
}
}
@@ -173,7 +177,11 @@ signing {
task copyToDeploy(type: Copy) {
from(configurations.runtimeClasspath) {
- exclude('javax.servlet-api-*.jar', 'jsp-api-*.jar')
+ exclude('javax.servlet-api-*.jar',
+ 'jsp-api-*.jar',
+ 'jakarta.servlet-*.jar',
+ 'jakarta-servlet.*.jar',
+ 'jakarta.el-api*.jar')
}
from jar
into deployDir
@@ -197,12 +205,12 @@ task release {
task pandoc(type: Exec) {
group = 'Documentation'
final def pandoc_args = ['--from', 'gfm',
- '--to', 'html5',
- '--metadata', "pagetitle=$mavenDescription",
- '-s',
- '-c', 'github-pandoc.css',
- '-o', 'docs/README.html',
- 'README.md']
+ '--to', 'html5',
+ '--metadata', "pagetitle=$mavenDescription",
+ '-s',
+ '-c', 'github-pandoc.css',
+ '-o', 'docs/README.html',
+ 'README.md']
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
commandLine(['cmd', '/c', 'pandoc'] + pandoc_args)
} else {
@@ -216,7 +224,7 @@ task pandoc(type: Exec) {
}
jacoco {
- toolVersion = '0.8.9-SNAPSHOT'
+ toolVersion = '0.8.9-SNAPSHOT'
}
jacocoTestReport {
diff --git a/deploy.sh b/deploy.sh
new file mode 100644
index 0000000..0497b23
--- /dev/null
+++ b/deploy.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+./gradlew deploy
+[ $? -eq 0 ] && scp deploy/*.jar nix3.thauvin.us:/opt/lib/jtalk-ee/httpstatus
diff --git a/docs/README.html b/docs/README.html
index 4afcd01..f4eafc6 100644
--- a/docs/README.html
+++ b/docs/README.html
@@ -15,6 +15,7 @@
pre > code.sourceCode { white-space: pre; position: relative; }
pre > code.sourceCode > span { display: inline-block; line-height: 1.25; }
pre > code.sourceCode > span:empty { height: 1.2em; }
+ .sourceCode { overflow: visible; }
code.sourceCode > span { color: inherit; text-decoration: inherit; }
div.sourceCode { margin: 1em 0; }
pre.sourceCode { margin: 0; }
@@ -49,7 +50,7 @@
code span.an { color: #60a0b0; font-weight: bold; font-style: italic; } /* Annotation */
code span.at { color: #7d9029; } /* Attribute */
code span.bn { color: #40a070; } /* BaseN */
- code span.bu { } /* BuiltIn */
+ code span.bu { color: #008000; } /* BuiltIn */
code span.cf { color: #007020; font-weight: bold; } /* ControlFlow */
code span.ch { color: #4070a0; } /* Char */
code span.cn { color: #880000; } /* Constant */
@@ -62,7 +63,7 @@
code span.ex { } /* Extension */
code span.fl { color: #40a070; } /* Float */
code span.fu { color: #06287e; } /* Function */
- code span.im { } /* Import */
+ code span.im { color: #008000; font-weight: bold; } /* Import */
code span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Information */
code span.kw { color: #007020; font-weight: bold; } /* Keyword */
code span.op { color: #666666; } /* Operator */
@@ -74,46 +75,86 @@
code span.va { color: #19177c; } /* Variable */
code span.vs { color: #4070a0; } /* VerbatimString */
code span.wa { color: #60a0b0; font-weight: bold; font-style: italic; } /* Warning */
+ .display.math{display: block; text-align: center; margin: 0.5rem auto;}
+
HttpStatus JSP Tag Library
-
-
-
-A simple JSP Tag Library to display the code, reason, cause and/or message for HTTP status codes in JSP error pages.
+![]()
![]()
+![]()
![]()
![]()
+![]()
![]()
![]()
+A simple JSP
+Tag Library to display the code, reason, cause and/or message for HTTP
+status codes in JSP error pages.
For example:
-<%@ page isErrorPage="true" %>
-<%@ taglib prefix="hs" uri="http://erik.thauvin.net/taglibs/httpstatus" %>
-<html><head>
-<title><hs:code/> <hs:reason default="Server Error"/></title>
-</head>
-<h1><hs:reason default="Server Error"/></h1>
-Cause: <pre><hs:cause default="Unable to complete your request."/></pre>
-Message: <pre><hs:message default="A server error has occured."/></pre>
-...
<%@ page isErrorPage="true" %>
+<%@ taglib prefix="hs" uri="http://erik.thauvin.net/taglibs/httpstatus" %>
+<html><head>
+<title><hs:code/> <hs:reason default="Server Error"/></title>
+</head>
+<h1><hs:reason default="Server Error"/></h1>
+Cause: <pre><hs:cause default="Unable to complete your request."/></pre>
+Message: <pre><hs:message default="A server error has occured."/></pre>
+...
or
-<%@ page isErrorPage="true" import="net.thauvin.erik.httpstatus.Reasons" %>
-<%= Reasons.getReasonPhrase(pageContext.getErrorData().getStatusCode()) %>
would display on a 501 status code:
-Not Implemented
-
-
+<%@ page isErrorPage="true" import="net.thauvin.erik.httpstatus.Reasons" %>
+<%= Reasons.getReasonPhrase(pageContext.getErrorData().getStatusCode()) %>
would display on a 501
+status code:
+Not Implemented
+
Include the following in your build.gradle file:
-dependencies {
- implementation 'net.thauvin.erik.httpstatus:httpstatus:1.0.6'
-}
-
+dependencies {
+ implementation 'net.thauvin.erik.httpstatus:httpstatus:1.1.0'
+}
or as a Maven artifact:
-<dependency>
- <groupId>net.thauvin.erik.httpstatus</groupId>
- <artifactId>httpstatus</artifactId>
- <version>1.0.6</version>
-</dependency>
<dependency>
+ <groupId>net.thauvin.erik.httpstatus</groupId>
+ <artifactId>httpstatus</artifactId>
+ <version>1.1.0</version>
+</dependency>
hs:cause
-The <hs:cause/> tag displays the cause of current HTTP status code, if any. A shorthand for:
-<%= pageContext.getErrorData().getThrowable().getCause().getLocalizedMessage() %>
The <hs:cause/> tag displays the cause of current
+HTTP status code, if any. A shorthand for:
+<%= pageContext.getErrorData().getThrowable().getCause().getLocalizedMessage() %>
Optional attributes are:
@@ -129,16 +170,22 @@
escapeXml |
-Converts <, >, &, ', " to their corresponding entity codes. Value is true by default. |
+Converts <, >, &, ', " to their corresponding entity codes.
+Value is true by default. |
hs:code
-The <hs:code/> tag displays the current HTTP status code, if any. A shorthand for:
-<%= pageContext.getErrorData().getStatusCode() %>
The <hs:code/> tag displays the current HTTP
+status code, if any. A shorthand for:
+<%= pageContext.getErrorData().getStatusCode() %>
hs:message
-The <hs:message/> tag displays the current error message, if any. A shorthand for:
-<%= request.getAttribute("javax.servlet.error.message") %>
The <hs:message/> tag displays the current error
+message, if any. A shorthand for:
+<%= request.getAttribute("javax.servlet.error.message") %>
Optional attributes are:
@@ -154,12 +201,15 @@
escapeXml |
-Converts <, >, &, ', " to their corresponding entity codes. Value is true by default. |
+Converts <, >, &, ', " to their corresponding entity codes.
+Value is true by default. |
hs:reason
-The <hs:reason/> tag displays the reason for a HTTP status code, if any. Optional attributes are:
+The <hs:reason/> tag displays the reason for a
+HTTP status code, if any. Optional attributes are:
code |
-The HTTP status error code. If not specified the current status code is used. |
+The HTTP status error code. If not specified the current status code
+is used. |
default |
@@ -178,38 +229,43 @@
escapeXml |
-Converts <, >, &, ', " to their corresponding entity codes. Value is true by default. |
+Converts <, >, &, ', " to their corresponding entity codes.
+Value is true by default. |
StatusCode Bean
-The StatusCode bean can be used to check the class of the status code error. For example, using the JSTL:
-<%@ taglib prefix="hs" uri="http://erik.thauvin.net/taglibs/httpstatus" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-
-<jsp:useBean id="statusCode" class="net.thauvin.erik.httpstatus.StatusCode"/>
-<c:set target="${statusCode}" property="code"><hs:code/></c:set>
-<c:choose>
- <c:when test="${statusCode.isClientError()}">
- An error occurred on your side. (<hs:reason/>)
- </c:when>
- <c:otherwise>
- An error occurred on our side. (<hs:message/>)
- </c:otherwise>
-</c:choose>
The StatusCode bean can be used to check the class of
+the status code error. For example, using the JSTL:
+<%@ taglib prefix="hs" uri="http://erik.thauvin.net/taglibs/httpstatus" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+
+<jsp:useBean id="statusCode" class="net.thauvin.erik.httpstatus.StatusCode"/>
+<c:set target="${statusCode}" property="code"><hs:code/></c:set>
+<c:choose>
+ <c:when test="${statusCode.isClientError()}">
+ An error occurred on your side. (<hs:reason/>)
+ </c:when>
+ <c:otherwise>
+ An error occurred on our side. (<hs:message/>)
+ </c:otherwise>
+</c:choose>
or in a Servlet:
-import net.thauvin.erik.httpstatus.StatusCode;
-
-// ---
-
-StatusCode statusCode = new StatusCode((Integer) request.getAttribute("javax.servlet.error.status_code"));
-if (statusCode.isError()) {
- if (statusCode.isServerError()) {
- String reason = statusCode.getReason();
- } else {
- // ...
- }
-}
import net.thauvin.erik.httpstatus.StatusCode;
+
+// ---
+
+StatusCode statusCode = new StatusCode((Integer) request.getAttribute("javax.servlet.error.status_code"));
+if (statusCode.isError()) {
+ if (statusCode.isServerError()) {
+ String reason = statusCode.getReason();
+ } else {
+ // ...
+ }
+}
The StatusCode bean methods are:
@@ -221,7 +277,8 @@
getReason |
-Returns the reason for the status code (eg: Internal Server Error) |
+Returns the reason for the status code (eg:
+Internal Server Error) |
isClientError |
@@ -254,7 +311,9 @@
Reasons
-The reasons are defined in a ResourceBundle properties as follows:
+The reasons are defined in a ResourceBundle
+properties as follows:
Command Line Usage
You can query the reason phrase for status codes as follows:
-$ java -jar httpstatus-1.0.6.jar 404 500
-404: Not Found
-500: Internal Server Error
$ java -jar httpstatus-1.1.0.jar 404 500
+404: Not Found
+500: Internal Server Error
If no status code is specified, all will be printed:
-$ java -jar httpstatus-1.0.6.jar
-100: Continue
-101: Switching Protocols
-102: Processing
-103: Early Hints
-200: OK
-201: Created
-202: Accepted
-203: Non-Authoritative Information
-204: No Content
-205: Reset Content
-206: Partial Content
-207: Multi-Status
-208: Already Reported
-226: IM Used
-...
$ java -jar httpstatus-1.1.0.jar
+100: Continue
+101: Switching Protocols
+102: Processing
+103: Early Hints
+200: OK
+201: Created
+202: Accepted
+203: Non-Authoritative Information
+204: No Content
+205: Reset Content
+206: Partial Content
+207: Multi-Status
+208: Already Reported
+226: IM Used
+...