From 08f36283b9cf53f02cb9cf724fd9c5e999b1e87d Mon Sep 17 00:00:00 2001 From: Paul Tuckey Date: Thu, 19 Oct 2023 14:36:36 +1300 Subject: [PATCH 1/4] add release --- README.md | 7 +- container-test/example-webapp/pom.xml | 2 +- .../test-with-testcontainers/pom.xml | 2 +- pom.xml | 2 +- src/doc/manual/5.0/index.html | 8 +- src/doc/manual/5.0/introduction.html | 11 ++ .../5.0/urlrewrite-conf-overview-sample.html | 2 +- src/doc/manual/5.0/urlrewrite.xml | 4 +- .../web/filters/urlrewrite/ConfHandler.java | 1 + .../filters/urlrewrite/dtds/urlrewrite5.0.dtd | 125 ++++++++++++++++++ src/test/webapp/WEB-INF/urlrewrite.xml | 4 +- 11 files changed, 152 insertions(+), 16 deletions(-) create mode 100644 src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite5.0.dtd diff --git a/README.md b/README.md index da9a82d8..fd35744c 100644 --- a/README.md +++ b/README.md @@ -23,22 +23,21 @@ See the [manual](https://tuckey.org/urlrewrite/manual/4.0/index.html) for more i ## Quick Start - * Add Maven dependency below or add urlrewritefilter-4.0.3.jar directly into your WEB-INF/lib directory. + * Add Maven dependency below or add urlrewritefilter-5.1.2.jar directly into your WEB-INF/lib directory. ```xml org.tuckey urlrewritefilter - 4.0.3 + 5.1.2 ``` -For Servlet API 5.0, use Jakarta classifier like +For Servlet API 4 or less (javax), use the old version 4.x ```xml org.tuckey urlrewritefilter 4.0.3 - jakarta ``` * Add the following to your WEB-INF/web.xml (add it near the top above your servlet mappings (if you have any)): (see filter parameters for more options) diff --git a/container-test/example-webapp/pom.xml b/container-test/example-webapp/pom.xml index c74e2ab7..a10d846d 100644 --- a/container-test/example-webapp/pom.xml +++ b/container-test/example-webapp/pom.xml @@ -58,7 +58,7 @@ org.tuckey urlrewritefilter - 5.1.1 + 5.1.2 jakarta.servlet diff --git a/container-test/test-with-testcontainers/pom.xml b/container-test/test-with-testcontainers/pom.xml index 1e8402e8..c53a9b45 100644 --- a/container-test/test-with-testcontainers/pom.xml +++ b/container-test/test-with-testcontainers/pom.xml @@ -46,7 +46,7 @@ org.tuckey urlrewritefilter - 5.1.1 + 5.1.2 diff --git a/pom.xml b/pom.xml index be9b9d7a..2fcfdc9c 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.tuckey urlrewritefilter jar - 5.1.1 + 5.1.2 UrlRewriteFilter http://www.tuckey.org/urlrewrite/ 2001 diff --git a/src/doc/manual/5.0/index.html b/src/doc/manual/5.0/index.html index f6e8a402..5468bd49 100644 --- a/src/doc/manual/5.0/index.html +++ b/src/doc/manual/5.0/index.html @@ -86,12 +86,12 @@

Install

  1. Add Maven dependency below or add - urlrewritefilter-5.0.0.jar + urlrewritefilter-5.1.2.jar directly into your WEB-INF/lib directory. 
    <dependency>
     <groupId>org.tuckey</groupId>
     <artifactId>urlrewritefilter</artifactId>
-    <version>5.0.0</version>
+    <version>5.1.2</version>
 </dependency>
  2. Add the following to your WEB-INF/web.xml (add it near the top above your servlet mappings (if you have any)): (see filter @@ -106,7 +106,7 @@

    Install

    <dispatcher>REQUEST</dispatcher> <dispatcher>FORWARD</dispatcher> </filter-mapping>
    3. -
  3. Add urlrewrite.xml +
  4. Add urlrewrite.xml into your WEB-INF directory. (src/main/webapp/WEB-INF/ for Maven users)
  5. Restart the context.
@@ -255,7 +255,7 @@

Configuration File WEB-INF/urlrewrite.xml

Configuration is done via a simple XML file that lives in your WEB-INF folder. It should be named urlrewrite.xml. - It may be helpful to read the UrlRewriteFilter DTD + It may be helpful to read the UrlRewriteFilter DTD (Document Type Definition). Please also make sure you look at the examples. A simple configuration file looks like:

diff --git a/src/doc/manual/5.0/introduction.html b/src/doc/manual/5.0/introduction.html index 77c6d147..16822954 100644 --- a/src/doc/manual/5.0/introduction.html +++ b/src/doc/manual/5.0/introduction.html @@ -188,6 +188,17 @@

License

Changelog