Re: [tomcat] branch main updated: Avoid runtime dependency on the migration tool unless it is being used
On Mon, Nov 14, 2022 at 11:38 PM wrote:
>
> This is an automated email from the ASF dual-hosted git repository.
>
> markt pushed a commit to branch main
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>
>
> The following commit(s) were added to refs/heads/main by this push:
> new dc5cab83ae Avoid runtime dependency on the migration tool unless it
> is being used
> dc5cab83ae is described below
>
> commit dc5cab83ae13804152b3d1bab90fafb9582764da
> Author: Mark Thomas
> AuthorDate: Mon Nov 14 22:37:54 2022 +
>
> Avoid runtime dependency on the migration tool unless it is being used
Good idea and nice trick.
Rémy
> ---
> java/org/apache/catalina/loader/WebappLoader.java | 29
> ---
> webapps/docs/changelog.xml| 5
> 2 files changed, 26 insertions(+), 8 deletions(-)
>
> diff --git a/java/org/apache/catalina/loader/WebappLoader.java
> b/java/org/apache/catalina/loader/WebappLoader.java
> index a8fe3cf806..ae4f58523d 100644
> --- a/java/org/apache/catalina/loader/WebappLoader.java
> +++ b/java/org/apache/catalina/loader/WebappLoader.java
> @@ -367,14 +367,7 @@ public class WebappLoader extends LifecycleMBeanBase
> implements Loader{
>
> // Set Jakarta class converter
> if (getJakartaConverter() != null) {
> -EESpecProfile profile = null;
> -try {
> -profile = EESpecProfiles.valueOf(getJakartaConverter());
> -} catch (IllegalArgumentException ignored) {
> -// Use default value
> -log.warn(sm.getString("webappLoader.unknownProfile",
> getJakartaConverter()));
> -}
> -classLoader.addTransformer((profile != null) ? new
> ClassConverter(profile) : new ClassConverter());
> +MigrationUtil.addJakartaEETransformer(classLoader,
> getJakartaConverter());
> }
>
> // Configure our repositories
> @@ -631,4 +624,24 @@ public class WebappLoader extends LifecycleMBeanBase
> implements Loader{
>
> return name.toString();
> }
> +
> +
> +/*
> + * Implemented in a sub-class so EESpecProfile and EESpecProfiles are not
> + * loaded unless a profile is configured. Otherwise,
> tomcat-embed-core.jar
> + * has a runtime dependency on the migration tool whether it is used or
> not.
> + */
> +private static class MigrationUtil {
> +
> +public static void addJakartaEETransformer(WebappClassLoaderBase
> webappClassLoader, String profileName) {
> +EESpecProfile profile = null;
> +try {
> +profile = EESpecProfiles.valueOf(profileName);
> +} catch (IllegalArgumentException ignored) {
> +// Use default value
> +log.warn(sm.getString("webappLoader.unknownProfile",
> profileName));
> +}
> +webappClassLoader.addTransformer((profile != null) ? new
> ClassConverter(profile) : new ClassConverter());
> +}
> +}
> }
> diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
> index cbf01a7ebb..ddf984a862 100644
> --- a/webapps/docs/changelog.xml
> +++ b/webapps/docs/changelog.xml
> @@ -152,6 +152,11 @@
> HttpServletRequest.getTrailerFields() and with the
> Servlet
> API provided by the Jakarta EE project. (markt)
>
> +
> +Refactor WebappLoader so it only has a runtime
> dependency
> +on the migration tool for Jakarta EE if configured to use the
> converter
> +as classes are loaded. (markt)
> +
>
>
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Avoid runtime dependency on the migration tool unless it is being used
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 55f41d78c7 Avoid runtime dependency on the migration tool unless it is
being used
55f41d78c7 is described below
commit 55f41d78c778a82e315b9980b56ff50e89e3af57
Author: Mark Thomas
AuthorDate: Mon Nov 14 22:37:54 2022 +
Avoid runtime dependency on the migration tool unless it is being used
---
java/org/apache/catalina/loader/WebappLoader.java | 29 ---
webapps/docs/changelog.xml| 5
2 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/catalina/loader/WebappLoader.java
b/java/org/apache/catalina/loader/WebappLoader.java
index a8fe3cf806..ae4f58523d 100644
--- a/java/org/apache/catalina/loader/WebappLoader.java
+++ b/java/org/apache/catalina/loader/WebappLoader.java
@@ -367,14 +367,7 @@ public class WebappLoader extends LifecycleMBeanBase
implements Loader{
// Set Jakarta class converter
if (getJakartaConverter() != null) {
-EESpecProfile profile = null;
-try {
-profile = EESpecProfiles.valueOf(getJakartaConverter());
-} catch (IllegalArgumentException ignored) {
-// Use default value
-log.warn(sm.getString("webappLoader.unknownProfile",
getJakartaConverter()));
-}
-classLoader.addTransformer((profile != null) ? new
ClassConverter(profile) : new ClassConverter());
+MigrationUtil.addJakartaEETransformer(classLoader,
getJakartaConverter());
}
// Configure our repositories
@@ -631,4 +624,24 @@ public class WebappLoader extends LifecycleMBeanBase
implements Loader{
return name.toString();
}
+
+
+/*
+ * Implemented in a sub-class so EESpecProfile and EESpecProfiles are not
+ * loaded unless a profile is configured. Otherwise, tomcat-embed-core.jar
+ * has a runtime dependency on the migration tool whether it is used or
not.
+ */
+private static class MigrationUtil {
+
+public static void addJakartaEETransformer(WebappClassLoaderBase
webappClassLoader, String profileName) {
+EESpecProfile profile = null;
+try {
+profile = EESpecProfiles.valueOf(profileName);
+} catch (IllegalArgumentException ignored) {
+// Use default value
+log.warn(sm.getString("webappLoader.unknownProfile",
profileName));
+}
+webappClassLoader.addTransformer((profile != null) ? new
ClassConverter(profile) : new ClassConverter());
+}
+}
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2e388f53c1..65c173 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -114,6 +114,11 @@
HttpServletRequest.getTrailerFields() and with the Servlet
API provided by the Jakarta EE project. (markt)
+
+Refactor WebappLoader so it only has a runtime dependency
+on the migration tool for Jakarta EE if configured to use the converter
+as classes are loaded. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Avoid runtime dependency on the migration tool unless it is being used
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new dc5cab83ae Avoid runtime dependency on the migration tool unless it is
being used
dc5cab83ae is described below
commit dc5cab83ae13804152b3d1bab90fafb9582764da
Author: Mark Thomas
AuthorDate: Mon Nov 14 22:37:54 2022 +
Avoid runtime dependency on the migration tool unless it is being used
---
java/org/apache/catalina/loader/WebappLoader.java | 29 ---
webapps/docs/changelog.xml| 5
2 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/catalina/loader/WebappLoader.java
b/java/org/apache/catalina/loader/WebappLoader.java
index a8fe3cf806..ae4f58523d 100644
--- a/java/org/apache/catalina/loader/WebappLoader.java
+++ b/java/org/apache/catalina/loader/WebappLoader.java
@@ -367,14 +367,7 @@ public class WebappLoader extends LifecycleMBeanBase
implements Loader{
// Set Jakarta class converter
if (getJakartaConverter() != null) {
-EESpecProfile profile = null;
-try {
-profile = EESpecProfiles.valueOf(getJakartaConverter());
-} catch (IllegalArgumentException ignored) {
-// Use default value
-log.warn(sm.getString("webappLoader.unknownProfile",
getJakartaConverter()));
-}
-classLoader.addTransformer((profile != null) ? new
ClassConverter(profile) : new ClassConverter());
+MigrationUtil.addJakartaEETransformer(classLoader,
getJakartaConverter());
}
// Configure our repositories
@@ -631,4 +624,24 @@ public class WebappLoader extends LifecycleMBeanBase
implements Loader{
return name.toString();
}
+
+
+/*
+ * Implemented in a sub-class so EESpecProfile and EESpecProfiles are not
+ * loaded unless a profile is configured. Otherwise, tomcat-embed-core.jar
+ * has a runtime dependency on the migration tool whether it is used or
not.
+ */
+private static class MigrationUtil {
+
+public static void addJakartaEETransformer(WebappClassLoaderBase
webappClassLoader, String profileName) {
+EESpecProfile profile = null;
+try {
+profile = EESpecProfiles.valueOf(profileName);
+} catch (IllegalArgumentException ignored) {
+// Use default value
+log.warn(sm.getString("webappLoader.unknownProfile",
profileName));
+}
+webappClassLoader.addTransformer((profile != null) ? new
ClassConverter(profile) : new ClassConverter());
+}
+}
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cbf01a7ebb..ddf984a862 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -152,6 +152,11 @@
HttpServletRequest.getTrailerFields() and with the Servlet
API provided by the Jakarta EE project. (markt)
+
+Refactor WebappLoader so it only has a runtime dependency
+on the migration tool for Jakarta EE if configured to use the converter
+as classes are loaded. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[ANN] Apache Tomcat 9.0.69 available
The Apache Tomcat team announces the immediate availability of Apache Tomcat 9.0.69. Apache Tomcat 9 is an open source software implementation of the Java Servlet, JavaServer Pages, Java Unified Expression Language, Java WebSocket and JASPIC technologies. Apache Tomcat 9.0.69 is a bugfix and feature release. The notable changes compared to 9.0.68 include: - Fix concurrency issue in evaluation of expression language containing lambda expressions. - Correct the date format used with the expires attribute of HTTP cookies. A single space rather than a single dash should be used to separate the day, month and year components to be compliant with RFC 6265. Along with lots of other bug fixes and improvements. Please refer to the change log for the complete list of changes: https://tomcat.apache.org/tomcat-9.0-doc/changelog.html Downloads: https://tomcat.apache.org/download-90.cgi Migration guides from Apache Tomcat 7.x and 8.x: https://tomcat.apache.org/migration.html Enjoy! - The Apache Tomcat team - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] jgneff commented on pull request #566: Allow reproducible builds of all JDBC JAR files
jgneff commented on PR #566: URL: https://github.com/apache/tomcat/pull/566#issuecomment-1314042008 After this fix, the only remaining difference that I have found between any two builds of Tomcat using the default Ant target is the build path that gets included in two XML files: ```console $ diff -qr lxd/output1 kvm/output1 Files lxd/output1/jdbc-pool/doc/changelog.xml and kvm/output1/jdbc-pool/doc/changelog.xml differ Files lxd/output1/jdbc-pool/doc/jdbc-pool.xml and kvm/output1/jdbc-pool/doc/jdbc-pool.xml differ ``` ```diff diff -r lxd/output1/jdbc-pool/doc/changelog.xml kvm/output1/jdbc-pool/doc/changelog.xml 19c19 < --- > diff -r lxd/output1/jdbc-pool/doc/jdbc-pool.xml kvm/output1/jdbc-pool/doc/jdbc-pool.xml 19c19 < --- > ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1905306 - in /tomcat/site/trunk/docs/tomcat-9.0-doc: annotationapi/jquery/ annotationapi/jquery/images/ api/jquery/ api/jquery/images/ elapi/jquery/ elapi/jquery/images/ jaspicapi/jquery/
Author: remm Date: Mon Nov 14 15:11:19 2022 New Revision: 1905306 URL: http://svn.apache.org/viewvc?rev=1905306=rev Log: Update site for 9.0.69 release (part 3) Removed: tomcat/site/trunk/docs/tomcat-9.0-doc/annotationapi/jquery/images/ tomcat/site/trunk/docs/tomcat-9.0-doc/annotationapi/jquery/jquery-3.5.1.js tomcat/site/trunk/docs/tomcat-9.0-doc/annotationapi/jquery/jquery-ui.css tomcat/site/trunk/docs/tomcat-9.0-doc/annotationapi/jquery/jquery-ui.js tomcat/site/trunk/docs/tomcat-9.0-doc/annotationapi/jquery/jquery-ui.structure.css tomcat/site/trunk/docs/tomcat-9.0-doc/annotationapi/jquery/jquery-ui.structure.min.css tomcat/site/trunk/docs/tomcat-9.0-doc/api/jquery/images/ tomcat/site/trunk/docs/tomcat-9.0-doc/api/jquery/jquery-3.5.1.js tomcat/site/trunk/docs/tomcat-9.0-doc/api/jquery/jquery-ui.css tomcat/site/trunk/docs/tomcat-9.0-doc/api/jquery/jquery-ui.js tomcat/site/trunk/docs/tomcat-9.0-doc/api/jquery/jquery-ui.structure.css tomcat/site/trunk/docs/tomcat-9.0-doc/api/jquery/jquery-ui.structure.min.css tomcat/site/trunk/docs/tomcat-9.0-doc/elapi/jquery/images/ tomcat/site/trunk/docs/tomcat-9.0-doc/elapi/jquery/jquery-3.5.1.js tomcat/site/trunk/docs/tomcat-9.0-doc/elapi/jquery/jquery-ui.css tomcat/site/trunk/docs/tomcat-9.0-doc/elapi/jquery/jquery-ui.js tomcat/site/trunk/docs/tomcat-9.0-doc/elapi/jquery/jquery-ui.structure.css tomcat/site/trunk/docs/tomcat-9.0-doc/elapi/jquery/jquery-ui.structure.min.css tomcat/site/trunk/docs/tomcat-9.0-doc/jaspicapi/jquery/images/ tomcat/site/trunk/docs/tomcat-9.0-doc/jaspicapi/jquery/jquery-3.5.1.js tomcat/site/trunk/docs/tomcat-9.0-doc/jaspicapi/jquery/jquery-ui.css tomcat/site/trunk/docs/tomcat-9.0-doc/jaspicapi/jquery/jquery-ui.js tomcat/site/trunk/docs/tomcat-9.0-doc/jaspicapi/jquery/jquery-ui.structure.css tomcat/site/trunk/docs/tomcat-9.0-doc/jaspicapi/jquery/jquery-ui.structure.min.css tomcat/site/trunk/docs/tomcat-9.0-doc/jspapi/jquery/images/ tomcat/site/trunk/docs/tomcat-9.0-doc/jspapi/jquery/jquery-3.5.1.js tomcat/site/trunk/docs/tomcat-9.0-doc/jspapi/jquery/jquery-ui.css tomcat/site/trunk/docs/tomcat-9.0-doc/jspapi/jquery/jquery-ui.js tomcat/site/trunk/docs/tomcat-9.0-doc/jspapi/jquery/jquery-ui.structure.css tomcat/site/trunk/docs/tomcat-9.0-doc/jspapi/jquery/jquery-ui.structure.min.css tomcat/site/trunk/docs/tomcat-9.0-doc/servletapi/jquery/images/ tomcat/site/trunk/docs/tomcat-9.0-doc/servletapi/jquery/jquery-3.5.1.js tomcat/site/trunk/docs/tomcat-9.0-doc/servletapi/jquery/jquery-ui.css tomcat/site/trunk/docs/tomcat-9.0-doc/servletapi/jquery/jquery-ui.js tomcat/site/trunk/docs/tomcat-9.0-doc/servletapi/jquery/jquery-ui.structure.css tomcat/site/trunk/docs/tomcat-9.0-doc/servletapi/jquery/jquery-ui.structure.min.css tomcat/site/trunk/docs/tomcat-9.0-doc/websocketapi/jquery/images/ tomcat/site/trunk/docs/tomcat-9.0-doc/websocketapi/jquery/jquery-3.5.1.js tomcat/site/trunk/docs/tomcat-9.0-doc/websocketapi/jquery/jquery-ui.css tomcat/site/trunk/docs/tomcat-9.0-doc/websocketapi/jquery/jquery-ui.js tomcat/site/trunk/docs/tomcat-9.0-doc/websocketapi/jquery/jquery-ui.structure.css tomcat/site/trunk/docs/tomcat-9.0-doc/websocketapi/jquery/jquery-ui.structure.min.css - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1905305 [2/7] - in /tomcat/site/trunk/docs/tomcat-9.0-doc: annotationapi/ annotationapi/jquery/ api/ api/jquery/ api/org/apache/catalina/ api/org/apache/el/lang/ elapi/ elapi/jquery/ jasp
Added: tomcat/site/trunk/docs/tomcat-9.0-doc/api/jquery/jquery-3.6.0.min.js
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-9.0-doc/api/jquery/jquery-3.6.0.min.js?rev=1905305=auto
==
--- tomcat/site/trunk/docs/tomcat-9.0-doc/api/jquery/jquery-3.6.0.min.js (added)
+++ tomcat/site/trunk/docs/tomcat-9.0-doc/api/jquery/jquery-3.6.0.min.js Mon
Nov 14 15:07:46 2022
@@ -0,0 +1,2 @@
+/*! jQuery v3.6.0 | (c) OpenJS Foundation and other contributors |
jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof
module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw
new Error("jQuery requires a window with a document");return
t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use
strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return
t.flat.call(e)}:function(e){return
t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof
e&&"number"!=typeof e.nodeType&&"function"!=typeof
e.item},x=function(e){return
null!=e&===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function
b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in
c)(i=t[r]||t.getAttribute&(r))&(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function
w(e){return null==e?e+"":"object"==typeof e||"function"==typeof
e?n[o.call(e)]||"o
bject":typeof e}var f="3.6.0",S=function(e,t){return new
S.fn.init(e,t)};function p(e){var t=!!e&&"length"in
e&,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof
t&&0+~]|"+M+")"+M+"*"),U=new
RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new
RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new
RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD
:new
RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new
RegExp("^(?:"+R+")$","i"),needsContext:new
RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native
\w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new
RegExp("[\\da-fA-F]{1,6}"+M+"?|([^\\r\\n\\f])","g"),ne=function(e,t){var
n="0x"+e.slice(1)-65536;return
t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\u\w-]/g,ie=function(e,t){return
t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+"
":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.chil
dNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var
n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var
i,o,a,s,u,l,c,f=e&,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof
t||!t||1!==p&&9!==p&&11!==p)return
n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return
n;if(a.id===i)return n.push(a),n}else
if(f&&(a=f.getElementById(i))&(e,a)&===i)return
n.push(a),n}else{if(u[2])return
H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&)return
H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+"
"]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&(e.parentNode)||e)===e&||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+"
"+xe(l[o]);c=l.join(",")}try{return
H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&("id")}}}return
g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function
e(t,n){return r.push(t+" ")>b.cacheLength& e[r.shift()],e[t+"
"]=n}}function le(e){return e[S]=!0,e}function ce(e){var
t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&(t),t=null}}function
fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function
pe(e,t){var
n=t&,r=n&&1===e.nodeType&&1===t.nodeType&if(r)return
r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function
de(t){return
function(e){return"input"===e.nodeName.toLowerCase()&===t}}function
he(n){return function(e){var
t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&===n}}function
ge(t){return function(e){return"form"in
e?e.parentNode&&!1===e.disabled?"label"in e?"label"in
e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&(e)===t:e.disabled===t:"label"in
e&===t}}function ve(a){return le(function(o){return
svn commit: r1905305 [6/7] - in /tomcat/site/trunk/docs/tomcat-9.0-doc: annotationapi/ annotationapi/jquery/ api/ api/jquery/ api/org/apache/catalina/ api/org/apache/el/lang/ elapi/ elapi/jquery/ jasp
Added: tomcat/site/trunk/docs/tomcat-9.0-doc/jspapi/jquery/jquery-3.6.0.min.js
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-9.0-doc/jspapi/jquery/jquery-3.6.0.min.js?rev=1905305=auto
==
--- tomcat/site/trunk/docs/tomcat-9.0-doc/jspapi/jquery/jquery-3.6.0.min.js
(added)
+++ tomcat/site/trunk/docs/tomcat-9.0-doc/jspapi/jquery/jquery-3.6.0.min.js Mon
Nov 14 15:07:46 2022
@@ -0,0 +1,2 @@
+/*! jQuery v3.6.0 | (c) OpenJS Foundation and other contributors |
jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof
module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw
new Error("jQuery requires a window with a document");return
t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use
strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return
t.flat.call(e)}:function(e){return
t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof
e&&"number"!=typeof e.nodeType&&"function"!=typeof
e.item},x=function(e){return
null!=e&===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function
b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in
c)(i=t[r]||t.getAttribute&(r))&(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function
w(e){return null==e?e+"":"object"==typeof e||"function"==typeof
e?n[o.call(e)]||"o
bject":typeof e}var f="3.6.0",S=function(e,t){return new
S.fn.init(e,t)};function p(e){var t=!!e&&"length"in
e&,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof
t&&0+~]|"+M+")"+M+"*"),U=new
RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new
RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new
RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD
:new
RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new
RegExp("^(?:"+R+")$","i"),needsContext:new
RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native
\w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new
RegExp("[\\da-fA-F]{1,6}"+M+"?|([^\\r\\n\\f])","g"),ne=function(e,t){var
n="0x"+e.slice(1)-65536;return
t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\u\w-]/g,ie=function(e,t){return
t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+"
":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.chil
dNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var
n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var
i,o,a,s,u,l,c,f=e&,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof
t||!t||1!==p&&9!==p&&11!==p)return
n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return
n;if(a.id===i)return n.push(a),n}else
if(f&&(a=f.getElementById(i))&(e,a)&===i)return
n.push(a),n}else{if(u[2])return
H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&)return
H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+"
"]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&(e.parentNode)||e)===e&||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+"
"+xe(l[o]);c=l.join(",")}try{return
H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&("id")}}}return
g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function
e(t,n){return r.push(t+" ")>b.cacheLength& e[r.shift()],e[t+"
"]=n}}function le(e){return e[S]=!0,e}function ce(e){var
t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&(t),t=null}}function
fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function
pe(e,t){var
n=t&,r=n&&1===e.nodeType&&1===t.nodeType&if(r)return
r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function
de(t){return
function(e){return"input"===e.nodeName.toLowerCase()&===t}}function
he(n){return function(e){var
t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&===n}}function
ge(t){return function(e){return"form"in
e?e.parentNode&&!1===e.disabled?"label"in e?"label"in
e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&(e)===t:e.disabled===t:"label"in
e&===t}}function ve(a){return
svn commit: r1905305 [3/7] - in /tomcat/site/trunk/docs/tomcat-9.0-doc: annotationapi/ annotationapi/jquery/ api/ api/jquery/ api/org/apache/catalina/ api/org/apache/el/lang/ elapi/ elapi/jquery/ jasp
Added:
tomcat/site/trunk/docs/tomcat-9.0-doc/api/org/apache/catalina/WebResourceRoot.ArchiveIndexStrategy.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-9.0-doc/api/org/apache/catalina/WebResourceRoot.ArchiveIndexStrategy.html?rev=1905305=auto
==
---
tomcat/site/trunk/docs/tomcat-9.0-doc/api/org/apache/catalina/WebResourceRoot.ArchiveIndexStrategy.html
(added)
+++
tomcat/site/trunk/docs/tomcat-9.0-doc/api/org/apache/catalina/WebResourceRoot.ArchiveIndexStrategy.html
Mon Nov 14 15:07:46 2022
@@ -0,0 +1,424 @@
+
+
+
+
+
+WebResourceRoot.ArchiveIndexStrategy (Apache Tomcat 9.0.69 API
Documentation)
+
+
+
+
+
+
+
+
+
+
+
+
+
+var data = {"i0":10,"i1":10,"i2":9,"i3":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static
Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+
+
+
+Skip navigation links
+
+
+
+
+Overview
+Package
+Class
+Tree
+Deprecated
+Index
+Help
+
+Apache Tomcat 9.0.69
+
+
+
+AllClasses
+
+
+SEARCH:
+
+
+
+
+
+
+
+
+JavaScript is disabled on your browser.
+
+
+
+
+Summary:
+Nested|
+Enum Constants|
+Field|
+Method
+
+
+Detail:
+Enum Constants|
+Field|
+Method
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Packageorg.apache.catalina
+Enum
WebResourceRoot.ArchiveIndexStrategy
+
+
+
+java.lang.Object
+
+
+java.lang.EnumWebResourceRoot.ArchiveIndexStrategy
+
+
+org.apache.catalina.WebResourceRoot.ArchiveIndexStrategy
+
+
+
+
+
+
+
+
+
+All Implemented Interfaces:
+java.io.Serializable, java.lang.ComparableWebResourceRoot.ArchiveIndexStrategy
+
+
+Enclosing interface:
+WebResourceRoot
+
+
+public static enum WebResourceRoot.ArchiveIndexStrategy
+extends java.lang.EnumWebResourceRoot.ArchiveIndexStrategy
+
+
+
+
+
+
+
+
+
+
+
+
+Enum Constant Summary
+
+Enum Constants
+
+Enum Constant
+Description
+
+
+BLOOM
+
+
+
+PURGED
+
+
+
+SIMPLE
+
+
+
+
+
+
+
+
+
+
+
+
+Method Summary
+
+All MethodsStatic MethodsInstance MethodsConcrete Methods
+
+Modifier and Type
+Method
+Description
+
+
+boolean
+getRetain()
+
+
+
+boolean
+getUsesBloom()
+
+
+
+static WebResourceRoot.ArchiveIndexStrategy
+valueOf(java.lang.Stringname)
+
+Returns the enum constant of this type with the specified
name.
+
+
+
+static WebResourceRoot.ArchiveIndexStrategy[]
+values()
+
+Returns an array containing the constants of this enum
type, in
+the order they are declared.
+
+
+
+
+
+
+
+Methods inherited from classjava.lang.Enum
+clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name,
ordinal, toString, valueOf
+
+
+
+
+
+Methods inherited from classjava.lang.Object
+getClass, notify, notifyAll, wait, wait, wait
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Enum Constant Detail
+
+
+
+
+
+SIMPLE
+public static finalWebResourceRoot.ArchiveIndexStrategy SIMPLE
+
+
+
+
+
+
+
+BLOOM
+public static finalWebResourceRoot.ArchiveIndexStrategy BLOOM
+
+
+
+
+
+
+
+PURGED
+public static finalWebResourceRoot.ArchiveIndexStrategy PURGED
+
+
+
+
+
+
+
+
+
+
+
+Method Detail
+
+
+
+
+
+values
+public staticWebResourceRoot.ArchiveIndexStrategy[]values()
+Returns an array containing the constants of this enum
type, in
+the order they are declared. This method may be used to iterate
+over the constants as follows:
+
+for (WebResourceRoot.ArchiveIndexStrategy c :
WebResourceRoot.ArchiveIndexStrategy.values())
+ System.out.println(c);
+
+
+Returns:
+an array containing the constants of this enum type, in the order they are
declared
+
+
+
+
+
+
+
+
+valueOf
+public staticWebResourceRoot.ArchiveIndexStrategyvalueOf(java.lang.Stringname)
+Returns the enum constant of this type with the specified
name.
+The string must match exactly an identifier used to declare an
+enum constant in this type. (Extraneous whitespace characters are
+not permitted.)
+
+Parameters:
+name - the name of the enum constant to be returned.
+Returns:
+the enum constant with the specified name
+Throws:
+java.lang.IllegalArgumentException - if this enum type has no
constant with the specified name
+java.lang.NullPointerException - if the argument is null
+
+
+
+
+
+
+
+
+getUsesBloom
+publicbooleangetUsesBloom()
+
+
+
+
+
+
+
+getRetain
+publicbooleangetRetain()
+
svn commit: r1905305 [5/7] - in /tomcat/site/trunk/docs/tomcat-9.0-doc: annotationapi/ annotationapi/jquery/ api/ api/jquery/ api/org/apache/catalina/ api/org/apache/el/lang/ elapi/ elapi/jquery/ jasp
Added: tomcat/site/trunk/docs/tomcat-9.0-doc/jaspicapi/jquery-ui.overrides.css
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-9.0-doc/jaspicapi/jquery-ui.overrides.css?rev=1905305=auto
==
--- tomcat/site/trunk/docs/tomcat-9.0-doc/jaspicapi/jquery-ui.overrides.css
(added)
+++ tomcat/site/trunk/docs/tomcat-9.0-doc/jaspicapi/jquery-ui.overrides.css Mon
Nov 14 15:07:46 2022
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+.ui-state-active,
+.ui-widget-content .ui-state-active,
+.ui-widget-header .ui-state-active,
+a.ui-button:active,
+.ui-button:active,
+.ui-button.ui-state-active:hover {
+/* Overrides the color of selection used in jQuery UI */
+background: #F8981D;
+border: 1px solid #F8981D;
+}
Added:
tomcat/site/trunk/docs/tomcat-9.0-doc/jaspicapi/jquery/jquery-3.6.0.min.js
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-9.0-doc/jaspicapi/jquery/jquery-3.6.0.min.js?rev=1905305=auto
==
--- tomcat/site/trunk/docs/tomcat-9.0-doc/jaspicapi/jquery/jquery-3.6.0.min.js
(added)
+++ tomcat/site/trunk/docs/tomcat-9.0-doc/jaspicapi/jquery/jquery-3.6.0.min.js
Mon Nov 14 15:07:46 2022
@@ -0,0 +1,2 @@
+/*! jQuery v3.6.0 | (c) OpenJS Foundation and other contributors |
jquery.org/license */
[... 2 lines stripped ...]
Added: tomcat/site/trunk/docs/tomcat-9.0-doc/jspapi/jquery-ui.overrides.css
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-9.0-doc/jspapi/jquery-ui.overrides.css?rev=1905305=auto
==
--- tomcat/site/trunk/docs/tomcat-9.0-doc/jspapi/jquery-ui.overrides.css (added)
+++ tomcat/site/trunk/docs/tomcat-9.0-doc/jspapi/jquery-ui.overrides.css Mon
Nov 14 15:07:46 2022
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+.ui-state-active,
+.ui-widget-content .ui-state-active,
+.ui-widget-header .ui-state-active,
+a.ui-button:active,
+.ui-button:active,
+.ui-button.ui-state-active:hover {
+/* Overrides the color of selection used in jQuery UI */
+background: #F8981D;
+border: 1px solid #F8981D;
+}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1905305 [4/7] - in /tomcat/site/trunk/docs/tomcat-9.0-doc: annotationapi/ annotationapi/jquery/ api/ api/jquery/ api/org/apache/catalina/ api/org/apache/el/lang/ elapi/ elapi/jquery/ jasp
Added: tomcat/site/trunk/docs/tomcat-9.0-doc/elapi/jquery/jquery-3.6.0.min.js
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-9.0-doc/elapi/jquery/jquery-3.6.0.min.js?rev=1905305=auto
==
--- tomcat/site/trunk/docs/tomcat-9.0-doc/elapi/jquery/jquery-3.6.0.min.js
(added)
+++ tomcat/site/trunk/docs/tomcat-9.0-doc/elapi/jquery/jquery-3.6.0.min.js Mon
Nov 14 15:07:46 2022
@@ -0,0 +1,2 @@
+/*! jQuery v3.6.0 | (c) OpenJS Foundation and other contributors |
jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof
module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw
new Error("jQuery requires a window with a document");return
t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use
strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return
t.flat.call(e)}:function(e){return
t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof
e&&"number"!=typeof e.nodeType&&"function"!=typeof
e.item},x=function(e){return
null!=e&===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function
b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in
c)(i=t[r]||t.getAttribute&(r))&(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function
w(e){return null==e?e+"":"object"==typeof e||"function"==typeof
e?n[o.call(e)]||"o
bject":typeof e}var f="3.6.0",S=function(e,t){return new
S.fn.init(e,t)};function p(e){var t=!!e&&"length"in
e&,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof
t&&0+~]|"+M+")"+M+"*"),U=new
RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new
RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new
RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD
:new
RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new
RegExp("^(?:"+R+")$","i"),needsContext:new
RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native
\w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new
RegExp("[\\da-fA-F]{1,6}"+M+"?|([^\\r\\n\\f])","g"),ne=function(e,t){var
n="0x"+e.slice(1)-65536;return
t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\u\w-]/g,ie=function(e,t){return
t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+"
":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.chil
dNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var
n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var
i,o,a,s,u,l,c,f=e&,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof
t||!t||1!==p&&9!==p&&11!==p)return
n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return
n;if(a.id===i)return n.push(a),n}else
if(f&&(a=f.getElementById(i))&(e,a)&===i)return
n.push(a),n}else{if(u[2])return
H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&)return
H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+"
"]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&(e.parentNode)||e)===e&||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+"
"+xe(l[o]);c=l.join(",")}try{return
H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&("id")}}}return
g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function
e(t,n){return r.push(t+" ")>b.cacheLength& e[r.shift()],e[t+"
"]=n}}function le(e){return e[S]=!0,e}function ce(e){var
t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&(t),t=null}}function
fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function
pe(e,t){var
n=t&,r=n&&1===e.nodeType&&1===t.nodeType&if(r)return
r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function
de(t){return
function(e){return"input"===e.nodeName.toLowerCase()&===t}}function
he(n){return function(e){var
t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&===n}}function
ge(t){return function(e){return"form"in
e?e.parentNode&&!1===e.disabled?"label"in e?"label"in
e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&(e)===t:e.disabled===t:"label"in
e&===t}}function ve(a){return le(function(o){return
svn commit: r1905305 [7/7] - in /tomcat/site/trunk/docs/tomcat-9.0-doc: annotationapi/ annotationapi/jquery/ api/ api/jquery/ api/org/apache/catalina/ api/org/apache/el/lang/ elapi/ elapi/jquery/ jasp
Added: tomcat/site/trunk/docs/tomcat-9.0-doc/servletapi/jquery-ui.overrides.css
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-9.0-doc/servletapi/jquery-ui.overrides.css?rev=1905305=auto
==
--- tomcat/site/trunk/docs/tomcat-9.0-doc/servletapi/jquery-ui.overrides.css
(added)
+++ tomcat/site/trunk/docs/tomcat-9.0-doc/servletapi/jquery-ui.overrides.css
Mon Nov 14 15:07:46 2022
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+.ui-state-active,
+.ui-widget-content .ui-state-active,
+.ui-widget-header .ui-state-active,
+a.ui-button:active,
+.ui-button:active,
+.ui-button.ui-state-active:hover {
+/* Overrides the color of selection used in jQuery UI */
+background: #F8981D;
+border: 1px solid #F8981D;
+}
Added:
tomcat/site/trunk/docs/tomcat-9.0-doc/servletapi/jquery/jquery-3.6.0.min.js
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-9.0-doc/servletapi/jquery/jquery-3.6.0.min.js?rev=1905305=auto
==
--- tomcat/site/trunk/docs/tomcat-9.0-doc/servletapi/jquery/jquery-3.6.0.min.js
(added)
+++ tomcat/site/trunk/docs/tomcat-9.0-doc/servletapi/jquery/jquery-3.6.0.min.js
Mon Nov 14 15:07:46 2022
@@ -0,0 +1,2 @@
+/*! jQuery v3.6.0 | (c) OpenJS Foundation and other contributors |
jquery.org/license */
[... 2 lines stripped ...]
Added:
tomcat/site/trunk/docs/tomcat-9.0-doc/websocketapi/jquery-ui.overrides.css
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-9.0-doc/websocketapi/jquery-ui.overrides.css?rev=1905305=auto
==
--- tomcat/site/trunk/docs/tomcat-9.0-doc/websocketapi/jquery-ui.overrides.css
(added)
+++ tomcat/site/trunk/docs/tomcat-9.0-doc/websocketapi/jquery-ui.overrides.css
Mon Nov 14 15:07:46 2022
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+.ui-state-active,
+.ui-widget-content .ui-state-active,
+.ui-widget-header .ui-state-active,
+a.ui-button:active,
+.ui-button:active,
+.ui-button.ui-state-active:hover {
+/* Overrides the color of selection used in jQuery UI */
+background: #F8981D;
+border: 1px solid #F8981D;
+}
Added:
tomcat/site/trunk/docs/tomcat-9.0-doc/websocketapi/jquery/jquery-3.6.0.min.js
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-9.0-doc/websocketapi/jquery/jquery-3.6.0.min.js?rev=1905305=auto
==
---
svn commit: r1905305 [1/7] - in /tomcat/site/trunk/docs/tomcat-9.0-doc: annotationapi/ annotationapi/jquery/ api/ api/jquery/ api/org/apache/catalina/ api/org/apache/el/lang/ elapi/ elapi/jquery/ jasp
Author: remm
Date: Mon Nov 14 15:07:46 2022
New Revision: 1905305
URL: http://svn.apache.org/viewvc?rev=1905305=rev
Log:
Update site for 9.0.69 release (part 2)
Added:
tomcat/site/trunk/docs/tomcat-9.0-doc/annotationapi/jquery-ui.overrides.css
tomcat/site/trunk/docs/tomcat-9.0-doc/annotationapi/jquery/jquery-3.6.0.min.js
tomcat/site/trunk/docs/tomcat-9.0-doc/api/jquery-ui.overrides.css
tomcat/site/trunk/docs/tomcat-9.0-doc/api/jquery/jquery-3.6.0.min.js
tomcat/site/trunk/docs/tomcat-9.0-doc/api/org/apache/catalina/WebResourceRoot.ArchiveIndexStrategy.html
tomcat/site/trunk/docs/tomcat-9.0-doc/api/org/apache/el/lang/LambdaExpressionNestedState.html
tomcat/site/trunk/docs/tomcat-9.0-doc/elapi/jquery-ui.overrides.css
tomcat/site/trunk/docs/tomcat-9.0-doc/elapi/jquery/jquery-3.6.0.min.js
tomcat/site/trunk/docs/tomcat-9.0-doc/jaspicapi/jquery-ui.overrides.css
tomcat/site/trunk/docs/tomcat-9.0-doc/jaspicapi/jquery/jquery-3.6.0.min.js
tomcat/site/trunk/docs/tomcat-9.0-doc/jspapi/jquery-ui.overrides.css
tomcat/site/trunk/docs/tomcat-9.0-doc/jspapi/jquery/jquery-3.6.0.min.js
tomcat/site/trunk/docs/tomcat-9.0-doc/servletapi/jquery-ui.overrides.css
tomcat/site/trunk/docs/tomcat-9.0-doc/servletapi/jquery/jquery-3.6.0.min.js
tomcat/site/trunk/docs/tomcat-9.0-doc/websocketapi/jquery-ui.overrides.css
tomcat/site/trunk/docs/tomcat-9.0-doc/websocketapi/jquery/jquery-3.6.0.min.js
Added:
tomcat/site/trunk/docs/tomcat-9.0-doc/annotationapi/jquery-ui.overrides.css
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-9.0-doc/annotationapi/jquery-ui.overrides.css?rev=1905305=auto
==
--- tomcat/site/trunk/docs/tomcat-9.0-doc/annotationapi/jquery-ui.overrides.css
(added)
+++ tomcat/site/trunk/docs/tomcat-9.0-doc/annotationapi/jquery-ui.overrides.css
Mon Nov 14 15:07:46 2022
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+.ui-state-active,
+.ui-widget-content .ui-state-active,
+.ui-widget-header .ui-state-active,
+a.ui-button:active,
+.ui-button:active,
+.ui-button.ui-state-active:hover {
+/* Overrides the color of selection used in jQuery UI */
+background: #F8981D;
+border: 1px solid #F8981D;
+}
Added:
tomcat/site/trunk/docs/tomcat-9.0-doc/annotationapi/jquery/jquery-3.6.0.min.js
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-9.0-doc/annotationapi/jquery/jquery-3.6.0.min.js?rev=1905305=auto
==
---
tomcat/site/trunk/docs/tomcat-9.0-doc/annotationapi/jquery/jquery-3.6.0.min.js
(added)
+++
tomcat/site/trunk/docs/tomcat-9.0-doc/annotationapi/jquery/jquery-3.6.0.min.js
Mon Nov 14 15:07:46 2022
@@ -0,0 +1,2 @@
+/*! jQuery v3.6.0 | (c) OpenJS Foundation and other contributors |
jquery.org/license */
[... 2 lines stripped ...]
Added: tomcat/site/trunk/docs/tomcat-9.0-doc/api/jquery-ui.overrides.css
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-9.0-doc/api/jquery-ui.overrides.css?rev=1905305=auto
==
--- tomcat/site/trunk/docs/tomcat-9.0-doc/api/jquery-ui.overrides.css (added)
+++ tomcat/site/trunk/docs/tomcat-9.0-doc/api/jquery-ui.overrides.css Mon Nov
14 15:07:46 2022
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the
svn commit: r1905304 - in /tomcat/site/trunk/docs/tomcat-9.0-doc: ./ annotationapi/ annotationapi/javax/annotation/ annotationapi/javax/annotation/security/ annotationapi/javax/annotation/sql/ annotat
Author: remm Date: Mon Nov 14 15:04:31 2022 New Revision: 1905304 URL: http://svn.apache.org/viewvc?rev=1905304=rev Log: Update site for 9.0.69 release (part 1) [This commit notification would consist of 135 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] aooohan closed pull request #568: 10.1.x
aooohan closed pull request #568: 10.1.x URL: https://github.com/apache/tomcat/pull/568 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] suamly2021 opened a new pull request, #568: 10.1.x
suamly2021 opened a new pull request, #568: URL: https://github.com/apache/tomcat/pull/568 Just for test -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated (ffe8e6d8e0 -> 1e8ed80849)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git from ffe8e6d8e0 Be stricter regarding invalid String/Character -> byte conversion add 1e8ed80849 Only need the simple/optimised path on Java < 16 No new revisions were added by this update. Summary of changes: java/org/apache/tomcat/util/buf/MessageBytes.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Add 10.1.2 release date
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new 1b23f91d4d Add 10.1.2 release date 1b23f91d4d is described below commit 1b23f91d4df3b079cdea436a55e517a1f80dd2b2 Author: Mark Thomas AuthorDate: Mon Nov 14 14:59:23 2022 + Add 10.1.2 release date --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 959431487e..2e388f53c1 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -117,7 +117,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1905303 - in /tomcat/site/trunk: ./ docs/ xdocs/
Author: remm Date: Mon Nov 14 14:56:42 2022 New Revision: 1905303 URL: http://svn.apache.org/viewvc?rev=1905303=rev Log: Update site for 9.0.69 release Modified: tomcat/site/trunk/build.properties.default tomcat/site/trunk/docs/doap_Tomcat.rdf tomcat/site/trunk/docs/download-90.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/migration-9.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/xdocs/doap_Tomcat.rdf tomcat/site/trunk/xdocs/download-90.xml tomcat/site/trunk/xdocs/index.xml tomcat/site/trunk/xdocs/migration-9.xml tomcat/site/trunk/xdocs/oldnews.xml tomcat/site/trunk/xdocs/whichversion.xml Modified: tomcat/site/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1905303=1905302=1905303=diff == --- tomcat/site/trunk/build.properties.default (original) +++ tomcat/site/trunk/build.properties.default Mon Nov 14 14:56:42 2022 @@ -37,7 +37,7 @@ tomcat.loc=https://downloads.apache.org/ # - Tomcat versions - tomcat8.5=8.5.83 -tomcat9.0=9.0.68 +tomcat9.0=9.0.69 tomcat10.0=10.0.27 tomcat10.1=10.1.2 Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1905303=1905302=1905303=diff == --- tomcat/site/trunk/docs/doap_Tomcat.rdf (original) +++ tomcat/site/trunk/docs/doap_Tomcat.rdf Mon Nov 14 14:56:42 2022 @@ -74,8 +74,8 @@ Latest Stable 9.0.x Release -2022-10-07 -9.0.68 +2022-11-14 +9.0.69 Modified: tomcat/site/trunk/docs/download-90.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-90.html?rev=1905303=1905302=1905303=diff == --- tomcat/site/trunk/docs/download-90.html (original) +++ tomcat/site/trunk/docs/download-90.html Mon Nov 14 14:56:42 2022 @@ -10,7 +10,7 @@ Quick Navigation -[define v]9.0.68[end] +[define v]9.0.69[end] https://downloads.apache.org/tomcat/tomcat-9/KEYS;>KEYS | [v] | Browse | Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1905303=1905302=1905303=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Mon Nov 14 14:56:42 2022 @@ -34,6 +34,28 @@ wiki page. Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat project logo are trademarks of the Apache Software Foundation. +2022-11-14 Tomcat 9.0.69 Released + +The Apache Tomcat Project is proud to announce the release of version 9.0.69 +of Apache Tomcat. This release implements specifications that are part of the +Java EE 8 platform. The notable changes compared to 9.0.68 include: + +Fix concurrency issue in evaluation of expression language containing +lambda expressions. +Correct the date format used with the expires attribute of HTTP +cookies. A single space rather than a single dash should be used to +separate the day, month and year components to be compliant with RFC +6265. + + +Full details of these changes, and all the other changes, are available in the +Tomcat 9 +changelog. + + + +https://tomcat.apache.org/download-90.cgi;>Download + 2022-11-14 Tomcat 10.1.2 Released The Apache Tomcat Project is proud to announce the release of version 10.1.2 @@ -153,49 +175,6 @@ changelog. https://tomcat.apache.org/download-10.cgi;>Download -2022-10-07 Tomcat 9.0.68 Released - -The Apache Tomcat Project is proud to announce the release of version 9.0.68 -of Apache Tomcat. This release implements specifications that are part of the -Java EE 8 platform. The notable changes compared to 9.0.67 include: - -Fix bug https://bz.apache.org/bugzilla/show_bug.cgi?id=66277;>66277, a refactoring regression that broke JSP includes -amongst other functionality -Fix unexpected timeouts that may appear as client disconnections when using -HTTP/2 and NIO2 -Enforce the requirement of RFC 7230 onwards that a request with a malformed -content-length header should always be rejected with a 400 response. - - -Full details of these changes, and all the other changes, are available in the -Tomcat 9 -changelog. - - - -https://tomcat.apache.org/download-90.cgi;>Download - -2022-07-20 Tomcat 9.0.65 Released - -The Apache Tomcat Project is proud to announce the release of version 9.0.65 -of Apache Tomcat. This release implements specifications that are part of the -Java EE 8 platform. The notable changes compared to 9.0.64 include: - -Implement support for repeatable builds. -Update the packaged version of the
[GitHub] [tomcat] vassilismourikis opened a new pull request, #567: conf permissions in Dockerfile
vassilismourikis opened a new pull request, #567: URL: https://github.com/apache/tomcat/pull/567 In order to overcome the server.xml permission denial problem. Signed-off: [vassilismouri...@gmail.com](mailto:vmour...@redhat.com) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1905302 - in /tomcat/site/trunk/docs/tomcat-10.1-doc: ./ annotationapi/ annotationapi/jakarta/annotation/ annotationapi/jakarta/annotation/security/ annotationapi/jakarta/annotation/sql/
Author: markt Date: Mon Nov 14 14:30:48 2022 New Revision: 1905302 URL: http://svn.apache.org/viewvc?rev=1905302=rev Log: Update site for 10.1.2 release [This commit notification would consist of 136 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Add release date
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new adb06fbafb Add release date adb06fbafb is described below commit adb06fbafb5880745cd6709da6258ac96dacdd79 Author: remm AuthorDate: Mon Nov 14 15:29:56 2022 +0100 Add release date --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 6db84a4673..6ba5739a89 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -117,7 +117,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1905301 - in /tomcat/site/trunk: ./ docs/ xdocs/
Author: markt
Date: Mon Nov 14 14:24:12 2022
New Revision: 1905301
URL: http://svn.apache.org/viewvc?rev=1905301=rev
Log:
Update site for 10.1.2 release
Modified:
tomcat/site/trunk/build.properties.default
tomcat/site/trunk/docs/doap_Tomcat.rdf
tomcat/site/trunk/docs/download-10.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration-10.1.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/doap_Tomcat.rdf
tomcat/site/trunk/xdocs/download-10.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-10.1.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/whichversion.xml
Modified: tomcat/site/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1905301=1905300=1905301=diff
==
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Mon Nov 14 14:24:12 2022
@@ -39,7 +39,7 @@ tomcat.loc=https://downloads.apache.org/
tomcat8.5=8.5.83
tomcat9.0=9.0.68
tomcat10.0=10.0.27
-tomcat10.1=10.1.1
+tomcat10.1=10.1.2
# - Download destination -
tomcat-site-docs.home=${base.path}/tomcat-site-docs/
Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1905301=1905300=1905301=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Mon Nov 14 14:24:12 2022
@@ -60,8 +60,8 @@
Latest Stable 10.1.x Release
-2022-10-11
-10.1.1
+2022-11-14
+10.1.2
Modified: tomcat/site/trunk/docs/download-10.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-10.html?rev=1905301=1905300=1905301=diff
==
--- tomcat/site/trunk/docs/download-10.html (original)
+++ tomcat/site/trunk/docs/download-10.html Mon Nov 14 14:24:12 2022
@@ -20,7 +20,7 @@
Quick Navigation
[define v]10.0.27[end]
-[define w]10.1.1[end]
+[define w]10.1.2[end]
https://downloads.apache.org/tomcat/tomcat-10/KEYS;>KEYS |
[v] |
[w] |
Modified: tomcat/site/trunk/docs/index.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1905301=1905300=1905301=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Mon Nov 14 14:24:12 2022
@@ -34,6 +34,38 @@ wiki page.
Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
project logo are trademarks of the Apache Software Foundation.
+2022-11-14 Tomcat 10.1.2 Released
+
+The Apache Tomcat Project is proud to announce the release of version 10.1.2
+of Apache Tomcat. This release implements specifications that are part of the
+Jakarta EE 10 platform.
+Applications that run on Tomcat 9 and earlier will not run on Tomcat 10
+without changes. Java EE based applications designed for Tomcat 9 and earlier
+may be placed in the $CATALINA_BASE/webapps-javaee directory and
+Tomcat will automatically convert them to Jakarta EE and copy them to the
+webapps directory. This conversion is performed using the
+https://github.com/apache/tomcat-jakartaee-migration;>Apache Tomcat
+migration tool for Jakarta EE tool which is also available as a separate
+https://tomcat.apache.org/download-migration.cgi;>download for
off-line use.
+The notable changes in this release are:
+
+Fix concurrency issue in evaluation of expression language containing
lambda
+expressions.
+Update the packaged version of the Apache Tomcat Native Library to 2.0.2 to
+pick up the Windows binaries built with with OpenSSL 3.0.7.
+Correct the date format used with the expires attribute of HTTP cookies. A
+single space rather than a single dash should be used to separate the day,
+month and year components to be compliant with RFC 6265.
+
+
+Full details of these changes, and all the other changes, are available in the
+Tomcat 10.1
+changelog.
+
+
+
+https://tomcat.apache.org/download-10.cgi;>Download
+
2022-11-08 Tomcat Migration Tool for Jakarta EE 1.0.5
Released
The Apache Tomcat Project is proud to announce the release of 1.0.5 of the
@@ -67,37 +99,6 @@ Tomcat Native. The notable changes compa
https://tomcat.apache.org/download-native.cgi;>Download |
ChangeLog for 2.0.1
-2022-10-11 Tomcat 10.1.1 Released
-
-The Apache Tomcat Project is proud to announce the release of version 10.1.1
-of Apache Tomcat. This release implements specifications that are part of the
-Jakarta EE 10 platform.
-Applications that run on Tomcat 9 and earlier will not run on Tomcat 10
-without
svn commit: r58007 - /dev/tomcat/tomcat-9/v9.0.69/ /release/tomcat/tomcat-9/v9.0.69/
Author: remm Date: Mon Nov 14 14:09:07 2022 New Revision: 58007 Log: Apache Tomcat 9.0.96 Added: release/tomcat/tomcat-9/v9.0.69/ - copied from r58006, dev/tomcat/tomcat-9/v9.0.69/ Removed: dev/tomcat/tomcat-9/v9.0.69/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE][RESULT] Release Apache Tomcat 9.0.69
The following votes were cast: Binding: +1: ebourg, markt, remm Non-binding: +1: lihan The vote therefore passes. Thanks to everyone who contributed to this release. Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1905299 - in /tomcat/site/trunk: docs/migration-10.1.html xdocs/migration-10.1.xml
Author: markt Date: Mon Nov 14 14:01:51 2022 New Revision: 1905299 URL: http://svn.apache.org/viewvc?rev=1905299=rev Log: Add note about GET_CLASSLOADER_USE_PRIVILEGED Modified: tomcat/site/trunk/docs/migration-10.1.html tomcat/site/trunk/xdocs/migration-10.1.xml Modified: tomcat/site/trunk/docs/migration-10.1.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-10.1.html?rev=1905299=1905298=1905299=diff == --- tomcat/site/trunk/docs/migration-10.1.html (original) +++ tomcat/site/trunk/docs/migration-10.1.html Mon Nov 14 14:01:51 2022 @@ -111,14 +111,24 @@ of Apache Tomcat. are not fully backwards compatible and might cause breakage when upgrading. - In 10.1.0-M3 onwards, Tomcat no longer adds an "Expires" HTTP + +In 10.1.2 onwards the EL API no longer uses a privileged block to obtain +the thread context class loader unless explicitly configured to do so +via the org.apache.el.GET_CLASSLOADER_USE_PRIVILEGED system +property. When using the EL API within Apache Tomcat this system +property does not need to be set as all calls are already wrapped in a +privileged block further up the stack. It may be required if using the +EL API under a SecurityManager outside of Apache Tomcat. + + +In 10.1.0-M3 onwards, Tomcat no longer adds an "Expires" HTTP response header when adding "Cache-Control: private" due to a CONFIDENTIAL transport-guarantee. This will likely cause a change in caching behavior for applications that do not explicitly set their own headers but rely on Tomcat's previous behavior. If you wish to disable caching, you will need to configure it explicitly in your application. See https://bz.apache.org/bugzilla/show_bug.cgi?id=65513;>BZ 65513 -for more information. +for more information. Modified: tomcat/site/trunk/xdocs/migration-10.1.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-10.1.xml?rev=1905299=1905298=1905299=diff == --- tomcat/site/trunk/xdocs/migration-10.1.xml (original) +++ tomcat/site/trunk/xdocs/migration-10.1.xml Mon Nov 14 14:01:51 2022 @@ -126,14 +126,24 @@ of Apache Tomcat. are not fully backwards compatible and might cause breakage when upgrading. - In 10.1.0-M3 onwards, Tomcat no longer adds an "Expires" HTTP + +In 10.1.2 onwards the EL API no longer uses a privileged block to obtain +the thread context class loader unless explicitly configured to do so +via the org.apache.el.GET_CLASSLOADER_USE_PRIVILEGED system +property. When using the EL API within Apache Tomcat this system +property does not need to be set as all calls are already wrapped in a +privileged block further up the stack. It may be required if using the +EL API under a SecurityManager outside of Apache Tomcat. + + +In 10.1.0-M3 onwards, Tomcat no longer adds an "Expires" HTTP response header when adding "Cache-Control: private" due to a CONFIDENTIAL transport-guarantee. This will likely cause a change in caching behavior for applications that do not explicitly set their own headers but rely on Tomcat's previous behavior. If you wish to disable caching, you will need to configure it explicitly in your application. See https://bz.apache.org/bugzilla/show_bug.cgi?id=65513;>BZ 65513 -for more information. +for more information. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r58006 - /dev/tomcat/tomcat-10/v10.1.2/ /release/tomcat/tomcat-10/v10.1.2/
Author: markt Date: Mon Nov 14 13:51:33 2022 New Revision: 58006 Log: Release Apache Tomcat 10.1.2 Added: release/tomcat/tomcat-10/v10.1.2/ - copied from r58005, dev/tomcat/tomcat-10/v10.1.2/ Removed: dev/tomcat/tomcat-10/v10.1.2/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE][RESULT] Release Apache Tomcat 10.1.2
The following votes were cast: Binding: +1: remm, markt, jfclere Non-binding: +1: lihan The vote therefore passes. Thanks to everyone who contributed to this release. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1905295 - in /tomcat/site/trunk: docs/migration-10.1.html xdocs/migration-10.1.xml
Author: markt Date: Mon Nov 14 13:39:12 2022 New Revision: 1905295 URL: http://svn.apache.org/viewvc?rev=1905295=rev Log: Fix title copy/paste error Modified: tomcat/site/trunk/docs/migration-10.1.html tomcat/site/trunk/xdocs/migration-10.1.xml Modified: tomcat/site/trunk/docs/migration-10.1.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-10.1.html?rev=1905295=1905294=1905295=diff == --- tomcat/site/trunk/docs/migration-10.1.html (original) +++ tomcat/site/trunk/docs/migration-10.1.html Mon Nov 14 13:39:12 2022 @@ -1,5 +1,5 @@ -Apache Tomcat - Migration Guide - Tomcat 10.0.xhttp://tomcat.apache.org/;>Apache Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left">https://www.google.com/search; method="get">GOApache TomcatHomeTaglibsMaven PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/downloa d-80.cgi">Tomcat 8https://tomcat.apache.org/download-migration.cgi;>Tomcat Migration Tool for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 10.1Tomcat 10.0Tomcat 9.0Tomcat 8.5Tomcat ConnectorsTomcat Native 2Tomcat Native 1.2https://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug DatabaseIRCGet InvolvedOverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTom catOfficial">YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://privacy.apache.org/policies/privacy-policy-public.html;>Privacyhttps://www.apache.org/foundation/contributing.html;>Support Apachehttps://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentTable of Contents +Apache Tomcat - Migration Guide - Tomcat 10.1.xhttp://tomcat.apache.org/;>Apache Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left">https://www.google.com/search; method="get">GOApache TomcatHomeTaglibsMaven PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/downloa d-80.cgi">Tomcat 8https://tomcat.apache.org/download-migration.cgi;>Tomcat Migration Tool for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 10.1Tomcat 10.0Tomcat 9.0Tomcat 8.5Tomcat ConnectorsTomcat Native 2Tomcat Native 1.2https://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug DatabaseIRCGet InvolvedOverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTom catOfficial">YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://privacy.apache.org/policies/privacy-policy-public.html;>Privacyhttps://www.apache.org/foundation/contributing.html;>Support Apachehttps://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentTable of Contents GeneralMigrating from 10.0.x to 10.1.xJava 11 requiredSpecification APIsServlet 6.0 APIServer Pages 3.1Expression Language 5.0WebSocket 2.1Authentication TBDInternal APIsUpgrading 10.1.xTomcat 10.1.x noteable changesTomcat 10.1.x configuration file differences General Modified: tomcat/site/trunk/xdocs/migration-10.1.xml URL:
Re: [tomcat] branch main updated: Be stricter regarding invalid String/Character -> byte conversion
On 14/11/2022 13:16, ma...@apache.org wrote: This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new ffe8e6d8e0 Be stricter regarding invalid String/Character -> byte conversion ffe8e6d8e0 is described below commit ffe8e6d8e0b1196818953aa0c70e6c21105b596f Author: Mark Thomas AuthorDate: Mon Nov 14 13:16:18 2022 + Be stricter regarding invalid String/Character -> byte conversion I'm not intending to back-port this as it could break stuff. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Be stricter regarding invalid String/Character -> byte conversion
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new ffe8e6d8e0 Be stricter regarding invalid String/Character -> byte
conversion
ffe8e6d8e0 is described below
commit ffe8e6d8e0b1196818953aa0c70e6c21105b596f
Author: Mark Thomas
AuthorDate: Mon Nov 14 13:16:18 2022 +
Be stricter regarding invalid String/Character -> byte conversion
---
java/org/apache/tomcat/util/buf/MessageBytes.java | 25 ++-
webapps/docs/changelog.xml| 5 +
2 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/tomcat/util/buf/MessageBytes.java
b/java/org/apache/tomcat/util/buf/MessageBytes.java
index 50ae3596dc..e1275561e6 100644
--- a/java/org/apache/tomcat/util/buf/MessageBytes.java
+++ b/java/org/apache/tomcat/util/buf/MessageBytes.java
@@ -20,7 +20,10 @@ import java.io.IOException;
import java.io.Serializable;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
+import java.nio.charset.CharacterCodingException;
import java.nio.charset.Charset;
+import java.nio.charset.CharsetEncoder;
+import java.nio.charset.CodingErrorAction;
import java.util.Locale;
import org.apache.tomcat.util.res.StringManager;
@@ -258,11 +261,23 @@ public final class MessageBytes implements Cloneable,
Serializable {
}
ByteBuffer bb;
-if (type == T_CHARS) {
-bb = getCharset().encode(CharBuffer.wrap(charC));
-} else {
-// Must be T_STR
-bb = getCharset().encode(strValue);
+CharsetEncoder encoder = getCharset().newEncoder();
+encoder.onMalformedInput(CodingErrorAction.REPORT);
+encoder.onUnmappableCharacter(CodingErrorAction.REPORT);
+
+try {
+if (type == T_CHARS) {
+bb = encoder.encode(CharBuffer.wrap(charC));
+} else {
+// Must be T_STR
+bb = encoder.encode(CharBuffer.wrap(strValue));
+}
+} catch (CharacterCodingException cce) {
+// Some calls to this conversion originate in application code and
+// the Servlet API methods do not declare a suitable exception that
+// can be thrown. Therefore stick with the uncaught exception type
+// used by the old, pre-Java 16 optimised version of this code.
+throw new IllegalArgumentException(cce);
}
byteC.setBytes(bb.array(), bb.arrayOffset(), bb.limit());
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 128c3cf94f..cbf01a7ebb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -175,6 +175,11 @@
Remove unnecessary code that exposed the asyncTimeout to
components that never used it. (markt)
+
+Ensure that all MessageBytes conversions to byte arrays
are
+valid for the configured character set and throw an exception if not.
+(markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 10.1.2
On 11/9/22 18:32, Mark Thomas wrote: [X] Stable - go ahead and release as 10.1.2 Tested on fedora 36. -- Cheers Jean-Frederic - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Disable test for Java 16 onwards since performance is comparable
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 1058eed2b6 Disable test for Java 16 onwards since performance is
comparable
1058eed2b6 is described below
commit 1058eed2b6e94f09b8f3ecdcac3be634baa01f76
Author: Mark Thomas
AuthorDate: Mon Nov 14 11:42:53 2022 +
Disable test for Java 16 onwards since performance is comparable
---
test/org/apache/tomcat/util/buf/TestMessageBytes.java | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/tomcat/util/buf/TestMessageBytes.java
b/test/org/apache/tomcat/util/buf/TestMessageBytes.java
index 3311996394..4abc1b6374 100644
--- a/test/org/apache/tomcat/util/buf/TestMessageBytes.java
+++ b/test/org/apache/tomcat/util/buf/TestMessageBytes.java
@@ -23,8 +23,11 @@ import java.nio.charset.CodingErrorAction;
import java.nio.charset.StandardCharsets;
import org.junit.Assert;
+import org.junit.Assume;
import org.junit.Test;
+import org.apache.tomcat.util.compat.JreCompat;
+
public class TestMessageBytes {
private static final String CONVERSION_STRING =
@@ -100,6 +103,10 @@ public class TestMessageBytes {
*/
@Test
public void testConversionPerformance() {
+
+// ISO_8859_1 conversion appears to be optimised in Java 16 onwards
+Assume.assumeFalse(JreCompat.isJre16Available());
+
long optimized = -1;
long nonOptimized = -1;
@@ -110,7 +117,7 @@ public class TestMessageBytes {
* once to run the test and once more in case of unexpected CI /GC
* slowness. The test will exit early if possible.
*
- * MeesageBytes only optimises conversion for ISO_8859_1
+ * MessageBytes only optimises conversion for ISO_8859_1
*/
for (int i = 0; i < 3; i++) {
optimized = doTestOptimisedConversionPerformance();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Disable test for Java 16 onwards since performance is comparable
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 9e99ed8435 Disable test for Java 16 onwards since performance is
comparable
9e99ed8435 is described below
commit 9e99ed84350529bd63fcdf10a05f0d136a687b82
Author: Mark Thomas
AuthorDate: Mon Nov 14 11:42:53 2022 +
Disable test for Java 16 onwards since performance is comparable
---
test/org/apache/tomcat/util/buf/TestMessageBytes.java | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/tomcat/util/buf/TestMessageBytes.java
b/test/org/apache/tomcat/util/buf/TestMessageBytes.java
index 3311996394..4abc1b6374 100644
--- a/test/org/apache/tomcat/util/buf/TestMessageBytes.java
+++ b/test/org/apache/tomcat/util/buf/TestMessageBytes.java
@@ -23,8 +23,11 @@ import java.nio.charset.CodingErrorAction;
import java.nio.charset.StandardCharsets;
import org.junit.Assert;
+import org.junit.Assume;
import org.junit.Test;
+import org.apache.tomcat.util.compat.JreCompat;
+
public class TestMessageBytes {
private static final String CONVERSION_STRING =
@@ -100,6 +103,10 @@ public class TestMessageBytes {
*/
@Test
public void testConversionPerformance() {
+
+// ISO_8859_1 conversion appears to be optimised in Java 16 onwards
+Assume.assumeFalse(JreCompat.isJre16Available());
+
long optimized = -1;
long nonOptimized = -1;
@@ -110,7 +117,7 @@ public class TestMessageBytes {
* once to run the test and once more in case of unexpected CI /GC
* slowness. The test will exit early if possible.
*
- * MeesageBytes only optimises conversion for ISO_8859_1
+ * MessageBytes only optimises conversion for ISO_8859_1
*/
for (int i = 0; i < 3; i++) {
optimized = doTestOptimisedConversionPerformance();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Refactor to avoid issues if JVM optimises conversion to ASCII
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 72d1da8721 Refactor to avoid issues if JVM optimises conversion to
ASCII
72d1da8721 is described below
commit 72d1da87210bb6fcc6c27f37a187055f3ec166ca
Author: Mark Thomas
AuthorDate: Mon Nov 14 11:38:38 2022 +
Refactor to avoid issues if JVM optimises conversion to ASCII
---
.../apache/tomcat/util/buf/TestMessageBytes.java | 79 ++
1 file changed, 50 insertions(+), 29 deletions(-)
diff --git a/test/org/apache/tomcat/util/buf/TestMessageBytes.java
b/test/org/apache/tomcat/util/buf/TestMessageBytes.java
index f2016f478d..3311996394 100644
--- a/test/org/apache/tomcat/util/buf/TestMessageBytes.java
+++ b/test/org/apache/tomcat/util/buf/TestMessageBytes.java
@@ -16,7 +16,10 @@
*/
package org.apache.tomcat.util.buf;
-import java.nio.charset.Charset;
+import java.nio.CharBuffer;
+import java.nio.charset.CharacterCodingException;
+import java.nio.charset.CharsetEncoder;
+import java.nio.charset.CodingErrorAction;
import java.nio.charset.StandardCharsets;
import org.junit.Assert;
@@ -24,6 +27,26 @@ import org.junit.Test;
public class TestMessageBytes {
+private static final String CONVERSION_STRING =
+"0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"
+
+"0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"
+
+"0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"
+
+"0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"
+
+"0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"
+
+"0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"
+
+"0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"
+
+"0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"
+
+"0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"
+
+"0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"
+
+"0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"
+
+"0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"
+
+"0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"
+
+"0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"
+
+"0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"
+
+"0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF";
+
+private static final int CONVERSION_LOOPS = 100;
+
@Test
public void testToStringFromNull() {
MessageBytes mb = MessageBytes.newInstance();
@@ -73,8 +96,7 @@ public class TestMessageBytes {
/*
- * Checks the the optimized code is at least twice as fast as the
- * non-optimized code.
+ * Checks the the optimized code is faster than the non-optimized code.
*/
@Test
public void testConversionPerformance() {
@@ -87,12 +109,12 @@ public class TestMessageBytes {
* non-optimised code. Loop three times allows once to warn up the JVM
* once to run the test and once more in case of unexpected CI /GC
* slowness. The test will exit early if possible.
+ *
+ * MeesageBytes only optimises conversion for ISO_8859_1
*/
for (int i = 0; i < 3; i++) {
-optimized =
doTestConversionPerformance(StandardCharsets.ISO_8859_1);
-// US_ASCII chosen as the conversion is the same and it is another
-// Charset available on all platforms.
-nonOptimized =
doTestConversionPerformance(StandardCharsets.US_ASCII);
+optimized = doTestOptimisedConversionPerformance();
+nonOptimized = doTestConversionPerformance();
System.out.println(optimized + " " + nonOptimized);
if (optimized * 2 < nonOptimized) {
@@ -100,37 +122,36 @@ public class TestMessageBytes {
}
}
-Assert.assertTrue("Non-optimised code was faster (" + nonOptimized +
"ns) compared to optimized (" + optimized + "ns)", optimized < nonOptimized);
+Assert.assertTrue("Non-optimised code was faster (" + nonOptimized +
"ns) compared to optimized (" +
+optimized + "ns)", optimized < nonOptimized);
}
-private long doTestConversionPerformance(Charset charset) {
+private long doTestOptimisedConversionPerformance() {
MessageBytes mb = MessageBytes.newInstance();
-int loops = 100;
-
long start = System.nanoTime();
-for (int i = 0; i < loops; i++) {
+for (int i = 0; i < CONVERSION_LOOPS; i++) {
mb.recycle();
-mb.setCharset(charset);
-
[tomcat] branch main updated: Refactor to avoid issues if JVM optimises conversion to ASCII
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 2ae809353d Refactor to avoid issues if JVM optimises conversion to
ASCII
2ae809353d is described below
commit 2ae809353d9537548b52355e4d91322493eb1592
Author: Mark Thomas
AuthorDate: Mon Nov 14 11:38:38 2022 +
Refactor to avoid issues if JVM optimises conversion to ASCII
---
.../apache/tomcat/util/buf/TestMessageBytes.java | 79 ++
1 file changed, 50 insertions(+), 29 deletions(-)
diff --git a/test/org/apache/tomcat/util/buf/TestMessageBytes.java
b/test/org/apache/tomcat/util/buf/TestMessageBytes.java
index f2016f478d..3311996394 100644
--- a/test/org/apache/tomcat/util/buf/TestMessageBytes.java
+++ b/test/org/apache/tomcat/util/buf/TestMessageBytes.java
@@ -16,7 +16,10 @@
*/
package org.apache.tomcat.util.buf;
-import java.nio.charset.Charset;
+import java.nio.CharBuffer;
+import java.nio.charset.CharacterCodingException;
+import java.nio.charset.CharsetEncoder;
+import java.nio.charset.CodingErrorAction;
import java.nio.charset.StandardCharsets;
import org.junit.Assert;
@@ -24,6 +27,26 @@ import org.junit.Test;
public class TestMessageBytes {
+private static final String CONVERSION_STRING =
+"0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"
+
+"0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"
+
+"0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"
+
+"0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"
+
+"0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"
+
+"0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"
+
+"0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"
+
+"0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"
+
+"0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"
+
+"0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"
+
+"0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"
+
+"0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"
+
+"0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"
+
+"0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"
+
+"0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"
+
+"0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF";
+
+private static final int CONVERSION_LOOPS = 100;
+
@Test
public void testToStringFromNull() {
MessageBytes mb = MessageBytes.newInstance();
@@ -73,8 +96,7 @@ public class TestMessageBytes {
/*
- * Checks the the optimized code is at least twice as fast as the
- * non-optimized code.
+ * Checks the the optimized code is faster than the non-optimized code.
*/
@Test
public void testConversionPerformance() {
@@ -87,12 +109,12 @@ public class TestMessageBytes {
* non-optimised code. Loop three times allows once to warn up the JVM
* once to run the test and once more in case of unexpected CI /GC
* slowness. The test will exit early if possible.
+ *
+ * MeesageBytes only optimises conversion for ISO_8859_1
*/
for (int i = 0; i < 3; i++) {
-optimized =
doTestConversionPerformance(StandardCharsets.ISO_8859_1);
-// US_ASCII chosen as the conversion is the same and it is another
-// Charset available on all platforms.
-nonOptimized =
doTestConversionPerformance(StandardCharsets.US_ASCII);
+optimized = doTestOptimisedConversionPerformance();
+nonOptimized = doTestConversionPerformance();
System.out.println(optimized + " " + nonOptimized);
if (optimized * 2 < nonOptimized) {
@@ -100,37 +122,36 @@ public class TestMessageBytes {
}
}
-Assert.assertTrue("Non-optimised code was faster (" + nonOptimized +
"ns) compared to optimized (" + optimized + "ns)", optimized < nonOptimized);
+Assert.assertTrue("Non-optimised code was faster (" + nonOptimized +
"ns) compared to optimized (" +
+optimized + "ns)", optimized < nonOptimized);
}
-private long doTestConversionPerformance(Charset charset) {
+private long doTestOptimisedConversionPerformance() {
MessageBytes mb = MessageBytes.newInstance();
-int loops = 100;
-
long start = System.nanoTime();
-for (int i = 0; i < loops; i++) {
+for (int i = 0; i < CONVERSION_LOOPS; i++) {
mb.recycle();
-mb.setCharset(charset);
-
Re: [VOTE] Release Apache Tomcat 9.0.69
On Wed, Nov 9, 2022 at 8:48 PM Rémy Maucherat wrote: > > The proposed Apache Tomcat 9.0.69 release is now available for voting. > > The notable changes compared to 9.0.68 are: > > - Fix concurrency issue in evaluation of expression language containing >lambda expressions. > > - Update the packaged version of the Apache Tomcat Native Library to >2.0.2 to pick up the Windows binaries built with with OpenSSL 3.0.7. > > - Correct the date format used with the expires attribute of HTTP >cookies. A single space rather than a single dash should be used to >separate the day, month and year components to be compliant with RFC >6265. > > Along with lots of other bug fixes and improvements. > > For full details, see the changelog: > https://nightlies.apache.org/tomcat/tomcat-9.0.x/docs/changelog.html > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.69/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1406 > The tag is: > https://github.com/apache/tomcat/tree/9.0.69 > cd5fd93c5df3699868ec39731f5a347450112299 > > The proposed 9.0.69 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 9.0.69 Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Code signing certificate renewal
Hi all, The update went smoothly and the new certificate is now in place. Mark On 13/11/2022 11:42, Mark Thomas wrote: Hi all (mainly Chris), The current code signing certificate expires on 16 Nov 2022. I have the renewal in hand and it should be in place before the current cert expires but things may not go to plan. If you have plans for a 9.0.x release you might want to keep the above in mind. Once the cert is renewed, I'll update the relevant build.properties.default files to use the new cert. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Update to use new code signing cert
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new fb1d99d1e2 Update to use new code signing cert fb1d99d1e2 is described below commit fb1d99d1e21d6d35b5674044c7688c03ee9d2905 Author: Mark Thomas AuthorDate: Mon Nov 14 09:00:28 2022 + Update to use new code signing cert --- build.properties.default | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.properties.default b/build.properties.default index a726950787..da38ec799b 100644 --- a/build.properties.default +++ b/build.properties.default @@ -89,7 +89,7 @@ gpg.exec=/path/to/gpg # Code signing of Windows installer # See https://infra.apache.org/digicert-use.html for setup instructions do.codesigning=false -codesigning.alias=Tomcat-PMC-cert-2021-11 +codesigning.alias=Tomcat-PMC-cert-2022-11 codesigning.digest=SHA-512 codesigning.storetype=DIGICERTONE # Set codesigning.storepass in build.properties with the following syntax - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Update to use new code signing cert
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new 64988d3b75 Update to use new code signing cert 64988d3b75 is described below commit 64988d3b757171ba84b154524e71e2bcaa8deb5e Author: Mark Thomas AuthorDate: Mon Nov 14 09:00:28 2022 + Update to use new code signing cert --- build.properties.default | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.properties.default b/build.properties.default index 711447f433..309bc85c32 100644 --- a/build.properties.default +++ b/build.properties.default @@ -85,7 +85,7 @@ gpg.exec=/path/to/gpg # Code signing of Windows installer # See https://infra.apache.org/digicert-use.html for setup instructions do.codesigning=false -codesigning.alias=Tomcat-PMC-cert-2021-11 +codesigning.alias=Tomcat-PMC-cert-2022-11 codesigning.digest=SHA-512 codesigning.storetype=DIGICERTONE # Set codesigning.storepass in build.properties with the following syntax - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Update to use new code signing cert
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new 5e4d1d91c8 Update to use new code signing cert 5e4d1d91c8 is described below commit 5e4d1d91c8811e8f3c275dff4c925c2a5830f52b Author: Mark Thomas AuthorDate: Mon Nov 14 09:00:28 2022 + Update to use new code signing cert --- build.properties.default | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.properties.default b/build.properties.default index 8556c59b07..b2e736e731 100644 --- a/build.properties.default +++ b/build.properties.default @@ -83,7 +83,7 @@ gpg.exec=/path/to/gpg # Code signing of Windows installer # See https://infra.apache.org/digicert-use.html for setup instructions do.codesigning=false -codesigning.alias=Tomcat-PMC-cert-2021-11 +codesigning.alias=Tomcat-PMC-cert-2022-11 codesigning.digest=SHA-512 codesigning.storetype=DIGICERTONE # Set codesigning.storepass in build.properties with the following syntax - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Update to use new code signing cert
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new e62995c4f0 Update to use new code signing cert e62995c4f0 is described below commit e62995c4f0b68adfe9d054f625f6ba76ff802cdd Author: Mark Thomas AuthorDate: Mon Nov 14 09:00:28 2022 + Update to use new code signing cert --- build.properties.default | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.properties.default b/build.properties.default index 39603acf65..e8f813bb06 100644 --- a/build.properties.default +++ b/build.properties.default @@ -83,7 +83,7 @@ gpg.exec=/path/to/gpg # Code signing of Windows installer # See https://infra.apache.org/digicert-use.html for setup instructions do.codesigning=false -codesigning.alias=Tomcat-PMC-cert-2021-11 +codesigning.alias=Tomcat-PMC-cert-2022-11 codesigning.digest=SHA-512 codesigning.storetype=DIGICERTONE # Set codesigning.storepass in build.properties with the following syntax - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
