From c8931eaeb879cb58e38badae26ee37b20055c56b Mon Sep 17 00:00:00 2001
From: Paul Tuckey <paul@tuckey.org>
Date: Mon, 3 Jul 2023 09:47:34 +1200
Subject: [PATCH] progress

---
 .../filters/urlrewrite/dtds/urlrewrite1.0.dtd | 103 +++++---
 .../filters/urlrewrite/dtds/urlrewrite2.0.dtd | 113 +++++----
 .../filters/urlrewrite/dtds/urlrewrite2.3.dtd | 163 +++++++------
 .../filters/urlrewrite/dtds/urlrewrite2.4.dtd | 163 +++++++------
 .../filters/urlrewrite/dtds/urlrewrite2.5.dtd | 167 +++++++------
 .../filters/urlrewrite/dtds/urlrewrite2.6.dtd | 167 +++++++------
 .../filters/urlrewrite/dtds/urlrewrite3.0.dtd | 205 +++++++++-------
 .../filters/urlrewrite/dtds/urlrewrite3.1.dtd | 205 +++++++++-------
 .../filters/urlrewrite/dtds/urlrewrite3.2.dtd | 209 ++++++++++-------
 .../filters/urlrewrite/dtds/urlrewrite3.3.dtd | 217 +++++++++--------
 .../filters/urlrewrite/dtds/urlrewrite4.0.dtd | 221 ++++++++++--------
 11 files changed, 1126 insertions(+), 807 deletions(-)

diff --git a/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite1.0.dtd b/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite1.0.dtd
index 9f211981..c1e809d9 100644
--- a/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite1.0.dtd
+++ b/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite1.0.dtd
@@ -1,37 +1,66 @@
-<!--
-   UrlRewriteFilter DTD
-   http://www.tuckey.org/urlrewrite/
--->
-
-<!ELEMENT urlrewrite (rule+)>
-
-<!ELEMENT rule (name?, note?, condition*, from, to?, set*)>
-<!ATTLIST rule
-enabled   (true|false)               "true"
->
-
-
-<!ELEMENT condition (#PCDATA)>
-<!ATTLIST condition
-type        (header|method|port|time|year|month|dayofmonth|dayofweek|ampm|hourofday|minute|second|millisecond)   "header"
-name        CDATA               #IMPLIED
-next        (and|or)            "and"
-operator    (equal|notequal|greater|less|greaterorequal|lessorequal)   "equal"
->
-
-<!ELEMENT from (#PCDATA)>
-
-<!ELEMENT to (#PCDATA)>
-<!ATTLIST to
-type        (redirect|temporary-redirect|permanent-redirect|include|forward|passthrough)     "forward"
-last        (true|false)               "true"
->
-
-<!ELEMENT set (#PCDATA)>
-<!ATTLIST set
-type        (request|session|response-header)    "request"
-name        CDATA               #IMPLIED
->
-
-<!ELEMENT name (#PCDATA)>
-<!ELEMENT note (#PCDATA)>
+<!--
+UrlRewriteFilter DTD
+http://www.tuckey.org/urlrewrite/
+
+Licensed under the BSD License. Text as follows.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+  - Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+  - Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+  - Neither the name tuckey.org nor the names of its contributors
+    may be used to endorse or promote products derived from this
+    software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-->
+
+        <!ELEMENT urlrewrite (rule+)>
+
+        <!ELEMENT rule (name?, note?, condition*, from, to?, set*)>
+        <!ATTLIST rule
+                enabled   (true|false)               "true"
+                >
+
+
+        <!ELEMENT condition (#PCDATA)>
+        <!ATTLIST condition
+                type        (header|method|port|time|year|month|dayofmonth|dayofweek|ampm|hourofday|minute|second|millisecond)   "header"
+                name        CDATA               #IMPLIED
+                next        (and|or)            "and"
+                operator    (equal|notequal|greater|less|greaterorequal|lessorequal)   "equal"
+                >
+
+        <!ELEMENT from (#PCDATA)>
+
+        <!ELEMENT to (#PCDATA)>
+        <!ATTLIST to
+                type        (redirect|temporary-redirect|permanent-redirect|include|forward|passthrough)     "forward"
+                last        (true|false)               "true"
+                >
+
+        <!ELEMENT set (#PCDATA)>
+        <!ATTLIST set
+                type        (request|session|response-header)    "request"
+                name        CDATA               #IMPLIED
+                >
+
+        <!ELEMENT name (#PCDATA)>
+        <!ELEMENT note (#PCDATA)>
diff --git a/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite2.0.dtd b/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite2.0.dtd
index 18caf3b9..a2646a2c 100644
--- a/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite2.0.dtd
+++ b/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite2.0.dtd
@@ -1,42 +1,71 @@
-<!--
-   UrlRewriteFilter DTD
-   http://www.tuckey.org/urlrewrite/
--->
-
-<!ELEMENT urlrewrite (rule+)>
-
-<!ELEMENT rule (name?, note?, condition*, from, to?, set*)>
-<!ATTLIST rule
-enabled   (true|false)               "true"
->
-
-
-<!ELEMENT condition (#PCDATA)>
-<!ATTLIST condition
-type        (time|year|month|dayofmonth|dayofweek|ampm|hourofday|minute|second|millisecond|attribute|auth-type|character-encoding|content-length|content-type|context-path|cookie|header|method|parameter|path-info|path-translated|protocol|query-string|remote-addr|remote-host|remote-user|requested-session-id|request-uri|request-url|session-attribute|session-isnew|port|server-name|scheme|user-in-role)   "header"
-name        CDATA               #IMPLIED
-next        (and|or)            "and"
-casesensitive (true|false)      "false"
-operator    (equal|notequal|greater|less|greaterorequal|lessorequal)   "equal"
->
-
-<!ELEMENT from (#PCDATA)>
-<!ATTLIST from
-casesensitive (true|false)      "false"
->
-
-<!ELEMENT to (#PCDATA)>
-<!ATTLIST to
-type        (redirect|temporary-redirect|permanent-redirect|pre-include|post-include|forward|passthrough)     "forward"
-last        (true|false)               "true"
-encode      (true|false)               "false"
->
-
-<!ELEMENT set (#PCDATA)>
-<!ATTLIST set
-type        (request|session|response-header|cookie|content-type|charset|locale|status)    "request"
-name        CDATA               #IMPLIED
->
-
-<!ELEMENT name (#PCDATA)>
-<!ELEMENT note (#PCDATA)>
+<!--
+UrlRewriteFilter DTD
+http://www.tuckey.org/urlrewrite/
+
+Licensed under the BSD License. Text as follows.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+  - Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+  - Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+  - Neither the name tuckey.org nor the names of its contributors
+    may be used to endorse or promote products derived from this
+    software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<!ELEMENT urlrewrite (rule+)>
+
+<!ELEMENT rule (name?, note?, condition*, from, to?, set*)>
+<!ATTLIST rule
+enabled   (true|false)               "true"
+>
+
+
+<!ELEMENT condition (#PCDATA)>
+<!ATTLIST condition
+type        (time|year|month|dayofmonth|dayofweek|ampm|hourofday|minute|second|millisecond|attribute|auth-type|character-encoding|content-length|content-type|context-path|cookie|header|method|parameter|path-info|path-translated|protocol|query-string|remote-addr|remote-host|remote-user|requested-session-id|request-uri|request-url|session-attribute|session-isnew|port|server-name|scheme|user-in-role)   "header"
+name        CDATA               #IMPLIED
+next        (and|or)            "and"
+casesensitive (true|false)      "false"
+operator    (equal|notequal|greater|less|greaterorequal|lessorequal)   "equal"
+>
+
+<!ELEMENT from (#PCDATA)>
+<!ATTLIST from
+casesensitive (true|false)      "false"
+>
+
+<!ELEMENT to (#PCDATA)>
+<!ATTLIST to
+type        (redirect|temporary-redirect|permanent-redirect|pre-include|post-include|forward|passthrough)     "forward"
+last        (true|false)               "true"
+encode      (true|false)               "false"
+>
+
+<!ELEMENT set (#PCDATA)>
+<!ATTLIST set
+type        (request|session|response-header|cookie|content-type|charset|locale|status)    "request"
+name        CDATA               #IMPLIED
+>
+
+<!ELEMENT name (#PCDATA)>
+<!ELEMENT note (#PCDATA)>
diff --git a/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite2.3.dtd b/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite2.3.dtd
index 53d67799..9d2a3348 100644
--- a/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite2.3.dtd
+++ b/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite2.3.dtd
@@ -1,67 +1,96 @@
-<!--
-   UrlRewriteFilter DTD
-   http://www.tuckey.org/urlrewrite/
--->
-
-<!ELEMENT urlrewrite (rule*, outbound-rule*)>
-
-<!ELEMENT rule (name?, note?, condition*, from, run*, to?, set*)>
-<!ATTLIST rule
-enabled   (true|false)               "true"
->
-
-<!ELEMENT outbound-rule (name?, note?, condition*, from, run*, to?)>
-<!ATTLIST outbound-rule
-enabled   (true|false)               "true"
->
-
-<!ELEMENT name (#PCDATA)>
-<!ELEMENT note (#PCDATA)>
-
-<!ELEMENT condition (#PCDATA)>
-<!ATTLIST condition
-type        (time|year|month|dayofmonth|dayofweek|ampm|hourofday|minute|second|millisecond|attribute|auth-type|character-encoding|content-length|content-type|context-path|cookie|header|method|parameter|path-info|path-translated|protocol|query-string|remote-addr|remote-host|remote-user|requested-session-id|request-uri|request-url|session-attribute|session-isnew|port|server-name|scheme|user-in-role)   "header"
-name        CDATA               #IMPLIED
-next        (and|or)            "and"
-casesensitive (true|false)      "false"
-operator    (equal|notequal|greater|less|greaterorequal|lessorequal)   "equal"
->
-
-<!ELEMENT from (#PCDATA)>
-<!ATTLIST from
-casesensitive (true|false)      "false"
->
-
-<!ELEMENT set (#PCDATA)>
-<!ATTLIST set
-type        (request|session|response-header|cookie|content-type|charset|locale|status)    "request"
-name        CDATA               #IMPLIED
->
-
-<!ELEMENT to (#PCDATA)>
-<!ATTLIST to
-type        (redirect|temporary-redirect|permanent-redirect|pre-include|post-include|forward|passthrough)     "forward"
-last        (true|false)               "true"
-encode      (true|false)               "false"
->
-
-<!--
-eg,
-<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="runMeFool" />
-<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="run">
-    <init-param>
-        <param-name>biteMe</param-name>
-        <param-value>10</param-value>
-    </init-param>
-</run>
--->
-<!ELEMENT run (init-param*)>
-<!ATTLIST run
-class           CDATA               #IMPLIED
-method          CDATA               #IMPLIED
-neweachtime     (true|false)        "false"
->
-
-<!ELEMENT init-param (param-name, param-value)>
-<!ELEMENT param-name (#PCDATA)>
-<!ELEMENT param-value (#PCDATA)>
+<!--
+UrlRewriteFilter DTD
+http://www.tuckey.org/urlrewrite/
+
+Licensed under the BSD License. Text as follows.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+  - Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+  - Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+  - Neither the name tuckey.org nor the names of its contributors
+    may be used to endorse or promote products derived from this
+    software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<!ELEMENT urlrewrite (rule*, outbound-rule*)>
+
+<!ELEMENT rule (name?, note?, condition*, from, run*, to?, set*)>
+<!ATTLIST rule
+enabled   (true|false)               "true"
+>
+
+<!ELEMENT outbound-rule (name?, note?, condition*, from, run*, to?)>
+<!ATTLIST outbound-rule
+enabled   (true|false)               "true"
+>
+
+<!ELEMENT name (#PCDATA)>
+<!ELEMENT note (#PCDATA)>
+
+<!ELEMENT condition (#PCDATA)>
+<!ATTLIST condition
+type        (time|year|month|dayofmonth|dayofweek|ampm|hourofday|minute|second|millisecond|attribute|auth-type|character-encoding|content-length|content-type|context-path|cookie|header|method|parameter|path-info|path-translated|protocol|query-string|remote-addr|remote-host|remote-user|requested-session-id|request-uri|request-url|session-attribute|session-isnew|port|server-name|scheme|user-in-role)   "header"
+name        CDATA               #IMPLIED
+next        (and|or)            "and"
+casesensitive (true|false)      "false"
+operator    (equal|notequal|greater|less|greaterorequal|lessorequal)   "equal"
+>
+
+<!ELEMENT from (#PCDATA)>
+<!ATTLIST from
+casesensitive (true|false)      "false"
+>
+
+<!ELEMENT set (#PCDATA)>
+<!ATTLIST set
+type        (request|session|response-header|cookie|content-type|charset|locale|status)    "request"
+name        CDATA               #IMPLIED
+>
+
+<!ELEMENT to (#PCDATA)>
+<!ATTLIST to
+type        (redirect|temporary-redirect|permanent-redirect|pre-include|post-include|forward|passthrough)     "forward"
+last        (true|false)               "true"
+encode      (true|false)               "false"
+>
+
+<!--
+eg,
+<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="runMeFool" />
+<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="run">
+    <init-param>
+        <param-name>biteMe</param-name>
+        <param-value>10</param-value>
+    </init-param>
+</run>
+-->
+<!ELEMENT run (init-param*)>
+<!ATTLIST run
+class           CDATA               #IMPLIED
+method          CDATA               #IMPLIED
+neweachtime     (true|false)        "false"
+>
+
+<!ELEMENT init-param (param-name, param-value)>
+<!ELEMENT param-name (#PCDATA)>
+<!ELEMENT param-value (#PCDATA)>
diff --git a/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite2.4.dtd b/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite2.4.dtd
index 85fdcfd8..3da110c4 100644
--- a/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite2.4.dtd
+++ b/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite2.4.dtd
@@ -1,67 +1,96 @@
-<!--
-   UrlRewriteFilter DTD
-   http://www.tuckey.org/urlrewrite/
--->
-
-<!ELEMENT urlrewrite (rule*, outbound-rule*)>
-
-<!ELEMENT rule (name?, note?, condition*, from, run*, to?, set*)>
-<!ATTLIST rule
-enabled   (true|false)               "true"
->
-
-<!ELEMENT outbound-rule (name?, note?, condition*, from, run*, to?, set*)>
-<!ATTLIST outbound-rule
-enabled   (true|false)               "true"
->
-
-<!ELEMENT name (#PCDATA)>
-<!ELEMENT note (#PCDATA)>
-
-<!ELEMENT condition (#PCDATA)>
-<!ATTLIST condition
-type        (time|year|month|dayofmonth|dayofweek|ampm|hourofday|minute|second|millisecond|attribute|auth-type|character-encoding|content-length|content-type|context-path|cookie|header|method|parameter|path-info|path-translated|protocol|query-string|remote-addr|remote-host|remote-user|requested-session-id|request-uri|request-url|session-attribute|session-isnew|port|server-name|scheme|user-in-role)   "header"
-name        CDATA               #IMPLIED
-next        (and|or)            "and"
-casesensitive (true|false)      "false"
-operator    (equal|notequal|greater|less|greaterorequal|lessorequal)   "equal"
->
-
-<!ELEMENT from (#PCDATA)>
-<!ATTLIST from
-casesensitive (true|false)      "false"
->
-
-<!ELEMENT set (#PCDATA)>
-<!ATTLIST set
-type        (request|session|response-header|cookie|content-type|charset|locale|status)    "request"
-name        CDATA               #IMPLIED
->
-
-<!ELEMENT to (#PCDATA)>
-<!ATTLIST to
-type        (redirect|temporary-redirect|permanent-redirect|pre-include|post-include|forward|passthrough)     "forward"
-last        (true|false)               "true"
-encode      (true|false)               "false"
->
-
-<!--
-eg,
-<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="runMeFool" />
-<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="run">
-    <init-param>
-        <param-name>biteMe</param-name>
-        <param-value>10</param-value>
-    </init-param>
-</run>
--->
-<!ELEMENT run (init-param*)>
-<!ATTLIST run
-class           CDATA               #IMPLIED
-method          CDATA               #IMPLIED
-neweachtime     (true|false)        "false"
->
-
-<!ELEMENT init-param (param-name, param-value)>
-<!ELEMENT param-name (#PCDATA)>
-<!ELEMENT param-value (#PCDATA)>
+<!--
+UrlRewriteFilter DTD
+http://www.tuckey.org/urlrewrite/
+
+Licensed under the BSD License. Text as follows.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+  - Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+  - Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+  - Neither the name tuckey.org nor the names of its contributors
+    may be used to endorse or promote products derived from this
+    software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<!ELEMENT urlrewrite (rule*, outbound-rule*)>
+
+<!ELEMENT rule (name?, note?, condition*, from, run*, to?, set*)>
+<!ATTLIST rule
+enabled   (true|false)               "true"
+>
+
+<!ELEMENT outbound-rule (name?, note?, condition*, from, run*, to?, set*)>
+<!ATTLIST outbound-rule
+enabled   (true|false)               "true"
+>
+
+<!ELEMENT name (#PCDATA)>
+<!ELEMENT note (#PCDATA)>
+
+<!ELEMENT condition (#PCDATA)>
+<!ATTLIST condition
+type        (time|year|month|dayofmonth|dayofweek|ampm|hourofday|minute|second|millisecond|attribute|auth-type|character-encoding|content-length|content-type|context-path|cookie|header|method|parameter|path-info|path-translated|protocol|query-string|remote-addr|remote-host|remote-user|requested-session-id|request-uri|request-url|session-attribute|session-isnew|port|server-name|scheme|user-in-role)   "header"
+name        CDATA               #IMPLIED
+next        (and|or)            "and"
+casesensitive (true|false)      "false"
+operator    (equal|notequal|greater|less|greaterorequal|lessorequal)   "equal"
+>
+
+<!ELEMENT from (#PCDATA)>
+<!ATTLIST from
+casesensitive (true|false)      "false"
+>
+
+<!ELEMENT set (#PCDATA)>
+<!ATTLIST set
+type        (request|session|response-header|cookie|content-type|charset|locale|status)    "request"
+name        CDATA               #IMPLIED
+>
+
+<!ELEMENT to (#PCDATA)>
+<!ATTLIST to
+type        (redirect|temporary-redirect|permanent-redirect|pre-include|post-include|forward|passthrough)     "forward"
+last        (true|false)               "true"
+encode      (true|false)               "false"
+>
+
+<!--
+eg,
+<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="runMeFool" />
+<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="run">
+    <init-param>
+        <param-name>biteMe</param-name>
+        <param-value>10</param-value>
+    </init-param>
+</run>
+-->
+<!ELEMENT run (init-param*)>
+<!ATTLIST run
+class           CDATA               #IMPLIED
+method          CDATA               #IMPLIED
+neweachtime     (true|false)        "false"
+>
+
+<!ELEMENT init-param (param-name, param-value)>
+<!ELEMENT param-name (#PCDATA)>
+<!ELEMENT param-value (#PCDATA)>
diff --git a/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite2.5.dtd b/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite2.5.dtd
index e586251c..50e14fa2 100644
--- a/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite2.5.dtd
+++ b/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite2.5.dtd
@@ -1,69 +1,98 @@
-<!--
-   UrlRewriteFilter DTD
-   http://www.tuckey.org/urlrewrite/
--->
-
-<!ELEMENT urlrewrite (rule*, outbound-rule*)>
-
-
-<!ELEMENT rule (name?, note?, condition*, from, run*, to?, set*)>
-<!ATTLIST rule
-enabled     (true|false)         "true"
->
-
-<!ELEMENT outbound-rule (name?, note?, condition*, from, run*, to?, set*)>
-<!ATTLIST outbound-rule
-enabled     (true|false)         "true"
-encodefirst (true|false)         "false"
->
-
-<!ELEMENT name (#PCDATA)>
-<!ELEMENT note (#PCDATA)>
-
-<!ELEMENT condition (#PCDATA)>
-<!ATTLIST condition
-type        (time|year|month|dayofmonth|dayofweek|ampm|hourofday|minute|second|millisecond|attribute|auth-type|character-encoding|content-length|content-type|context-path|cookie|header|local-port|method|parameter|path-info|path-translated|protocol|query-string|remote-addr|remote-host|remote-user|requested-session-id|request-uri|request-url|session-attribute|session-isnew|port|server-name|scheme|user-in-role)   "header"
-name        CDATA               #IMPLIED
-next        (and|or)            "and"
-casesensitive (true|false)      "false"
-operator    (equal|notequal|greater|less|greaterorequal|lessorequal)   "equal"
->
-
-<!ELEMENT from (#PCDATA)>
-<!ATTLIST from
-casesensitive (true|false)      "false"
->
-
-<!ELEMENT set (#PCDATA)>
-<!ATTLIST set
-type        (request|session|response-header|cookie|content-type|charset|locale|status)    "request"
-name        CDATA               #IMPLIED
->
-
-<!ELEMENT to (#PCDATA)>
-<!ATTLIST to
-type        (redirect|temporary-redirect|permanent-redirect|pre-include|post-include|forward|passthrough)     "forward"
-last        (true|false)               "true"
-encode      (true|false)               "false"
->
-
-<!--
-eg,
-<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="runMeFool" />
-<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="run">
-    <init-param>
-        <param-name>biteMe</param-name>
-        <param-value>10</param-value>
-    </init-param>
-</run>
--->
-<!ELEMENT run (init-param*)>
-<!ATTLIST run
-class           CDATA               #IMPLIED
-method          CDATA               #IMPLIED
-neweachtime     (true|false)        "false"
->
-
-<!ELEMENT init-param (param-name, param-value)>
-<!ELEMENT param-name (#PCDATA)>
-<!ELEMENT param-value (#PCDATA)>
+<!--
+UrlRewriteFilter DTD
+http://www.tuckey.org/urlrewrite/
+
+Licensed under the BSD License. Text as follows.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+  - Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+  - Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+  - Neither the name tuckey.org nor the names of its contributors
+    may be used to endorse or promote products derived from this
+    software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<!ELEMENT urlrewrite (rule*, outbound-rule*)>
+
+
+<!ELEMENT rule (name?, note?, condition*, from, run*, to?, set*)>
+<!ATTLIST rule
+enabled     (true|false)         "true"
+>
+
+<!ELEMENT outbound-rule (name?, note?, condition*, from, run*, to?, set*)>
+<!ATTLIST outbound-rule
+enabled     (true|false)         "true"
+encodefirst (true|false)         "false"
+>
+
+<!ELEMENT name (#PCDATA)>
+<!ELEMENT note (#PCDATA)>
+
+<!ELEMENT condition (#PCDATA)>
+<!ATTLIST condition
+type        (time|year|month|dayofmonth|dayofweek|ampm|hourofday|minute|second|millisecond|attribute|auth-type|character-encoding|content-length|content-type|context-path|cookie|header|local-port|method|parameter|path-info|path-translated|protocol|query-string|remote-addr|remote-host|remote-user|requested-session-id|request-uri|request-url|session-attribute|session-isnew|port|server-name|scheme|user-in-role)   "header"
+name        CDATA               #IMPLIED
+next        (and|or)            "and"
+casesensitive (true|false)      "false"
+operator    (equal|notequal|greater|less|greaterorequal|lessorequal)   "equal"
+>
+
+<!ELEMENT from (#PCDATA)>
+<!ATTLIST from
+casesensitive (true|false)      "false"
+>
+
+<!ELEMENT set (#PCDATA)>
+<!ATTLIST set
+type        (request|session|response-header|cookie|content-type|charset|locale|status)    "request"
+name        CDATA               #IMPLIED
+>
+
+<!ELEMENT to (#PCDATA)>
+<!ATTLIST to
+type        (redirect|temporary-redirect|permanent-redirect|pre-include|post-include|forward|passthrough)     "forward"
+last        (true|false)               "true"
+encode      (true|false)               "false"
+>
+
+<!--
+eg,
+<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="runMeFool" />
+<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="run">
+    <init-param>
+        <param-name>biteMe</param-name>
+        <param-value>10</param-value>
+    </init-param>
+</run>
+-->
+<!ELEMENT run (init-param*)>
+<!ATTLIST run
+class           CDATA               #IMPLIED
+method          CDATA               #IMPLIED
+neweachtime     (true|false)        "false"
+>
+
+<!ELEMENT init-param (param-name, param-value)>
+<!ELEMENT param-name (#PCDATA)>
+<!ELEMENT param-value (#PCDATA)>
diff --git a/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite2.6.dtd b/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite2.6.dtd
index df87494d..9088f4e7 100644
--- a/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite2.6.dtd
+++ b/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite2.6.dtd
@@ -1,69 +1,98 @@
-<!--
-   UrlRewriteFilter DTD
-   http://www.tuckey.org/urlrewrite/
--->
-
-<!ELEMENT urlrewrite (rule*, outbound-rule*)>
-
-
-<!ELEMENT rule (name?, note?, condition*, from, run*, to?, set*)>
-<!ATTLIST rule
-enabled     (true|false)         "true"
->
-
-<!ELEMENT outbound-rule (name?, note?, condition*, from, run*, to?, set*)>
-<!ATTLIST outbound-rule
-enabled     (true|false)         "true"
-encodefirst (true|false)         "false"
->
-
-<!ELEMENT name (#PCDATA)>
-<!ELEMENT note (#PCDATA)>
-
-<!ELEMENT condition (#PCDATA)>
-<!ATTLIST condition
-type        (time|year|month|dayofmonth|dayofweek|ampm|hourofday|minute|second|millisecond|attribute|auth-type|character-encoding|content-length|content-type|context-path|cookie|header|local-port|method|parameter|path-info|path-translated|protocol|query-string|remote-addr|remote-host|remote-user|requested-session-id|request-uri|request-url|session-attribute|session-isnew|port|server-name|scheme|user-in-role)   "header"
-name        CDATA               #IMPLIED
-next        (and|or)            "and"
-casesensitive (true|false)      "false"
-operator    (equal|notequal|greater|less|greaterorequal|lessorequal)   "equal"
->
-
-<!ELEMENT from (#PCDATA)>
-<!ATTLIST from
-casesensitive (true|false)      "false"
->
-
-<!ELEMENT set (#PCDATA)>
-<!ATTLIST set
-type        (request|session|response-header|cookie|content-type|charset|locale|status)    "request"
-name        CDATA               #IMPLIED
->
-
-<!ELEMENT to (#PCDATA)>
-<!ATTLIST to
-type        (redirect|temporary-redirect|permanent-redirect|pre-include|post-include|forward|passthrough)     "forward"
-last        (true|false)               "true"
-encode      (true|false|default)       "default"
->
-
-<!--
-eg,
-<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="runMeFool" />
-<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="run">
-    <init-param>
-        <param-name>biteMe</param-name>
-        <param-value>10</param-value>
-    </init-param>
-</run>
--->
-<!ELEMENT run (init-param*)>
-<!ATTLIST run
-class           CDATA               #IMPLIED
-method          CDATA               #IMPLIED
-neweachtime     (true|false)        "false"
->
-
-<!ELEMENT init-param (param-name, param-value)>
-<!ELEMENT param-name (#PCDATA)>
-<!ELEMENT param-value (#PCDATA)>
+<!--
+UrlRewriteFilter DTD
+http://www.tuckey.org/urlrewrite/
+
+Licensed under the BSD License. Text as follows.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+  - Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+  - Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+  - Neither the name tuckey.org nor the names of its contributors
+    may be used to endorse or promote products derived from this
+    software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<!ELEMENT urlrewrite (rule*, outbound-rule*)>
+
+
+<!ELEMENT rule (name?, note?, condition*, from, run*, to?, set*)>
+<!ATTLIST rule
+enabled     (true|false)         "true"
+>
+
+<!ELEMENT outbound-rule (name?, note?, condition*, from, run*, to?, set*)>
+<!ATTLIST outbound-rule
+enabled     (true|false)         "true"
+encodefirst (true|false)         "false"
+>
+
+<!ELEMENT name (#PCDATA)>
+<!ELEMENT note (#PCDATA)>
+
+<!ELEMENT condition (#PCDATA)>
+<!ATTLIST condition
+type        (time|year|month|dayofmonth|dayofweek|ampm|hourofday|minute|second|millisecond|attribute|auth-type|character-encoding|content-length|content-type|context-path|cookie|header|local-port|method|parameter|path-info|path-translated|protocol|query-string|remote-addr|remote-host|remote-user|requested-session-id|request-uri|request-url|session-attribute|session-isnew|port|server-name|scheme|user-in-role)   "header"
+name        CDATA               #IMPLIED
+next        (and|or)            "and"
+casesensitive (true|false)      "false"
+operator    (equal|notequal|greater|less|greaterorequal|lessorequal)   "equal"
+>
+
+<!ELEMENT from (#PCDATA)>
+<!ATTLIST from
+casesensitive (true|false)      "false"
+>
+
+<!ELEMENT set (#PCDATA)>
+<!ATTLIST set
+type        (request|session|response-header|cookie|content-type|charset|locale|status)    "request"
+name        CDATA               #IMPLIED
+>
+
+<!ELEMENT to (#PCDATA)>
+<!ATTLIST to
+type        (redirect|temporary-redirect|permanent-redirect|pre-include|post-include|forward|passthrough)     "forward"
+last        (true|false)               "true"
+encode      (true|false|default)       "default"
+>
+
+<!--
+eg,
+<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="runMeFool" />
+<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="run">
+    <init-param>
+        <param-name>biteMe</param-name>
+        <param-value>10</param-value>
+    </init-param>
+</run>
+-->
+<!ELEMENT run (init-param*)>
+<!ATTLIST run
+class           CDATA               #IMPLIED
+method          CDATA               #IMPLIED
+neweachtime     (true|false)        "false"
+>
+
+<!ELEMENT init-param (param-name, param-value)>
+<!ELEMENT param-name (#PCDATA)>
+<!ELEMENT param-value (#PCDATA)>
diff --git a/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite3.0.dtd b/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite3.0.dtd
index afac561c..8a78b7b2 100644
--- a/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite3.0.dtd
+++ b/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite3.0.dtd
@@ -1,88 +1,117 @@
-<!--
- UrlRewriteFilter DTD
- http://www.tuckey.org/urlrewrite/
--->
-
-<!ELEMENT urlrewrite ((rule|class-rule)*, outbound-rule*, catch*)>
-<!ATTLIST urlrewrite
-use-query-string (true|false) "false"
-use-context  (true|false) "false"
-decode-using CDATA  #IMPLIED
-default-match-type (regex|wildcard) #IMPLIED
->
-
-<!ELEMENT rule (name?, note?, condition*, from, set*, run*, to?)>
-<!ATTLIST rule
-enabled  (true|false) "true"
-match-type  (regex|wildcard) #IMPLIED
->
-
-<!ELEMENT class-rule EMPTY>
-<!ATTLIST class-rule
-class  CDATA #IMPLIED
-method CDATA "matches"
-last (true|false) "true"
->
-
-<!ELEMENT outbound-rule (name?, note?, condition*, from, set*, run*, to?)>
-<!ATTLIST outbound-rule
-enabled  (true|false) "true"
-encodefirst  (true|false) "false"
-match-type  (regex|wildcard) #IMPLIED
->
-
-<!ELEMENT name (#PCDATA)>
-<!ELEMENT note (#PCDATA)>
-
-<!ELEMENT condition (#PCDATA)>
-<!ATTLIST condition
-type (time|year|month|dayofmonth|dayofweek|ampm|hourofday|minute|second|millisecond|attribute|auth-type|character-encoding|content-length|content-type|context-path|cookie|header|local-port|method|parameter|path-info|path-translated|protocol|query-string|remote-addr|remote-host|remote-user|requested-session-id|request-uri|request-url|session-attribute|session-isnew|port|server-name|scheme|user-in-role|exception) "header"
-name CDATA  #IMPLIED
-next (and|or)  "and"
-casesensitive (true|false) "false"
-operator (equal|notequal|greater|less|greaterorequal|lessorequal|instanceof) "equal"
->
-
-<!ELEMENT from (#PCDATA)>
-<!ATTLIST from
-casesensitive (true|false) "false"
->
-
-<!ELEMENT set (#PCDATA)>
-<!ATTLIST set
-type (request|session|response-header|cookie|content-type|charset|locale|status) "request"
-name CDATA  #IMPLIED
->
-
-<!ELEMENT to (#PCDATA)>
-<!ATTLIST to
-type (redirect|temporary-redirect|permanent-redirect|pre-include|post-include|forward|passthrough) "forward"
-last (true|false) "true"
-encode (true|false) #IMPLIED
->
-
-<!--
-eg,
-<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="runMeFool" />
-<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="run">
- <init-param>
- <param-name>biteMe</param-name>
- <param-value>10</param-value>
- </init-param>
-</run>
--->
-<!ELEMENT run (init-param*)>
-<!ATTLIST run
-class  CDATA  #IMPLIED
-method  CDATA  #IMPLIED
-neweachtime (true|false) "false"
->
-
-<!ELEMENT init-param (param-name, param-value)>
-<!ELEMENT param-name (#PCDATA)>
-<!ELEMENT param-value (#PCDATA)>
-
-<!ELEMENT catch (run?)>
-<!ATTLIST catch
-class CDATA #IMPLIED
->
+<!--
+UrlRewriteFilter DTD
+http://www.tuckey.org/urlrewrite/
+
+Licensed under the BSD License. Text as follows.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+  - Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+  - Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+  - Neither the name tuckey.org nor the names of its contributors
+    may be used to endorse or promote products derived from this
+    software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<!ELEMENT urlrewrite ((rule|class-rule)*, outbound-rule*, catch*)>
+<!ATTLIST urlrewrite
+use-query-string (true|false) "false"
+use-context  (true|false) "false"
+decode-using CDATA  #IMPLIED
+default-match-type (regex|wildcard) #IMPLIED
+>
+
+<!ELEMENT rule (name?, note?, condition*, from, set*, run*, to?)>
+<!ATTLIST rule
+enabled  (true|false) "true"
+match-type  (regex|wildcard) #IMPLIED
+>
+
+<!ELEMENT class-rule EMPTY>
+<!ATTLIST class-rule
+class  CDATA #IMPLIED
+method CDATA "matches"
+last (true|false) "true"
+>
+
+<!ELEMENT outbound-rule (name?, note?, condition*, from, set*, run*, to?)>
+<!ATTLIST outbound-rule
+enabled  (true|false) "true"
+encodefirst  (true|false) "false"
+match-type  (regex|wildcard) #IMPLIED
+>
+
+<!ELEMENT name (#PCDATA)>
+<!ELEMENT note (#PCDATA)>
+
+<!ELEMENT condition (#PCDATA)>
+<!ATTLIST condition
+type (time|year|month|dayofmonth|dayofweek|ampm|hourofday|minute|second|millisecond|attribute|auth-type|character-encoding|content-length|content-type|context-path|cookie|header|local-port|method|parameter|path-info|path-translated|protocol|query-string|remote-addr|remote-host|remote-user|requested-session-id|request-uri|request-url|session-attribute|session-isnew|port|server-name|scheme|user-in-role|exception) "header"
+name CDATA  #IMPLIED
+next (and|or)  "and"
+casesensitive (true|false) "false"
+operator (equal|notequal|greater|less|greaterorequal|lessorequal|instanceof) "equal"
+>
+
+<!ELEMENT from (#PCDATA)>
+<!ATTLIST from
+casesensitive (true|false) "false"
+>
+
+<!ELEMENT set (#PCDATA)>
+<!ATTLIST set
+type (request|session|response-header|cookie|content-type|charset|locale|status) "request"
+name CDATA  #IMPLIED
+>
+
+<!ELEMENT to (#PCDATA)>
+<!ATTLIST to
+type (redirect|temporary-redirect|permanent-redirect|pre-include|post-include|forward|passthrough) "forward"
+last (true|false) "true"
+encode (true|false) #IMPLIED
+>
+
+<!--
+eg,
+<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="runMeFool" />
+<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="run">
+ <init-param>
+ <param-name>biteMe</param-name>
+ <param-value>10</param-value>
+ </init-param>
+</run>
+-->
+<!ELEMENT run (init-param*)>
+<!ATTLIST run
+class  CDATA  #IMPLIED
+method  CDATA  #IMPLIED
+neweachtime (true|false) "false"
+>
+
+<!ELEMENT init-param (param-name, param-value)>
+<!ELEMENT param-name (#PCDATA)>
+<!ELEMENT param-value (#PCDATA)>
+
+<!ELEMENT catch (run?)>
+<!ATTLIST catch
+class CDATA #IMPLIED
+>
diff --git a/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite3.1.dtd b/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite3.1.dtd
index ec6b1317..e360a073 100644
--- a/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite3.1.dtd
+++ b/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite3.1.dtd
@@ -1,88 +1,117 @@
-<!--
- UrlRewriteFilter DTD
- http://www.tuckey.org/urlrewrite/
--->
-
-<!ELEMENT urlrewrite ((rule|class-rule)*, outbound-rule*, catch*)>
-<!ATTLIST urlrewrite
-use-query-string (true|false) "false"
-use-context  (true|false) "false"
-decode-using CDATA  #IMPLIED
-default-match-type (regex|wildcard) #IMPLIED
->
-
-<!ELEMENT rule (name?, note?, condition*, from?, set*, run*, to?)>
-<!ATTLIST rule
-enabled  (true|false) "true"
-match-type  (regex|wildcard) #IMPLIED
->
-
-<!ELEMENT class-rule EMPTY>
-<!ATTLIST class-rule
-class  CDATA #IMPLIED
-method CDATA "matches"
-last (true|false) "true"
->
-
-<!ELEMENT outbound-rule (name?, note?, condition*, from, set*, run*, to?)>
-<!ATTLIST outbound-rule
-enabled  (true|false) "true"
-encodefirst  (true|false) "false"
-match-type  (regex|wildcard) #IMPLIED
->
-
-<!ELEMENT name (#PCDATA)>
-<!ELEMENT note (#PCDATA)>
-
-<!ELEMENT condition (#PCDATA)>
-<!ATTLIST condition
-type (time|year|month|dayofmonth|dayofweek|ampm|hourofday|minute|second|millisecond|attribute|auth-type|character-encoding|content-length|content-type|context-path|cookie|header|local-port|method|parameter|path-info|path-translated|protocol|query-string|remote-addr|remote-host|remote-user|requested-session-id|request-uri|request-url|session-attribute|session-isnew|port|server-name|scheme|user-in-role|exception) "header"
-name CDATA  #IMPLIED
-next (and|or)  "and"
-casesensitive (true|false) "false"
-operator (equal|notequal|greater|less|greaterorequal|lessorequal|instanceof) "equal"
->
-
-<!ELEMENT from (#PCDATA)>
-<!ATTLIST from
-casesensitive (true|false) "false"
->
-
-<!ELEMENT set (#PCDATA)>
-<!ATTLIST set
-type (request|session|response-header|cookie|content-type|charset|locale|status|expires) "request"
-name CDATA  #IMPLIED
->
-
-<!ELEMENT to (#PCDATA)>
-<!ATTLIST to
-type (redirect|temporary-redirect|permanent-redirect|pre-include|post-include|forward|passthrough) "forward"
-last (true|false) "false"
-encode (true|false) #IMPLIED
->
-
-<!--
-eg,
-<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="runMeFool" />
-<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="run">
- <init-param>
- <param-name>biteMe</param-name>
- <param-value>10</param-value>
- </init-param>
-</run>
--->
-<!ELEMENT run (init-param*)>
-<!ATTLIST run
-class  CDATA  #IMPLIED
-method  CDATA  #IMPLIED
-neweachtime (true|false) "false"
->
-
-<!ELEMENT init-param (param-name, param-value)>
-<!ELEMENT param-name (#PCDATA)>
-<!ELEMENT param-value (#PCDATA)>
-
-<!ELEMENT catch (run?)>
-<!ATTLIST catch
-class CDATA #IMPLIED
->
+<!--
+UrlRewriteFilter DTD
+http://www.tuckey.org/urlrewrite/
+
+Licensed under the BSD License. Text as follows.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+  - Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+  - Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+  - Neither the name tuckey.org nor the names of its contributors
+    may be used to endorse or promote products derived from this
+    software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<!ELEMENT urlrewrite ((rule|class-rule)*, outbound-rule*, catch*)>
+<!ATTLIST urlrewrite
+use-query-string (true|false) "false"
+use-context  (true|false) "false"
+decode-using CDATA  #IMPLIED
+default-match-type (regex|wildcard) #IMPLIED
+>
+
+<!ELEMENT rule (name?, note?, condition*, from?, set*, run*, to?)>
+<!ATTLIST rule
+enabled  (true|false) "true"
+match-type  (regex|wildcard) #IMPLIED
+>
+
+<!ELEMENT class-rule EMPTY>
+<!ATTLIST class-rule
+class  CDATA #IMPLIED
+method CDATA "matches"
+last (true|false) "true"
+>
+
+<!ELEMENT outbound-rule (name?, note?, condition*, from, set*, run*, to?)>
+<!ATTLIST outbound-rule
+enabled  (true|false) "true"
+encodefirst  (true|false) "false"
+match-type  (regex|wildcard) #IMPLIED
+>
+
+<!ELEMENT name (#PCDATA)>
+<!ELEMENT note (#PCDATA)>
+
+<!ELEMENT condition (#PCDATA)>
+<!ATTLIST condition
+type (time|year|month|dayofmonth|dayofweek|ampm|hourofday|minute|second|millisecond|attribute|auth-type|character-encoding|content-length|content-type|context-path|cookie|header|local-port|method|parameter|path-info|path-translated|protocol|query-string|remote-addr|remote-host|remote-user|requested-session-id|request-uri|request-url|session-attribute|session-isnew|port|server-name|scheme|user-in-role|exception) "header"
+name CDATA  #IMPLIED
+next (and|or)  "and"
+casesensitive (true|false) "false"
+operator (equal|notequal|greater|less|greaterorequal|lessorequal|instanceof) "equal"
+>
+
+<!ELEMENT from (#PCDATA)>
+<!ATTLIST from
+casesensitive (true|false) "false"
+>
+
+<!ELEMENT set (#PCDATA)>
+<!ATTLIST set
+type (request|session|response-header|cookie|content-type|charset|locale|status|expires) "request"
+name CDATA  #IMPLIED
+>
+
+<!ELEMENT to (#PCDATA)>
+<!ATTLIST to
+type (redirect|temporary-redirect|permanent-redirect|pre-include|post-include|forward|passthrough) "forward"
+last (true|false) "false"
+encode (true|false) #IMPLIED
+>
+
+<!--
+eg,
+<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="runMeFool" />
+<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="run">
+ <init-param>
+ <param-name>biteMe</param-name>
+ <param-value>10</param-value>
+ </init-param>
+</run>
+-->
+<!ELEMENT run (init-param*)>
+<!ATTLIST run
+class  CDATA  #IMPLIED
+method  CDATA  #IMPLIED
+neweachtime (true|false) "false"
+>
+
+<!ELEMENT init-param (param-name, param-value)>
+<!ELEMENT param-name (#PCDATA)>
+<!ELEMENT param-value (#PCDATA)>
+
+<!ELEMENT catch (run?)>
+<!ATTLIST catch
+class CDATA #IMPLIED
+>
diff --git a/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite3.2.dtd b/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite3.2.dtd
index 5c221d42..2c3886fc 100644
--- a/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite3.2.dtd
+++ b/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite3.2.dtd
@@ -1,90 +1,119 @@
-<!--
- UrlRewriteFilter DTD
- http://www.tuckey.org/urlrewrite/
--->
-
-<!ELEMENT urlrewrite ((rule|class-rule|outbound-rule)*, catch*)>
-<!ATTLIST urlrewrite
-use-query-string (true|false) "false"
-use-context  (true|false) "false"
-decode-using CDATA  #IMPLIED
-default-match-type (regex|wildcard) #IMPLIED
->
-
-<!ELEMENT rule (name?, note?, condition*, from?, set*, run*, to?)>
-<!ATTLIST rule
-enabled  (true|false) "true"
-match-type  (regex|wildcard) #IMPLIED
->
-
-<!ELEMENT class-rule EMPTY>
-<!ATTLIST class-rule
-class  CDATA #IMPLIED
-method CDATA "matches"
-last (true|false) "true"
->
-
-<!ELEMENT outbound-rule (name?, note?, condition*, from, set*, run*, to?)>
-<!ATTLIST outbound-rule
-enabled  (true|false) "true"
-encodefirst  (true|false) "false"
-match-type  (regex|wildcard) #IMPLIED
->
-
-<!ELEMENT name (#PCDATA)>
-<!ELEMENT note (#PCDATA)>
-
-<!ELEMENT condition (#PCDATA)>
-<!ATTLIST condition
-type (time|year|month|dayofmonth|dayofweek|ampm|hourofday|minute|second|millisecond|attribute|auth-type|character-encoding|content-length|content-type|context-path|cookie|header|local-port|method|parameter|path-info|path-translated|protocol|query-string|remote-addr|remote-host|remote-user|requested-session-id|requested-session-id-from-cookie|requested-session-id-from-url|requested-session-id-valid|request-uri|request-url|session-attribute|session-isnew|port|server-name|scheme|user-in-role|exception) "header"
-name CDATA  #IMPLIED
-next (and|or)  "and"
-casesensitive (true|false) "false"
-operator (equal|notequal|greater|less|greaterorequal|lessorequal|instanceof) "equal"
->
-
-<!ELEMENT from (#PCDATA)>
-<!ATTLIST from
-casesensitive (true|false) "false"
->
-
-<!ELEMENT set (#PCDATA)>
-<!ATTLIST set
-type (request|session|response-header|cookie|content-type|charset|locale|status|expires|parameter|method) "request"
-name CDATA  #IMPLIED
->
-
-<!ELEMENT to (#PCDATA)>
-<!ATTLIST to
-type (redirect|temporary-redirect|permanent-redirect|pre-include|post-include|forward|passthrough|proxy) "forward"
-last (true|false) "false"
-encode (true|false) #IMPLIED
-context CDATA  #IMPLIED
->
-
-<!--
-eg,
-<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="runMeFool" />
-<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="run">
- <init-param>
- <param-name>biteMe</param-name>
- <param-value>10</param-value>
- </init-param>
-</run>
--->
-<!ELEMENT run (init-param*)>
-<!ATTLIST run
-class  CDATA  #IMPLIED
-method  CDATA  #IMPLIED
-jsonhandler (true|false) "false"
-neweachtime (true|false) "false"
->
-
-<!ELEMENT init-param (param-name, param-value)>
-<!ELEMENT param-name (#PCDATA)>
-<!ELEMENT param-value (#PCDATA)>
-
-<!ELEMENT catch (run?)>
-<!ATTLIST catch
-class CDATA #IMPLIED
->
+<!--
+UrlRewriteFilter DTD
+http://www.tuckey.org/urlrewrite/
+
+Licensed under the BSD License. Text as follows.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+  - Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+  - Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+  - Neither the name tuckey.org nor the names of its contributors
+    may be used to endorse or promote products derived from this
+    software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<!ELEMENT urlrewrite ((rule|class-rule|outbound-rule)*, catch*)>
+<!ATTLIST urlrewrite
+use-query-string (true|false) "false"
+use-context  (true|false) "false"
+decode-using CDATA  #IMPLIED
+default-match-type (regex|wildcard) #IMPLIED
+>
+
+<!ELEMENT rule (name?, note?, condition*, from?, set*, run*, to?)>
+<!ATTLIST rule
+enabled  (true|false) "true"
+match-type  (regex|wildcard) #IMPLIED
+>
+
+<!ELEMENT class-rule EMPTY>
+<!ATTLIST class-rule
+class  CDATA #IMPLIED
+method CDATA "matches"
+last (true|false) "true"
+>
+
+<!ELEMENT outbound-rule (name?, note?, condition*, from, set*, run*, to?)>
+<!ATTLIST outbound-rule
+enabled  (true|false) "true"
+encodefirst  (true|false) "false"
+match-type  (regex|wildcard) #IMPLIED
+>
+
+<!ELEMENT name (#PCDATA)>
+<!ELEMENT note (#PCDATA)>
+
+<!ELEMENT condition (#PCDATA)>
+<!ATTLIST condition
+type (time|year|month|dayofmonth|dayofweek|ampm|hourofday|minute|second|millisecond|attribute|auth-type|character-encoding|content-length|content-type|context-path|cookie|header|local-port|method|parameter|path-info|path-translated|protocol|query-string|remote-addr|remote-host|remote-user|requested-session-id|requested-session-id-from-cookie|requested-session-id-from-url|requested-session-id-valid|request-uri|request-url|session-attribute|session-isnew|port|server-name|scheme|user-in-role|exception) "header"
+name CDATA  #IMPLIED
+next (and|or)  "and"
+casesensitive (true|false) "false"
+operator (equal|notequal|greater|less|greaterorequal|lessorequal|instanceof) "equal"
+>
+
+<!ELEMENT from (#PCDATA)>
+<!ATTLIST from
+casesensitive (true|false) "false"
+>
+
+<!ELEMENT set (#PCDATA)>
+<!ATTLIST set
+type (request|session|response-header|cookie|content-type|charset|locale|status|expires|parameter|method) "request"
+name CDATA  #IMPLIED
+>
+
+<!ELEMENT to (#PCDATA)>
+<!ATTLIST to
+type (redirect|temporary-redirect|permanent-redirect|pre-include|post-include|forward|passthrough|proxy) "forward"
+last (true|false) "false"
+encode (true|false) #IMPLIED
+context CDATA  #IMPLIED
+>
+
+<!--
+eg,
+<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="runMeFool" />
+<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="run">
+ <init-param>
+ <param-name>biteMe</param-name>
+ <param-value>10</param-value>
+ </init-param>
+</run>
+-->
+<!ELEMENT run (init-param*)>
+<!ATTLIST run
+class  CDATA  #IMPLIED
+method  CDATA  #IMPLIED
+jsonhandler (true|false) "false"
+neweachtime (true|false) "false"
+>
+
+<!ELEMENT init-param (param-name, param-value)>
+<!ELEMENT param-name (#PCDATA)>
+<!ELEMENT param-value (#PCDATA)>
+
+<!ELEMENT catch (run?)>
+<!ATTLIST catch
+class CDATA #IMPLIED
+>
diff --git a/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite3.3.dtd b/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite3.3.dtd
index bb812a3a..c0f211f7 100644
--- a/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite3.3.dtd
+++ b/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite3.3.dtd
@@ -1,94 +1,123 @@
-<!--
- UrlRewriteFilter DTD
- http://www.tuckey.org/urlrewrite/
--->
-
-<!ELEMENT urlrewrite ((rule|class-rule|outbound-rule)*, catch*)>
-<!ATTLIST urlrewrite
-use-query-string (true|false) "false"
-use-context  (true|false) "false"
-decode-using CDATA  #IMPLIED
-default-match-type (regex|wildcard) #IMPLIED
->
-
-<!ELEMENT rule (name?, note?, condition*, from?, set*, run*, gzip?, to?)>
-<!ATTLIST rule
-enabled  (true|false) "true"
-match-type  (regex|wildcard) #IMPLIED
->
-
-<!ELEMENT class-rule EMPTY>
-<!ATTLIST class-rule
-class  CDATA #IMPLIED
-method CDATA "matches"
-last (true|false) "true"
->
-
-<!ELEMENT outbound-rule (name?, note?, condition*, from, set*, run*, to?)>
-<!ATTLIST outbound-rule
-enabled  (true|false) "true"
-encodefirst  (true|false) "false"
-match-type  (regex|wildcard) #IMPLIED
->
-
-<!ELEMENT name (#PCDATA)>
-<!ELEMENT note (#PCDATA)>
-
-<!ELEMENT condition (#PCDATA)>
-<!ATTLIST condition
-type (time|year|month|dayofmonth|dayofweek|ampm|hourofday|minute|second|millisecond|attribute|auth-type|character-encoding|content-length|content-type|context-path|cookie|header|local-port|method|parameter|path-info|path-translated|protocol|query-string|remote-addr|remote-host|remote-user|requested-session-id|request-uri|request-url|session-attribute|session-isnew|port|server-name|scheme|user-in-role|exception) "header"
-name CDATA  #IMPLIED
-next (and|or)  "and"
-casesensitive (true|false) "false"
-operator (equal|notequal|greater|less|greaterorequal|lessorequal|instanceof) "equal"
->
-
-<!ELEMENT from (#PCDATA)>
-<!ATTLIST from
-casesensitive (true|false) "false"
->
-
-<!ELEMENT set (#PCDATA)>
-<!ATTLIST set
-type (request|session|response-header|cookie|content-type|charset|locale|status|expires|parameter|method) "request"
-name CDATA  #IMPLIED
->
-
-<!ELEMENT to (#PCDATA)>
-<!ATTLIST to
-type (redirect|temporary-redirect|permanent-redirect|pre-include|post-include|forward|passthrough|proxy) "forward"
-last (true|false) "false"
-encode (true|false) #IMPLIED
-context CDATA  #IMPLIED
->
-
-<!--
-eg,
-<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="runMeFool" />
-<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="run">
- <init-param>
- <param-name>biteMe</param-name>
- <param-value>10</param-value>
- </init-param>
-</run>
--->
-<!ELEMENT run (init-param*)>
-<!ATTLIST run
-class  CDATA  #IMPLIED
-method  CDATA  #IMPLIED
-jsonhandler (true|false) "false"
-neweachtime (true|false) "false"
->
-
-<!-- shortcut for org.tuckey.web.filters.urlrewrite.utils.GzipFilterRun -->
-<!ELEMENT gzip (init-param*)>
-
-
-<!ELEMENT init-param (param-name, param-value)>
-<!ELEMENT param-name (#PCDATA)>
-<!ELEMENT param-value (#PCDATA)>
-
-<!ELEMENT catch (run?)>
-<!ATTLIST catch
-class CDATA #IMPLIED
->
+<!--
+UrlRewriteFilter DTD
+http://www.tuckey.org/urlrewrite/
+
+Licensed under the BSD License. Text as follows.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+  - Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+  - Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+  - Neither the name tuckey.org nor the names of its contributors
+    may be used to endorse or promote products derived from this
+    software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<!ELEMENT urlrewrite ((rule|class-rule|outbound-rule)*, catch*)>
+<!ATTLIST urlrewrite
+use-query-string (true|false) "false"
+use-context  (true|false) "false"
+decode-using CDATA  #IMPLIED
+default-match-type (regex|wildcard) #IMPLIED
+>
+
+<!ELEMENT rule (name?, note?, condition*, from?, set*, run*, gzip?, to?)>
+<!ATTLIST rule
+enabled  (true|false) "true"
+match-type  (regex|wildcard) #IMPLIED
+>
+
+<!ELEMENT class-rule EMPTY>
+<!ATTLIST class-rule
+class  CDATA #IMPLIED
+method CDATA "matches"
+last (true|false) "true"
+>
+
+<!ELEMENT outbound-rule (name?, note?, condition*, from, set*, run*, to?)>
+<!ATTLIST outbound-rule
+enabled  (true|false) "true"
+encodefirst  (true|false) "false"
+match-type  (regex|wildcard) #IMPLIED
+>
+
+<!ELEMENT name (#PCDATA)>
+<!ELEMENT note (#PCDATA)>
+
+<!ELEMENT condition (#PCDATA)>
+<!ATTLIST condition
+type (time|year|month|dayofmonth|dayofweek|ampm|hourofday|minute|second|millisecond|attribute|auth-type|character-encoding|content-length|content-type|context-path|cookie|header|local-port|method|parameter|path-info|path-translated|protocol|query-string|remote-addr|remote-host|remote-user|requested-session-id|request-uri|request-url|session-attribute|session-isnew|port|server-name|scheme|user-in-role|exception) "header"
+name CDATA  #IMPLIED
+next (and|or)  "and"
+casesensitive (true|false) "false"
+operator (equal|notequal|greater|less|greaterorequal|lessorequal|instanceof) "equal"
+>
+
+<!ELEMENT from (#PCDATA)>
+<!ATTLIST from
+casesensitive (true|false) "false"
+>
+
+<!ELEMENT set (#PCDATA)>
+<!ATTLIST set
+type (request|session|response-header|cookie|content-type|charset|locale|status|expires|parameter|method) "request"
+name CDATA  #IMPLIED
+>
+
+<!ELEMENT to (#PCDATA)>
+<!ATTLIST to
+type (redirect|temporary-redirect|permanent-redirect|pre-include|post-include|forward|passthrough|proxy) "forward"
+last (true|false) "false"
+encode (true|false) #IMPLIED
+context CDATA  #IMPLIED
+>
+
+<!--
+eg,
+<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="runMeFool" />
+<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="run">
+ <init-param>
+ <param-name>biteMe</param-name>
+ <param-value>10</param-value>
+ </init-param>
+</run>
+-->
+<!ELEMENT run (init-param*)>
+<!ATTLIST run
+class  CDATA  #IMPLIED
+method  CDATA  #IMPLIED
+jsonhandler (true|false) "false"
+neweachtime (true|false) "false"
+>
+
+<!-- shortcut for org.tuckey.web.filters.urlrewrite.utils.GzipFilterRun -->
+<!ELEMENT gzip (init-param*)>
+
+
+<!ELEMENT init-param (param-name, param-value)>
+<!ELEMENT param-name (#PCDATA)>
+<!ELEMENT param-value (#PCDATA)>
+
+<!ELEMENT catch (run?)>
+<!ATTLIST catch
+class CDATA #IMPLIED
+>
diff --git a/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite4.0.dtd b/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite4.0.dtd
index 60fa3aab..b97658d8 100644
--- a/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite4.0.dtd
+++ b/src/main/resources/org/tuckey/web/filters/urlrewrite/dtds/urlrewrite4.0.dtd
@@ -1,96 +1,125 @@
-<!--
- UrlRewriteFilter DTD
- http://www.tuckey.org/urlrewrite/
--->
-
-<!ELEMENT urlrewrite ((rule|class-rule|outbound-rule)*, catch*)>
-<!ATTLIST urlrewrite
-use-query-string (true|false) "false"
-use-context  (true|false) "false"
-decode-using CDATA  #IMPLIED
-default-match-type (regex|wildcard) #IMPLIED
->
-
-<!ELEMENT rule (name?, note?, condition*, from?, set*, run*, gzip?, to?)>
-<!ATTLIST rule
-enabled  (true|false) "true"
-match-type  (regex|wildcard) #IMPLIED
->
-
-<!ELEMENT class-rule EMPTY>
-<!ATTLIST class-rule
-class  CDATA #IMPLIED
-method CDATA "matches"
-last (true|false) "true"
->
-
-<!ELEMENT outbound-rule (name?, note?, condition*, from, set*, run*, to?)>
-<!ATTLIST outbound-rule
-enabled  (true|false) "true"
-encodefirst  (true|false) "false"
-match-type  (regex|wildcard) #IMPLIED
->
-
-<!ELEMENT name (#PCDATA)>
-<!ELEMENT note (#PCDATA)>
-
-<!ELEMENT condition (#PCDATA)>
-<!ATTLIST condition
-type (time|year|month|dayofmonth|dayofweek|ampm|hourofday|minute|second|millisecond|attribute|auth-type|character-encoding|content-length|content-type|context-path|cookie|header|local-port|method|parameter|path-info|path-translated|protocol|query-string|remote-addr|remote-host|remote-user|requested-session-id|request-uri|request-url|session-attribute|session-isnew|port|server-name|scheme|user-in-role|exception|request-filename) "header"
-name CDATA  #IMPLIED
-next (and|or)  "and"
-casesensitive (true|false) "false"
-operator (equal|notequal|greater|less|greaterorequal|lessorequal|instanceof|isdir|isfile|isfilewithsize|notdir|notfile|notfilewithsize) "equal"
->
-
-<!ELEMENT from (#PCDATA)>
-<!ATTLIST from
-casesensitive (true|false) "false"
->
-
-<!ELEMENT set (#PCDATA)>
-<!ATTLIST set
-type (request|session|response-header|cookie|content-type|charset|locale|status|expires|parameter|method) "request"
-name CDATA  #IMPLIED
->
-
-<!ELEMENT to (#PCDATA)>
-<!ATTLIST to
-type (redirect|temporary-redirect|permanent-redirect|pre-include|post-include|forward|passthrough|proxy) "forward"
-last (true|false) "false"
-qsappend (true|false) "false"
-drop-cookies (true|false) "true"
-encode (true|false) #IMPLIED
-context CDATA  #IMPLIED
->
-
-<!--
-eg,
-<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="runMeFool" />
-<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="run">
- <init-param>
- <param-name>biteMe</param-name>
- <param-value>10</param-value>
- </init-param>
-</run>
--->
-<!ELEMENT run (init-param*)>
-<!ATTLIST run
-class  CDATA  #IMPLIED
-method  CDATA  #IMPLIED
-jsonhandler (true|false) "false"
-neweachtime (true|false) "false"
->
-
-<!-- shortcut for org.tuckey.web.filters.urlrewrite.utils.GzipFilterRun -->
-<!ELEMENT gzip (init-param*)>
-
-
-<!ELEMENT init-param (param-name, param-value)>
-<!ELEMENT param-name (#PCDATA)>
-<!ELEMENT param-value (#PCDATA)>
-
-<!ELEMENT catch (run?)>
-<!ATTLIST catch
-class CDATA #IMPLIED
->
+<!--
+UrlRewriteFilter DTD
+http://www.tuckey.org/urlrewrite/
+
+Licensed under the BSD License. Text as follows.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+  - Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+  - Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+  - Neither the name tuckey.org nor the names of its contributors
+    may be used to endorse or promote products derived from this
+    software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<!ELEMENT urlrewrite ((rule|class-rule|outbound-rule)*, catch*)>
+<!ATTLIST urlrewrite
+use-query-string (true|false) "false"
+use-context  (true|false) "false"
+decode-using CDATA  #IMPLIED
+default-match-type (regex|wildcard) #IMPLIED
+>
+
+<!ELEMENT rule (name?, note?, condition*, from?, set*, run*, gzip?, to?)>
+<!ATTLIST rule
+enabled  (true|false) "true"
+match-type  (regex|wildcard) #IMPLIED
+>
+
+<!ELEMENT class-rule EMPTY>
+<!ATTLIST class-rule
+class  CDATA #IMPLIED
+method CDATA "matches"
+last (true|false) "true"
+>
+
+<!ELEMENT outbound-rule (name?, note?, condition*, from, set*, run*, to?)>
+<!ATTLIST outbound-rule
+enabled  (true|false) "true"
+encodefirst  (true|false) "false"
+match-type  (regex|wildcard) #IMPLIED
+>
+
+<!ELEMENT name (#PCDATA)>
+<!ELEMENT note (#PCDATA)>
+
+<!ELEMENT condition (#PCDATA)>
+<!ATTLIST condition
+type (time|year|month|dayofmonth|dayofweek|ampm|hourofday|minute|second|millisecond|attribute|auth-type|character-encoding|content-length|content-type|context-path|cookie|header|local-port|method|parameter|path-info|path-translated|protocol|query-string|remote-addr|remote-host|remote-user|requested-session-id|request-uri|request-url|session-attribute|session-isnew|port|server-name|scheme|user-in-role|exception|request-filename) "header"
+name CDATA  #IMPLIED
+next (and|or)  "and"
+casesensitive (true|false) "false"
+operator (equal|notequal|greater|less|greaterorequal|lessorequal|instanceof|isdir|isfile|isfilewithsize|notdir|notfile|notfilewithsize) "equal"
+>
+
+<!ELEMENT from (#PCDATA)>
+<!ATTLIST from
+casesensitive (true|false) "false"
+>
+
+<!ELEMENT set (#PCDATA)>
+<!ATTLIST set
+type (request|session|response-header|cookie|content-type|charset|locale|status|expires|parameter|method) "request"
+name CDATA  #IMPLIED
+>
+
+<!ELEMENT to (#PCDATA)>
+<!ATTLIST to
+type (redirect|temporary-redirect|permanent-redirect|pre-include|post-include|forward|passthrough|proxy) "forward"
+last (true|false) "false"
+qsappend (true|false) "false"
+drop-cookies (true|false) "true"
+encode (true|false) #IMPLIED
+context CDATA  #IMPLIED
+>
+
+<!--
+eg,
+<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="runMeFool" />
+<run class="org.tuckey.web.filters.urlrewrite.TestTargetOther" method="run">
+ <init-param>
+ <param-name>biteMe</param-name>
+ <param-value>10</param-value>
+ </init-param>
+</run>
+-->
+<!ELEMENT run (init-param*)>
+<!ATTLIST run
+class  CDATA  #IMPLIED
+method  CDATA  #IMPLIED
+jsonhandler (true|false) "false"
+neweachtime (true|false) "false"
+>
+
+<!-- shortcut for org.tuckey.web.filters.urlrewrite.utils.GzipFilterRun -->
+<!ELEMENT gzip (init-param*)>
+
+
+<!ELEMENT init-param (param-name, param-value)>
+<!ELEMENT param-name (#PCDATA)>
+<!ELEMENT param-value (#PCDATA)>
+
+<!ELEMENT catch (run?)>
+<!ATTLIST catch
+class CDATA #IMPLIED
+>