buildbot success in on tomcat-9-trunk
The Buildbot has detected a restored build on builder tomcat-9-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-9-trunk/builds/714 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9-commit' triggered this build Build Source Stamp: [branch 9.0.x] dfc4bbd5a0d49bb7919b20f238a1902989d443f3 Blamelist: Mark Thomas Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/5768 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch master] 8623d4becf96dce9c467600cc5791b3847e661f7 Blamelist: Mark Thomas Build succeeded! Sincerely, -The Buildbot - 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: No functional change. Align 10.0.x, 9.0.x and 8.5.x
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 8dab9ba No functional change. Align 10.0.x, 9.0.x and 8.5.x
8dab9ba is described below
commit 8dab9ba23e93651db0e5636c4160603a7356babe
Author: Mark Thomas
AuthorDate: Mon Mar 29 19:54:25 2021 +0100
No functional change. Align 10.0.x, 9.0.x and 8.5.x
---
java/org/apache/jasper/JspC.java | 20 +---
.../apache/jasper/resources/LocalStrings.properties | 7 +++
.../jasper/resources/LocalStrings_de.properties | 2 ++
.../jasper/resources/LocalStrings_fr.properties | 7 +++
.../jasper/resources/LocalStrings_ja.properties | 7 +++
.../jasper/resources/LocalStrings_ko.properties | 7 +++
.../jasper/resources/LocalStrings_zh_CN.properties | 7 +++
.../apache/jasper/servlet/JspCServletContext.java| 2 +-
8 files changed, 47 insertions(+), 12 deletions(-)
diff --git a/java/org/apache/jasper/JspC.java b/java/org/apache/jasper/JspC.java
index ae9fb24..03f234f 100644
--- a/java/org/apache/jasper/JspC.java
+++ b/java/org/apache/jasper/JspC.java
@@ -420,8 +420,7 @@ public class JspC extends Task implements Options {
setThreadCount(nextArg());
} else {
if (tok.startsWith("-")) {
-throw new JasperException("Unrecognized option: " + tok +
-". Use -help for help.");
+throw new
JasperException(Localizer.getMessage("jspc.error.unknownOption", tok));
}
if (!fullstop) {
argPos--;
@@ -451,9 +450,6 @@ public class JspC extends Task implements Options {
return true;
}
-/**
- * {@inheritDoc}
- */
@Override
public boolean getTrimSpaces() {
return trimSpaces;
@@ -979,10 +975,11 @@ public class JspC extends Task implements Options {
newThreadCount = Integer.parseInt(threadCount);
}
} catch (NumberFormatException e) {
-throw new BuildException("Couldn't parse thread count: " +
threadCount);
+throw new
BuildException(Localizer.getMessage("jspc.error.parseThreadCount",
threadCount));
}
if (newThreadCount < 1) {
-throw new BuildException("There must be at least one thread: " +
newThreadCount);
+throw new BuildException(Localizer.getMessage(
+"jspc.error.minThreadCount",
Integer.valueOf(newThreadCount)));
}
this.threadCount = newThreadCount;
}
@@ -1523,7 +1520,7 @@ public class JspC extends Task implements Options {
}
} else {
errorCount++;
-log.error(e.getMessage());
+
log.error(Localizer.getMessage("jspc.error.compilation"), e);
}
} catch (InterruptedException e) {
// Ignore
@@ -1540,6 +1537,8 @@ public class JspC extends Task implements Options {
String msg = Localizer.getMessage("jspc.generation.result",
Integer.toString(errorCount), Long.toString(time));
if (failOnError && errorCount > 0) {
+System.out.println(Localizer.getMessage(
+"jspc.errorCount", Integer.valueOf(errorCount)));
throw new BuildException(msg);
} else {
log.info(msg);
@@ -1695,7 +1694,7 @@ public class JspC extends Task implements Options {
}
// Turn the classPath into URLs
-ArrayList urls = new ArrayList<>();
+List urls = new ArrayList<>();
StringTokenizer tokenizer = new StringTokenizer(classPath,
File.pathSeparator);
while (tokenizer.hasMoreTokens()) {
@@ -1735,8 +1734,7 @@ public class JspC extends Task implements Options {
String ext = lib.substring(lib.length() - 4);
if (!".jar".equalsIgnoreCase(ext)) {
if (".tld".equalsIgnoreCase(ext)) {
-log.warn("TLD files should not be placed in "
- + "/WEB-INF/lib");
+
log.warn(Localizer.getMessage("jspc.warning.tldInWebInfLib"));
}
continue;
}
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties
b/java/org/apache/jasper/resources/LocalStrings.properties
index 96a8c8c..c5ed7fe 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++
[tomcat] branch 9.0.x updated: Trivial reformat to trigger a CI build
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 dfc4bbd Trivial reformat to trigger a CI build
dfc4bbd is described below
commit dfc4bbd5a0d49bb7919b20f238a1902989d443f3
Author: Mark Thomas
AuthorDate: Mon Mar 29 19:01:17 2021 +0100
Trivial reformat to trigger a CI build
---
java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java
index a13fe90..27e30e6 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java
@@ -170,8 +170,9 @@ public abstract class JMXAccessorConditionBase extends
ProjectComponent implemen
try {
Object result = getJMXConnection().getAttribute(
new ObjectName(name), attribute);
-if(result != null)
+if (result != null) {
return result.toString();
+}
} catch (Exception e) {
// ignore access or connection open errors
}
-
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: Trivial reformat to trigger a CI build
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 b68b7c0 Trivial reformat to trigger a CI build
b68b7c0 is described below
commit b68b7c0b84317b304c4c8e84fe3f0abecb5d2a18
Author: Mark Thomas
AuthorDate: Mon Mar 29 19:01:21 2021 +0100
Trivial reformat to trigger a CI build
---
java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java
index a13fe90..27e30e6 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java
@@ -170,8 +170,9 @@ public abstract class JMXAccessorConditionBase extends
ProjectComponent implemen
try {
Object result = getJMXConnection().getAttribute(
new ObjectName(name), attribute);
-if(result != null)
+if (result != null) {
return result.toString();
+}
} catch (Exception e) {
// ignore access or connection open errors
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Trivial reformat to trigger a CI build
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 8623d4b Trivial reformat to trigger a CI build
8623d4b is described below
commit 8623d4becf96dce9c467600cc5791b3847e661f7
Author: Mark Thomas
AuthorDate: Mon Mar 29 19:01:12 2021 +0100
Trivial reformat to trigger a CI build
---
java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java
index a13fe90..27e30e6 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java
@@ -170,8 +170,9 @@ public abstract class JMXAccessorConditionBase extends
ProjectComponent implemen
try {
Object result = getJMXConnection().getAttribute(
new ObjectName(name), attribute);
-if(result != null)
+if (result != null) {
return result.toString();
+}
} catch (Exception e) {
// ignore access or connection open errors
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot exception in on tomcat-trunk
The Buildbot has detected a build exception on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/5767 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch master] 0d94fbb71fc378325c9d3630ad1a4bad2a0e17c0 Blamelist: Mark Thomas BUILD FAILED: exception compile upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot exception in on tomcat-7-trunk
The Buildbot has detected a build exception on builder tomcat-7-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-7-trunk/builds/1859 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch 7.0.x] b0d17711d62a4993c94cd4bbcce2ee90984d70e4 Blamelist: Mark Thomas BUILD FAILED: exception compile upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot exception in on tomcat-85-trunk
The Buildbot has detected a build exception on builder tomcat-85-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-85-trunk/builds/2675 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' triggered this build Build Source Stamp: [branch 8.5.x] 252b1463ecbe716761ee92f670cecb28ad08215f Blamelist: Mark Thomas BUILD FAILED: exception compile upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot exception in on tomcat-9-trunk
The Buildbot has detected a build exception on builder tomcat-9-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-9-trunk/builds/713 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9-commit' triggered this build Build Source Stamp: [branch 9.0.x] fff99cabe6358f5fd7147457c5b8c22da29b877a Blamelist: Mark Thomas BUILD FAILED: exception compile upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 65181] Tomcat Native library with OpenSSL Engine private key loading
https://bz.apache.org/bugzilla/show_bug.cgi?id=65181 --- Comment #7 from Edin Hodzic --- Thanks everyone for the prompt action and the pending change. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated: Update to Tomcat Native 1.2.27
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new b0d1771 Update to Tomcat Native 1.2.27
b0d1771 is described below
commit b0d17711d62a4993c94cd4bbcce2ee90984d70e4
Author: Mark Thomas
AuthorDate: Mon Mar 29 17:20:08 2021 +0100
Update to Tomcat Native 1.2.27
---
build.properties.default | 10 +-
webapps/docs/changelog.xml | 4
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index bbb3118..0480f27 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -186,19 +186,19 @@
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# - Tomcat native library -
-tomcat-native.version=1.2.26
+tomcat-native.version=1.2.27
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=cad9d9efdb6c980afcf304bd78e5ea572271075e153e2015d393dd5e6f4612992c7d0ac499c9aeafe0c3874832356e197564717df15b36a48aba775960659ac2
+tomcat-native.src.checksum.value=99e356cef89bdc35cfcb98fafe0d5dda8375461382053969509b6b24d9129ca89782bc618c58245980c921abbdb25eece80cb129e33ad06741d22681b84d7742
tomcat-native.win.checksum.enabled=true
tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=607b45074fda397f2fc49f0f3b4128df5373d692b82167f39f5430e04846b788db1487c0805173c924ab0c94d5767b6c5bba887a1148f104eca39c09d19539d1
+tomcat-native.win.checksum.value=90553cb8d74f00e00ac220a18c5c647c5b74f0487020d41efe33beb501c2caac43d77363a7820c2e91ac7a0f23967a2077e704e8db56ad18978780346a642ca3
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
tomcat-native.loc.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
-tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1i-win32-bin.zip
-tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1i-win32-bin.zip
+tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1k-win32-bin.zip
+tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1k-win32-bin.zip
# - NSIS, version 3.0 or later -
nsis.version=3.06.1
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index dde1a73..5389d74 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -134,6 +134,10 @@
Improvements to Japanese translations. Provided by kfujino and
Shirayuking. (markt)
+
+Update the packaged version of the Tomcat Native Library to 1.2.27.
+(markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: No functional change. Align 10.0.x, 9.0.x and 8.5.x
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
commit 05d62f67eb9bf9d65ff9846cd777538bb4908cd6
Author: Mark Thomas
AuthorDate: Mon Mar 29 17:18:58 2021 +0100
No functional change. Align 10.0.x, 9.0.x and 8.5.x
---
java/org/apache/jasper/compiler/Validator.java | 8 ---
.../jasper/resources/LocalStrings.properties | 4
.../jasper/resources/LocalStrings_de.properties| 3 +++
.../jasper/resources/LocalStrings_fr.properties| 4
.../jasper/resources/LocalStrings_ja.properties| 4
.../jasper/resources/LocalStrings_ko.properties| 4
.../jasper/resources/LocalStrings_zh_CN.properties | 4
.../org/apache/jasper/runtime/BodyContentImpl.java | 5 +++-
.../jasper/runtime/InstanceManagerFactory.java | 3 ++-
.../jasper/runtime/JspApplicationContextImpl.java | 12 +-
java/org/apache/jasper/runtime/JspWriterImpl.java | 28 +-
.../apache/jasper/security/SecurityClassLoad.java | 27 +
12 files changed, 57 insertions(+), 49 deletions(-)
diff --git a/java/org/apache/jasper/compiler/Validator.java
b/java/org/apache/jasper/compiler/Validator.java
index a903bd1..7805cd6 100644
--- a/java/org/apache/jasper/compiler/Validator.java
+++ b/java/org/apache/jasper/compiler/Validator.java
@@ -22,7 +22,9 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Hashtable;
import java.util.Iterator;
+import java.util.List;
import java.util.Locale;
+import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -1662,7 +1664,7 @@ class Validator {
throws JasperException {
FunctionInfo funcInfo = func.getFunctionInfo();
String signature = funcInfo.getFunctionSignature();
-ArrayList params = new ArrayList<>();
+List params = new ArrayList<>();
// Signature is of the form
// S ( ',' )* )? ')'
@@ -1695,7 +1697,7 @@ class Validator {
class ValidateFunctionMapper extends FunctionMapper {
-private HashMap fnmap = new HashMap<>();
+private Map fnmap = new HashMap<>();
@Override
public void mapFunction(String prefix, String localName,
@@ -1821,7 +1823,7 @@ class Validator {
PageInfo pageInfo = compiler.getPageInfo();
String contentType = pageInfo.getContentType();
-if (contentType == null || contentType.indexOf("charset=") < 0) {
+if (contentType == null || !contentType.contains("charset=")) {
boolean isXml = page.getRoot().isXmlSyntax();
String defaultType;
if (contentType == null) {
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties
b/java/org/apache/jasper/resources/LocalStrings.properties
index 60fc4ad..96a8c8c 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -44,6 +44,7 @@ jsp.error.beans.property.conversion=Unable to convert string
[{0}] to class [{1}
jsp.error.beans.propertyeditor.notregistered=Property Editor not registered
with the PropertyEditorManager
jsp.error.beans.setproperty.noindexset=Cannot set indexed property
jsp.error.bug48498=Unable to display JSP extract. Probably due to an XML
parser bug (see Tomcat bug 48498 for details).
+jsp.error.cannotAddResolver=Cannot call addELResolver after the first request
has been made
jsp.error.classname=Cannot determine classname from .class file
jsp.error.coerce_to_type=Cannot coerce value [{2}] to type [{1}] for attribute
[{0}].
jsp.error.compilation=Error compiling file: [{0}] [{1}]
@@ -118,6 +119,7 @@ jsp.error.missing_attribute=According to the TLD or the tag
file, attribute [{0}
jsp.error.missing_var_or_varReader=Missing 'var' or 'varReader' attribute
jsp.error.namedAttribute.invalidUse=jsp:attribute must be the subelement of a
standard or custom action
jsp.error.needAlternateJavaEncoding=Default java encoding [{0}] is invalid on
your java platform. An alternate can be specified via the ''javaEncoding''
parameter of JspServlet.
+jsp.error.negativeBufferSize=The buffer size is negative
jsp.error.nested.jspattribute=A jsp:attribute standard action cannot be nested
within another jsp:attribute standard action
jsp.error.nested.jspbody=A jsp:body standard action cannot be nested within
another jsp:body or jsp:attribute standard action
jsp.error.nested_jsproot=Nested jsp:root
@@ -128,8 +130,10 @@ jsp.error.no.scratch.dir=The JSP engine is not configured
with a scratch dir.\n\
jsp.error.no.scriptlets=Scripting elements ( %!, jsp:declaration,
%=, jsp:expression, %, jsp:scriptlet ) are disallowed here.
jsp.error.noFunction=The function [{0}] cannot be located with the specified
prefix
jsp.error.noFunctionMethod=Method
[tomcat] 02/02: Update to Tomcat Native 1.2.27
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
commit 252b1463ecbe716761ee92f670cecb28ad08215f
Author: Mark Thomas
AuthorDate: Mon Mar 29 17:20:08 2021 +0100
Update to Tomcat Native 1.2.27
---
build.properties.default | 10 +-
webapps/docs/changelog.xml | 4
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 8e534ce..28aa934 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -151,19 +151,19 @@
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# - Tomcat native library -
-tomcat-native.version=1.2.26
+tomcat-native.version=1.2.27
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=cad9d9efdb6c980afcf304bd78e5ea572271075e153e2015d393dd5e6f4612992c7d0ac499c9aeafe0c3874832356e197564717df15b36a48aba775960659ac2
+tomcat-native.src.checksum.value=99e356cef89bdc35cfcb98fafe0d5dda8375461382053969509b6b24d9129ca89782bc618c58245980c921abbdb25eece80cb129e33ad06741d22681b84d7742
tomcat-native.win.checksum.enabled=true
tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=607b45074fda397f2fc49f0f3b4128df5373d692b82167f39f5430e04846b788db1487c0805173c924ab0c94d5767b6c5bba887a1148f104eca39c09d19539d1
+tomcat-native.win.checksum.value=90553cb8d74f00e00ac220a18c5c647c5b74f0487020d41efe33beb501c2caac43d77363a7820c2e91ac7a0f23967a2077e704e8db56ad18978780346a642ca3
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
tomcat-native.loc.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
-tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1i-win32-bin.zip
-tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1i-win32-bin.zip
+tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1k-win32-bin.zip
+tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1k-win32-bin.zip
# - NSIS, version 3.0 or later -
nsis.version=3.06.1
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7d1f3d3..f18e7f6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -178,6 +178,10 @@
Improvements to Korean translations. (woonsan)
+
+Update the packaged version of the Tomcat Native Library to 1.2.27.
+(markt)
+
-
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 (4be404e -> 252b146)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 4be404e No functional change. Align 10.0.x, 9.0.x and 8.5.x new 05d62f6 No functional change. Align 10.0.x, 9.0.x and 8.5.x new 252b146 Update to Tomcat Native 1.2.27 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: build.properties.default | 10 java/org/apache/jasper/compiler/Validator.java | 8 --- .../jasper/resources/LocalStrings.properties | 4 .../jasper/resources/LocalStrings_de.properties| 3 +++ .../jasper/resources/LocalStrings_fr.properties| 4 .../jasper/resources/LocalStrings_ja.properties| 4 .../jasper/resources/LocalStrings_ko.properties| 4 .../jasper/resources/LocalStrings_zh_CN.properties | 4 .../org/apache/jasper/runtime/BodyContentImpl.java | 5 +++- .../jasper/runtime/InstanceManagerFactory.java | 3 ++- .../jasper/runtime/JspApplicationContextImpl.java | 12 +- java/org/apache/jasper/runtime/JspWriterImpl.java | 28 +- .../apache/jasper/security/SecurityClassLoad.java | 27 + webapps/docs/changelog.xml | 4 14 files changed, 66 insertions(+), 54 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: No functional change. Align 10.0.x, 9.0.x and 8.5.x
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
commit 7c56e053277c52370b3dac3c20618464aeb0547c
Author: Mark Thomas
AuthorDate: Mon Mar 29 17:17:23 2021 +0100
No functional change. Align 10.0.x, 9.0.x and 8.5.x
---
.../apache/jasper/security/SecurityClassLoad.java | 29 --
1 file changed, 16 insertions(+), 13 deletions(-)
diff --git a/java/org/apache/jasper/security/SecurityClassLoad.java
b/java/org/apache/jasper/security/SecurityClassLoad.java
index 77a0d59..3642847 100644
--- a/java/org/apache/jasper/security/SecurityClassLoad.java
+++ b/java/org/apache/jasper/security/SecurityClassLoad.java
@@ -27,32 +27,35 @@ import org.apache.juli.logging.LogFactory;
*/
public final class SecurityClassLoad {
-public static void securityClassLoad(ClassLoader loader){
+public static void securityClassLoad(ClassLoader loader) {
-if( System.getSecurityManager() == null ){
+if (System.getSecurityManager() == null) {
return;
}
final String basePackage = "org.apache.jasper.";
try {
// Ensure XMLInputFactory is loaded with Tomcat's class loader
-loader.loadClass( basePackage + "compiler.EncodingDetector");
+loader.loadClass(basePackage + "compiler.EncodingDetector");
-loader.loadClass( basePackage + "runtime.JspContextWrapper");
-loader.loadClass( basePackage +
"runtime.JspFactoryImpl$PrivilegedGetPageContext");
-loader.loadClass( basePackage +
"runtime.JspFactoryImpl$PrivilegedReleasePageContext");
-loader.loadClass( basePackage + "runtime.JspFragmentHelper");
-Class clazz = loader.loadClass( basePackage +
"runtime.JspRuntimeLibrary");
+loader.loadClass(basePackage + "runtime.JspContextWrapper");
+loader.loadClass(basePackage +
"runtime.JspFactoryImpl$PrivilegedGetPageContext");
+loader.loadClass(basePackage +
"runtime.JspFactoryImpl$PrivilegedReleasePageContext");
+loader.loadClass(basePackage + "runtime.JspFragmentHelper");
+
+Class clazz = loader.loadClass(basePackage +
"runtime.JspRuntimeLibrary");
clazz.getConstructor().newInstance();
-loader.loadClass( basePackage + "runtime.PageContextImpl");
-loader.loadClass( basePackage + "runtime.ProtectedFunctionMapper");
-loader.loadClass( basePackage +
"runtime.ServletResponseWrapperInclude");
-loader.loadClass( basePackage + "runtime.TagHandlerPool");
+
+loader.loadClass(basePackage + "runtime.PageContextImpl");
+
+loader.loadClass(basePackage + "runtime.ProtectedFunctionMapper");
+loader.loadClass(basePackage +
"runtime.ServletResponseWrapperInclude");
+loader.loadClass(basePackage + "runtime.TagHandlerPool");
// Trigger loading of class and reading of property
SecurityUtil.isPackageProtectionEnabled();
-loader.loadClass( basePackage + "servlet.JspServletWrapper");
+loader.loadClass(basePackage + "servlet.JspServletWrapper");
} catch (Exception ex) {
Log log = LogFactory.getLog(SecurityClassLoad.class);
log.error(Localizer.getMessage("jsp.error.securityPreload"), ex);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Update to Tomcat Native 1.2.27
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
commit fff99cabe6358f5fd7147457c5b8c22da29b877a
Author: Mark Thomas
AuthorDate: Mon Mar 29 17:20:08 2021 +0100
Update to Tomcat Native 1.2.27
---
build.properties.default | 10 +-
webapps/docs/changelog.xml | 4
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index a8fbdee..6498ccc 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -147,19 +147,19 @@
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# - Tomcat native library -
-tomcat-native.version=1.2.26
+tomcat-native.version=1.2.27
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=cad9d9efdb6c980afcf304bd78e5ea572271075e153e2015d393dd5e6f4612992c7d0ac499c9aeafe0c3874832356e197564717df15b36a48aba775960659ac2
+tomcat-native.src.checksum.value=99e356cef89bdc35cfcb98fafe0d5dda8375461382053969509b6b24d9129ca89782bc618c58245980c921abbdb25eece80cb129e33ad06741d22681b84d7742
tomcat-native.win.checksum.enabled=true
tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=607b45074fda397f2fc49f0f3b4128df5373d692b82167f39f5430e04846b788db1487c0805173c924ab0c94d5767b6c5bba887a1148f104eca39c09d19539d1
+tomcat-native.win.checksum.value=90553cb8d74f00e00ac220a18c5c647c5b74f0487020d41efe33beb501c2caac43d77363a7820c2e91ac7a0f23967a2077e704e8db56ad18978780346a642ca3
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
tomcat-native.loc.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
-tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1i-win32-bin.zip
-tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1i-win32-bin.zip
+tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1k-win32-bin.zip
+tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1k-win32-bin.zip
# - NSIS, version 3.0 or later -
nsis.version=3.06.1
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6741ef1..169b661 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -190,6 +190,10 @@
Improvements to Korean translations. (woonsan)
+
+Update the packaged version of the Tomcat Native Library to 1.2.27.
+(markt)
+
-
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 (e3c7999 -> fff99ca)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from e3c7999 No functional change. Align 10.0.x, 9.0.x, 8.5.x new 7c56e05 No functional change. Align 10.0.x, 9.0.x and 8.5.x new fff99ca Update to Tomcat Native 1.2.27 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: build.properties.default | 10 .../apache/jasper/security/SecurityClassLoad.java | 29 -- webapps/docs/changelog.xml | 4 +++ 3 files changed, 25 insertions(+), 18 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: No functional change. Align 10.0.x, 9.0.x and 8.5.x
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 1a850615aefd14061a2cc9d96f5e597fb173b798
Author: Mark Thomas
AuthorDate: Mon Mar 29 17:17:03 2021 +0100
No functional change. Align 10.0.x, 9.0.x and 8.5.x
---
.../apache/jasper/security/SecurityClassLoad.java | 29 --
1 file changed, 16 insertions(+), 13 deletions(-)
diff --git a/java/org/apache/jasper/security/SecurityClassLoad.java
b/java/org/apache/jasper/security/SecurityClassLoad.java
index 77a0d59..3642847 100644
--- a/java/org/apache/jasper/security/SecurityClassLoad.java
+++ b/java/org/apache/jasper/security/SecurityClassLoad.java
@@ -27,32 +27,35 @@ import org.apache.juli.logging.LogFactory;
*/
public final class SecurityClassLoad {
-public static void securityClassLoad(ClassLoader loader){
+public static void securityClassLoad(ClassLoader loader) {
-if( System.getSecurityManager() == null ){
+if (System.getSecurityManager() == null) {
return;
}
final String basePackage = "org.apache.jasper.";
try {
// Ensure XMLInputFactory is loaded with Tomcat's class loader
-loader.loadClass( basePackage + "compiler.EncodingDetector");
+loader.loadClass(basePackage + "compiler.EncodingDetector");
-loader.loadClass( basePackage + "runtime.JspContextWrapper");
-loader.loadClass( basePackage +
"runtime.JspFactoryImpl$PrivilegedGetPageContext");
-loader.loadClass( basePackage +
"runtime.JspFactoryImpl$PrivilegedReleasePageContext");
-loader.loadClass( basePackage + "runtime.JspFragmentHelper");
-Class clazz = loader.loadClass( basePackage +
"runtime.JspRuntimeLibrary");
+loader.loadClass(basePackage + "runtime.JspContextWrapper");
+loader.loadClass(basePackage +
"runtime.JspFactoryImpl$PrivilegedGetPageContext");
+loader.loadClass(basePackage +
"runtime.JspFactoryImpl$PrivilegedReleasePageContext");
+loader.loadClass(basePackage + "runtime.JspFragmentHelper");
+
+Class clazz = loader.loadClass(basePackage +
"runtime.JspRuntimeLibrary");
clazz.getConstructor().newInstance();
-loader.loadClass( basePackage + "runtime.PageContextImpl");
-loader.loadClass( basePackage + "runtime.ProtectedFunctionMapper");
-loader.loadClass( basePackage +
"runtime.ServletResponseWrapperInclude");
-loader.loadClass( basePackage + "runtime.TagHandlerPool");
+
+loader.loadClass(basePackage + "runtime.PageContextImpl");
+
+loader.loadClass(basePackage + "runtime.ProtectedFunctionMapper");
+loader.loadClass(basePackage +
"runtime.ServletResponseWrapperInclude");
+loader.loadClass(basePackage + "runtime.TagHandlerPool");
// Trigger loading of class and reading of property
SecurityUtil.isPackageProtectionEnabled();
-loader.loadClass( basePackage + "servlet.JspServletWrapper");
+loader.loadClass(basePackage + "servlet.JspServletWrapper");
} catch (Exception ex) {
Log log = LogFactory.getLog(SecurityClassLoad.class);
log.error(Localizer.getMessage("jsp.error.securityPreload"), ex);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Update to Tomcat Native 1.2.27
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 0d94fbb71fc378325c9d3630ad1a4bad2a0e17c0
Author: Mark Thomas
AuthorDate: Mon Mar 29 17:20:08 2021 +0100
Update to Tomcat Native 1.2.27
---
build.properties.default | 10 +-
webapps/docs/changelog.xml | 4
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 2d2e8a7..f9b3456 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -147,19 +147,19 @@
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# - Tomcat native library -
-tomcat-native.version=1.2.26
+tomcat-native.version=1.2.27
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=cad9d9efdb6c980afcf304bd78e5ea572271075e153e2015d393dd5e6f4612992c7d0ac499c9aeafe0c3874832356e197564717df15b36a48aba775960659ac2
+tomcat-native.src.checksum.value=99e356cef89bdc35cfcb98fafe0d5dda8375461382053969509b6b24d9129ca89782bc618c58245980c921abbdb25eece80cb129e33ad06741d22681b84d7742
tomcat-native.win.checksum.enabled=true
tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=607b45074fda397f2fc49f0f3b4128df5373d692b82167f39f5430e04846b788db1487c0805173c924ab0c94d5767b6c5bba887a1148f104eca39c09d19539d1
+tomcat-native.win.checksum.value=90553cb8d74f00e00ac220a18c5c647c5b74f0487020d41efe33beb501c2caac43d77363a7820c2e91ac7a0f23967a2077e704e8db56ad18978780346a642ca3
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
tomcat-native.loc.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
-tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1i-win32-bin.zip
-tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1i-win32-bin.zip
+tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1k-win32-bin.zip
+tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1k-win32-bin.zip
# - NSIS, version 3.0 or later -
nsis.version=3.06.1
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a09634b..7e05ebf 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -190,6 +190,10 @@
Improvements to Korean translations. (woonsan)
+
+Update the packaged version of the Tomcat Native Library to 1.2.27.
+(markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (c398626 -> 0d94fbb)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git. from c398626 No functional change. Align 10.0.x, 9.0.x, 8.5.x new 1a85061 No functional change. Align 10.0.x, 9.0.x and 8.5.x new 0d94fbb Update to Tomcat Native 1.2.27 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: build.properties.default | 10 .../apache/jasper/security/SecurityClassLoad.java | 29 -- webapps/docs/changelog.xml | 4 +++ 3 files changed, 25 insertions(+), 18 deletions(-) - 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: No functional change. Align 10.0.x, 9.0.x and 8.5.x
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 4be404e No functional change. Align 10.0.x, 9.0.x and 8.5.x
4be404e is described below
commit 4be404e5b2246991a1e95e021182853686bd0e23
Author: Mark Thomas
AuthorDate: Mon Mar 29 16:48:41 2021 +0100
No functional change. Align 10.0.x, 9.0.x and 8.5.x
---
.../apache/jasper/compiler/JavacErrorDetail.java | 2 +-
.../apache/jasper/compiler/JspDocumentParser.java | 5 +--
java/org/apache/jasper/compiler/JspReader.java | 2 +-
.../apache/jasper/compiler/JspRuntimeContext.java | 5 +--
java/org/apache/jasper/compiler/JspUtil.java | 46 --
.../apache/jasper/compiler/ParserController.java | 2 +-
.../apache/jasper/compiler/TagFileProcessor.java | 7 ++--
.../jasper/resources/LocalStrings.properties | 3 ++
.../jasper/resources/LocalStrings_de.properties| 2 +
.../jasper/resources/LocalStrings_fr.properties| 3 ++
.../jasper/resources/LocalStrings_ja.properties| 3 ++
.../jasper/resources/LocalStrings_ko.properties| 3 ++
.../jasper/resources/LocalStrings_zh_CN.properties | 3 ++
13 files changed, 35 insertions(+), 51 deletions(-)
diff --git a/java/org/apache/jasper/compiler/JavacErrorDetail.java
b/java/org/apache/jasper/compiler/JavacErrorDetail.java
index 1321afc..d62d81c 100644
--- a/java/org/apache/jasper/compiler/JavacErrorDetail.java
+++ b/java/org/apache/jasper/compiler/JavacErrorDetail.java
@@ -118,7 +118,7 @@ public class JavacErrorDetail {
String javaLine = javaLines[javaLineNum-1].trim();
for (int i=jspBeginLineNum-1; i temp = new Vector<>(tempLength, 1);
+ArrayList temp = new ArrayList<>(tempLength);
for (int i = 0; i < tempLength; i++) {
@SuppressWarnings("null") // If attrs==null, tempLength == 0
String qName = attrs.getQName(i);
if ((!qName.equals("xmlns")) && (!qName.startsWith("xmlns:"))) {
-temp.addElement(qName);
+temp.add(qName);
}
}
@@ -143,7 +143,7 @@ public class JspUtil {
Node node = tagBody.getNode(i);
if (node instanceof Node.NamedAttribute) {
String attrName = node.getAttributeValue("name");
-temp.addElement(attrName);
+temp.add(attrName);
// Check if this value appear in the attribute of the node
if (n.getAttributeValue(attrName) != null) {
err.jspError(n,
@@ -325,7 +325,7 @@ public class JspUtil {
c = double.class;
} else if ("void".equals(type)) {
c = void.class;
-} else if (type.indexOf('[') < 0) {
+} else {
c = loader.loadClass(type);
}
@@ -768,7 +768,7 @@ public class JspUtil {
* @return Java package corresponding to the given path
*/
public static final String makeJavaPackage(String path) {
-String classNameComponents[] = split(path, "/");
+String classNameComponents[] = path.split("/");
StringBuilder legalClassNames = new StringBuilder();
for (String classNameComponent : classNameComponents) {
if (classNameComponent.length() > 0) {
@@ -782,37 +782,6 @@ public class JspUtil {
}
/**
- * Splits a string into it's components.
- *
- * @param path
- *String to split
- * @param pat
- *Pattern to split at
- * @return the components of the path
- */
-private static final String[] split(String path, String pat) {
-Vector comps = new Vector<>();
-int pos = path.indexOf(pat);
-int start = 0;
-while (pos >= 0) {
-if (pos > start) {
-String comp = path.substring(start, pos);
-comps.add(comp);
-}
-start = pos + pat.length();
-pos = path.indexOf(pat, start);
-}
-if (start < path.length()) {
-comps.add(path.substring(start));
-}
-String[] result = new String[comps.size()];
-for (int i = 0; i < comps.size(); i++) {
-result[i] = comps.elementAt(i);
-}
-return result;
-}
-
-/**
* Converts the given identifier to a legal Java identifier
*
* @param identifier
@@ -991,8 +960,7 @@ public class JspUtil {
if (t == null) {
// Should never happen
-throw new IllegalArgumentException("Unable to extract type from ["
+
-type + "]");
+throw new
IllegalArgumentException(Localizer.getMessage("jsp.error.unable.getType",
type));
}
StringBuilder resultType = new
[tomcat] branch 8.5.x updated: No functional change. Align 10.0.x, 9.0.x and 8.5.x
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 ea79f05 No functional change. Align 10.0.x, 9.0.x and 8.5.x
ea79f05 is described below
commit ea79f05f25db4560dd34eaf5bdb39fa6338d9212
Author: Mark Thomas
AuthorDate: Mon Mar 29 16:33:11 2021 +0100
No functional change. Align 10.0.x, 9.0.x and 8.5.x
---
java/org/apache/jasper/compiler/JDTCompiler.java | 8
java/org/apache/jasper/resources/LocalStrings.properties | 3 +++
java/org/apache/jasper/resources/LocalStrings_de.properties| 1 +
java/org/apache/jasper/resources/LocalStrings_fr.properties| 3 +++
java/org/apache/jasper/resources/LocalStrings_ja.properties| 3 +++
java/org/apache/jasper/resources/LocalStrings_ko.properties| 3 +++
java/org/apache/jasper/resources/LocalStrings_zh_CN.properties | 3 +++
7 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java
b/java/org/apache/jasper/compiler/JDTCompiler.java
index c0b39a1..510db1a 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -145,7 +145,7 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
result = new char[buf.length()];
buf.getChars(0, result.length, result, 0);
} catch (IOException e) {
-log.error("Compilation error", e);
+
log.error(Localizer.getMessage("jsp.error.compilation.source", sourceFile), e);
}
return result;
}
@@ -232,7 +232,7 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
return new NameEnvironmentAnswer(classFileReader,
null);
}
} catch (IOException | ClassFormatException exc) {
-log.error("Compilation error", exc);
+
log.error(Localizer.getMessage("jsp.error.compilation.dependent", className),
exc);
}
return null;
}
@@ -465,7 +465,7 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
(name, pageNodes, new
StringBuilder(problem.getMessage()),
problem.getSourceLineNumber(), ctxt));
} catch (JasperException e) {
-log.error("Error visiting node", e);
+
log.error(Localizer.getMessage("jsp.error.compilation.jdtProblemError"), e);
}
}
}
@@ -491,7 +491,7 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
}
}
} catch (IOException exc) {
-log.error("Compilation error", exc);
+
log.error(Localizer.getMessage("jsp.error.compilation.jdt"), exc);
}
}
};
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties
b/java/org/apache/jasper/resources/LocalStrings.properties
index 4fd82ec..ad38f8b 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -46,6 +46,9 @@ jsp.error.bug48498=Unable to display JSP extract. Probably
due to an XML parser
jsp.error.classname=Cannot determine classname from .class file
jsp.error.coerce_to_type=Cannot coerce value [{2}] to type [{1}] for attribute
[{0}].
jsp.error.compilation=Error compiling file: [{0}] [{1}]
+jsp.error.compilation.jdt=Compilation error
+jsp.error.compilation.jdtProblemError=Error processing JDT problems list
+jsp.error.compilation.source=Error loading source file [{0}]
jsp.error.compiler=No Java compiler available
jsp.error.compiler.config=No Java compiler available for configuration options
compilerClassName: [{0}] and compiler: [{1}]
jsp.error.config_pagedir_encoding_mismatch=Page-encoding specified in
jsp-property-group [{0}] is different from that specified in page directive
[{1}]
diff --git a/java/org/apache/jasper/resources/LocalStrings_de.properties
b/java/org/apache/jasper/resources/LocalStrings_de.properties
index 56b5be5..2fbc268 100644
--- a/java/org/apache/jasper/resources/LocalStrings_de.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_de.properties
@@ -20,6 +20,7 @@ jsp.error.attribute.deferredmix=Kann nicht ${} und #{}
gleichzeitig als EL Ausdr
jsp.error.attribute.duplicate=Qualifizierte Attributnamen müssen innerhalb
eines
[tomcat] branch 8.5.x updated: No functional change. Align 10.0.x, 9.0.x, 8.5.x
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 5b1f7ce No functional change. Align 10.0.x, 9.0.x, 8.5.x
5b1f7ce is described below
commit 5b1f7ce00e4df442a704d27e609952aa8f2b5dce
Author: Mark Thomas
AuthorDate: Mon Mar 29 16:27:42 2021 +0100
No functional change. Align 10.0.x, 9.0.x, 8.5.x
---
java/org/apache/jasper/compiler/JDTCompiler.java | 125 ++-
1 file changed, 55 insertions(+), 70 deletions(-)
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java
b/java/org/apache/jasper/compiler/JDTCompiler.java
index d493c27..c0b39a1 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -305,33 +305,25 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
if(ctxt.getOptions().getCompilerSourceVM() != null) {
String opt = ctxt.getOptions().getCompilerSourceVM();
if(opt.equals("1.1")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_1);
+settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_1_1);
} else if(opt.equals("1.2")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_2);
+settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_1_2);
} else if(opt.equals("1.3")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_3);
+settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_1_3);
} else if(opt.equals("1.4")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_4);
+settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_1_4);
} else if(opt.equals("1.5")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_5);
+settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_1_5);
} else if(opt.equals("1.6")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_6);
+settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_1_6);
} else if(opt.equals("1.7")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_7);
+settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_1_7);
} else if(opt.equals("1.8")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_8);
+settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_1_8);
+// Version format changed from Java 9 onwards.
// Support old format that was used in EA implementation as well
} else if(opt.equals("9") || opt.equals("1.9")) {
-settings.put(CompilerOptions.OPTION_Source,
- JDT_JAVA_9_VERSION);
+settings.put(CompilerOptions.OPTION_Source,
JDT_JAVA_9_VERSION);
} else if(opt.equals("10")) {
// Constant not available in latest ECJ version that runs on
// Java 7.
@@ -348,71 +340,62 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_Source, "12");
} else if(opt.equals("13")) {
-// Constant not available in latest available ECJ version.
-// May be supported in a snapshot build.
+// Constant not available in latest ECJ version that runs on
+// Java 7.
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_Source, "13");
} else if(opt.equals("14")) {
-// Constant not available in latest available ECJ version.
-// May be supported in a snapshot build.
+// Constant not available in latest ECJ version that runs on
+// Java 7.
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_Source, "14");
} else if(opt.equals("15")) {
-// Constant not available in latest available ECJ version.
-// May be supported in a snapshot build.
+// Constant not
[tomcat] branch 9.0.x updated: No functional change. Align 10.0.x, 9.0.x, 8.5.x
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 e3c7999 No functional change. Align 10.0.x, 9.0.x, 8.5.x
e3c7999 is described below
commit e3c799978a931ac4e5e966a3f919796d831a9f55
Author: Mark Thomas
AuthorDate: Mon Mar 29 16:27:37 2021 +0100
No functional change. Align 10.0.x, 9.0.x, 8.5.x
---
java/org/apache/jasper/compiler/JDTCompiler.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java
b/java/org/apache/jasper/compiler/JDTCompiler.java
index ebc00f6..5b15a80 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -421,9 +421,8 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
}
byte[] bytes = classFile.getBytes();
classFileName.append(".class");
-try (FileOutputStream fout = new
FileOutputStream(
-classFileName.toString());
- BufferedOutputStream bos = new
BufferedOutputStream(fout)) {
+try (FileOutputStream fout = new
FileOutputStream(classFileName.toString());
+BufferedOutputStream bos = new
BufferedOutputStream(fout)) {
bos.write(bytes);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: No functional change. Align 10.0.x, 9.0.x, 8.5.x
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new c398626 No functional change. Align 10.0.x, 9.0.x, 8.5.x
c398626 is described below
commit c3986264bfac32694369f5d5e630f65030167066
Author: Mark Thomas
AuthorDate: Mon Mar 29 16:27:31 2021 +0100
No functional change. Align 10.0.x, 9.0.x, 8.5.x
---
java/org/apache/jasper/compiler/JDTCompiler.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java
b/java/org/apache/jasper/compiler/JDTCompiler.java
index ebc00f6..5b15a80 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -421,9 +421,8 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
}
byte[] bytes = classFile.getBytes();
classFileName.append(".class");
-try (FileOutputStream fout = new
FileOutputStream(
-classFileName.toString());
- BufferedOutputStream bos = new
BufferedOutputStream(fout)) {
+try (FileOutputStream fout = new
FileOutputStream(classFileName.toString());
+BufferedOutputStream bos = new
BufferedOutputStream(fout)) {
bos.write(bytes);
}
}
-
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: No functional change. Align 10.0.x, 9.0.x and 8.5.x
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 d112d80 No functional change. Align 10.0.x, 9.0.x and 8.5.x
d112d80 is described below
commit d112d806b8a741e0d08ddd0a8f811aaa478c2745
Author: Mark Thomas
AuthorDate: Mon Mar 29 16:11:26 2021 +0100
No functional change. Align 10.0.x, 9.0.x and 8.5.x
---
java/org/apache/jasper/compiler/ELFunctionMapper.java| 3 ++-
java/org/apache/jasper/compiler/ErrorDispatcher.java | 3 ++-
java/org/apache/jasper/compiler/Generator.java | 16 +---
java/org/apache/jasper/resources/LocalStrings.properties | 1 +
.../apache/jasper/resources/LocalStrings_de.properties | 1 +
.../apache/jasper/resources/LocalStrings_fr.properties | 1 +
.../apache/jasper/resources/LocalStrings_ja.properties | 1 +
.../apache/jasper/resources/LocalStrings_ko.properties | 1 +
.../jasper/resources/LocalStrings_zh_CN.properties | 1 +
9 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/java/org/apache/jasper/compiler/ELFunctionMapper.java
b/java/org/apache/jasper/compiler/ELFunctionMapper.java
index 58af9f8..2bd2d71 100644
--- a/java/org/apache/jasper/compiler/ELFunctionMapper.java
+++ b/java/org/apache/jasper/compiler/ELFunctionMapper.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import javax.servlet.jsp.tagext.FunctionInfo;
@@ -81,7 +82,7 @@ public class ELFunctionMapper {
* Use a global name map to facilitate reuse of function maps.
* The key used is prefix:function:uri.
*/
-private final HashMap gMap = new HashMap<>();
+private final Map gMap = new HashMap<>();
@Override
public void visit(Node.ParamAction n) throws JasperException {
diff --git a/java/org/apache/jasper/compiler/ErrorDispatcher.java
b/java/org/apache/jasper/compiler/ErrorDispatcher.java
index f9bf3b3..2ecc675 100644
--- a/java/org/apache/jasper/compiler/ErrorDispatcher.java
+++ b/java/org/apache/jasper/compiler/ErrorDispatcher.java
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.io.StringReader;
import java.net.MalformedURLException;
import java.util.ArrayList;
+import java.util.List;
import org.apache.jasper.JasperException;
import org.apache.jasper.JspCompilationContext;
@@ -316,7 +317,7 @@ public class ErrorDispatcher {
String errMsg, String fname, Node.Nodes page)
throws IOException, JasperException {
-ArrayList errors = new ArrayList<>();
+List errors = new ArrayList<>();
StringBuilder errMsgBuf = null;
int lineNum = -1;
JavacErrorDetail javacError = null;
diff --git a/java/org/apache/jasper/compiler/Generator.java
b/java/org/apache/jasper/compiler/Generator.java
index ef445da..b85c777 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -1079,9 +1079,7 @@ class Generator {
String flush = n.getTextAttribute("flush");
Node.JspAttribute page = n.getPage();
-boolean isFlush = false; // default to false;
-if ("true".equals(flush))
-isFlush = true;
+boolean isFlush = "true".equals(flush);
n.setBeginJavaLine(out.getJavaLine());
@@ -3416,11 +3414,7 @@ class Generator {
} else if (n instanceof Node.NamedAttribute) {
ci = ((Node.NamedAttribute) n).getChildInfo();
} else {
-// Cannot access err since this method is static, but at
-// least flag an error.
-throw new JasperException("Unexpected Node Type");
-// err.getString(
-// "jsp.error.internal.unexpected_node_type" ) );
+throw new
JasperException(Localizer.getMessage("jsp.error.internal.unexpectedNodeType"));
}
if (ci.hasUseBean()) {
@@ -3632,8 +3626,8 @@ class Generator {
String className = tagInfo.getTagClassName();
int lastIndex = className.lastIndexOf('.');
if (lastIndex != -1) {
-String pkgName = className.substring(0, lastIndex);
-genPreamblePackage(pkgName);
+String packageName = className.substring(0, lastIndex);
+genPreamblePackage(packageName);
className = className.substring(lastIndex + 1);
}
@@ -4211,7 +4205,7 @@ class Generator {
// True if the helper class should be generated.
private boolean used = false;
-private ArrayList fragments = new ArrayList<>();
+private List fragments = new ArrayList<>();
private String className;
diff --git
[tomcat-jakartaee-migration] branch master updated: Refactor for duplication
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git
The following commit(s) were added to refs/heads/master by this push:
new 1a7ff40 Refactor for duplication
1a7ff40 is described below
commit 1a7ff406b3e47f18fc3f2bc99d05b17bda9f25f0
Author: remm
AuthorDate: Mon Mar 29 16:45:45 2021 +0200
Refactor for duplication
---
.../apache/tomcat/jakartaee/ClassConverter.java| 94 --
1 file changed, 34 insertions(+), 60 deletions(-)
diff --git a/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
b/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
index 9b3cbd9..81deddf 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
@@ -59,7 +59,27 @@ public class ClassConverter implements Converter,
ClassFileTransformer {
@Override
public void convert(String path, InputStream src, OutputStream dest,
EESpecProfile profile) throws IOException {
+convertInternal(path, src, dest, profile, null);
+}
+
+
+@Override
+public byte[] transform(ClassLoader loader, String className,
+Class classBeingRedefined, ProtectionDomain protectionDomain,
+byte[] classfileBuffer) throws IllegalClassFormatException {
+ByteArrayInputStream inputStream = new
ByteArrayInputStream(classfileBuffer);
+ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+try {
+convertInternal(className, inputStream, outputStream, profile,
loader);
+} catch (IOException e) {
+throw new IllegalClassFormatException(e.getLocalizedMessage());
+}
+return outputStream.toByteArray();
+}
+
+protected void convertInternal(String path, InputStream src, OutputStream
dest, EESpecProfile profile, ClassLoader loader)
+throws IOException {
ClassParser parser = new ClassParser(src, "unknown");
JavaClass javaClass = parser.parse();
@@ -75,49 +95,9 @@ public class ClassConverter implements Converter,
ClassFileTransformer {
String newString = profile.convert(str);
// Object comparison is deliberate
if (newString != str) {
-c = new ConstantUtf8(newString);
-constantPool[i] = c;
-converted = true;
-}
-}
-}
-
-if (logger.isLoggable(Level.FINE)) {
-if (converted) {
-logger.log(Level.FINE,
sm.getString("classConverter.converted", path));
-} else if (logger.isLoggable(Level.FINEST)) {
-logger.log(Level.FINEST,
sm.getString("classConverter.noConversion", path));
-}
-}
-
-javaClass.dump(dest);
-}
-
-
-@Override
-public byte[] transform(ClassLoader loader, String className,
-Class classBeingRedefined, ProtectionDomain protectionDomain,
-byte[] classfileBuffer) throws IllegalClassFormatException {
-ByteArrayInputStream inputStream = new
ByteArrayInputStream(classfileBuffer);
-ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-try {
-ClassParser parser = new ClassParser(inputStream, "unknown");
-JavaClass javaClass = parser.parse();
-
-boolean converted = false;
-
-// Loop through constant pool
-Constant[] constantPool =
javaClass.getConstantPool().getConstantPool();
-// Need an int as the maximum pool size is 2^16
-for (int i = 0; i < constantPool.length; i++) {
-if (constantPool[i] instanceof ConstantUtf8) {
-ConstantUtf8 c = (ConstantUtf8) constantPool[i];
-String str = c.getBytes();
-String newString = profile.convert(str);
-// Object comparison is deliberate
-if (newString != str) {
-// Since this is runtime conversion, the idea is to
only convert to
-// Jakarta EE specification classes that exist in the
container
+if (loader != null) {
+// Since this is a runtime conversion, the idea is to
only convert to
+// Jakarta EE specification classes that exist in the
container
String[] split = newString.split(";|<");
for (String current : split) {
int pos = current.indexOf("jakarta/");
@@ -132,28 +112,22 @@ public class ClassConverter implements Converter,
ClassFileTransformer {
}
}
}
-if (newString != str) {
-
[tomcat] branch 8.5.x updated (4488491 -> b6c39ba)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 4488491 Align with 10.0.x, 9.0.x and 8.5.x new 0c7857e Align 10.0.x, 9.0.x and 8.5.x new b6c39ba No functional change. Align 10.0.x, 9.0.x and 8.5.x. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/catalina/manager/host/HTMLHostManagerServlet.java | 4 ++-- java/org/apache/catalina/manager/host/HostManagerServlet.java | 1 - java/org/apache/el/ExpressionFactoryImpl.java | 7 --- java/org/apache/el/Messages.properties| 11 ++- java/org/apache/el/lang/ExpressionBuilder.java| 5 ++--- java/org/apache/el/lang/FunctionMapperFactory.java| 4 +++- java/org/apache/el/lang/FunctionMapperImpl.java | 5 +++-- java/org/apache/el/lang/VariableMapperFactory.java| 6 -- java/org/apache/el/parser/AstIdentifier.java | 9 ++--- java/org/apache/el/parser/AstLambdaExpression.java| 2 +- java/org/apache/el/parser/AstMethodParameters.java| 3 ++- java/org/apache/el/parser/TokenMgrError.java | 4 ++-- java/org/apache/el/util/ReflectionUtil.java | 7 +-- 13 files changed, 32 insertions(+), 36 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Align 10.0.x, 9.0.x and 8.5.x
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
commit 0c7857e53e35e866aab6632eee954f74011d6b78
Author: Mark Thomas
AuthorDate: Mon Mar 29 14:33:38 2021 +0100
Align 10.0.x, 9.0.x and 8.5.x
---
java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java | 4 ++--
java/org/apache/catalina/manager/host/HostManagerServlet.java | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
b/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
index 2ff5b10..e19c3d5 100644
--- a/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
+++ b/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
@@ -44,7 +44,7 @@ import org.apache.tomcat.util.security.Escape;
* this requirement can be relaxed during testing.
*
* The difference between the HostManagerServlet and this
-* Servlet is that this Servlet prints out a HTML interface which
+* Servlet is that this Servlet prints out an HTML interface which
* makes it easier to administrate.
*
* However if you use a software that parses the output of
@@ -247,7 +247,7 @@ public final class HTMLHostManagerServlet extends
HostManagerServlet {
/**
- * Render a HTML list of the currently active Contexts in our virtual host,
+ * Render an HTML list of the currently active Contexts in our virtual
host,
* and memory and server status information.
*
* @param request The request
diff --git a/java/org/apache/catalina/manager/host/HostManagerServlet.java
b/java/org/apache/catalina/manager/host/HostManagerServlet.java
index df1c16f..b1237b7 100644
--- a/java/org/apache/catalina/manager/host/HostManagerServlet.java
+++ b/java/org/apache/catalina/manager/host/HostManagerServlet.java
@@ -674,7 +674,6 @@ public class HostManagerServlet
} else {
writer.println(smClient.getString("hostManagerServlet.exception",
e.toString()));
}
-return;
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: No functional change. Align 10.0.x, 9.0.x and 8.5.x.
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
commit b6c39bac8012b6d4f3adf3adcbba36753a13bebc
Author: Mark Thomas
AuthorDate: Mon Mar 29 15:14:26 2021 +0100
No functional change. Align 10.0.x, 9.0.x and 8.5.x.
---
java/org/apache/el/ExpressionFactoryImpl.java | 7 ---
java/org/apache/el/Messages.properties | 11 ++-
java/org/apache/el/lang/ExpressionBuilder.java | 5 ++---
java/org/apache/el/lang/FunctionMapperFactory.java | 4 +++-
java/org/apache/el/lang/FunctionMapperImpl.java| 5 +++--
java/org/apache/el/lang/VariableMapperFactory.java | 6 --
java/org/apache/el/parser/AstIdentifier.java | 9 ++---
java/org/apache/el/parser/AstLambdaExpression.java | 2 +-
java/org/apache/el/parser/AstMethodParameters.java | 3 ++-
java/org/apache/el/parser/TokenMgrError.java | 4 ++--
java/org/apache/el/util/ReflectionUtil.java| 7 +--
11 files changed, 30 insertions(+), 33 deletions(-)
diff --git a/java/org/apache/el/ExpressionFactoryImpl.java
b/java/org/apache/el/ExpressionFactoryImpl.java
index e32eced..4bd8fc3 100644
--- a/java/org/apache/el/ExpressionFactoryImpl.java
+++ b/java/org/apache/el/ExpressionFactoryImpl.java
@@ -35,13 +35,6 @@ import org.apache.el.util.MessageFactory;
*/
public class ExpressionFactoryImpl extends ExpressionFactory {
-/**
- *
- */
-public ExpressionFactoryImpl() {
-super();
-}
-
@Override
public Object coerceToType(Object obj, Class type) {
return ELSupport.coerceToType(null, obj, type);
diff --git a/java/org/apache/el/Messages.properties
b/java/org/apache/el/Messages.properties
index fbce247..1bf600d 100644
--- a/java/org/apache/el/Messages.properties
+++ b/java/org/apache/el/Messages.properties
@@ -14,9 +14,15 @@
# limitations under the License.
# General Errors
+error.cannotSetVariables=Cannot set variables on factory
error.convert=Cannot convert [{0}] of type [{1}] to [{2}]
error.compare=Cannot compare [{0}] to [{1}]
error.function=Problems calling function [{0}]
+error.invalidMethodExpression=Not a valid method expression [{0}]
+error.noFunctionMapperTarget=FunctionMapper target cannot be null
+error.noVariableMapperTarget=FunctionMapper target cannot be null
+error.nullLocalName=Local name cannot be null
+error.nullMethod=Method cannot be null
error.unreachable.base=Target Unreachable, identifier [{0}] resolved to null
error.unreachable.property=Target Unreachable, [{0}] returned null
error.resolver.unhandled=ELResolver did not handle type: [{0}] with property
of [{1}]
@@ -29,7 +35,7 @@ error.value.literal.write=ValueExpression is a literal and
not writable: [{0}]
# ExpressionFactoryImpl
error.null=Expression cannot be null
-error.mixed=Expression cannot contain both '#{...}' and '${...}' : [{0}]
+error.mixed=Expression cannot contain both ''#{...}'' and ''${...}'' : [{0}]
error.method=Not a valid MethodExpression : [{0}]
error.method.nullParms=Parameter types cannot be null
error.value.expectedType=Expected type cannot be null
@@ -54,8 +60,11 @@ error.context.null=ELContext was null
# Parser
error.function.tooManyMethodParameterSets=There are multiple sets of
parameters specified for function [{0}]
+error.identifier.noMethod=Identity [{0}] was null and was unable to invoke
error.identifier.notjava=The identifier [{0}] is not a valid Java identifier
as required by section 1.19 of the EL specification (Identifier ::= Java
language identifier). This check can be disabled by setting the system property
org.apache.el.parser.SKIP_IDENTIFIER_CHECK to true.
+error.identifier.notMethodExpression=Identity [{0}] does not reference a
method expression instance, returned type [{1}]
error.lambda.tooManyMethodParameterSets=There are more sets of method
parameters specified than there are nested lambda expressions
+error.lambda.wrongNestedState=Nested state may only be set once
# Stream
stream.compare.notComparable=Stream elements must implement Comparable
diff --git a/java/org/apache/el/lang/ExpressionBuilder.java
b/java/org/apache/el/lang/ExpressionBuilder.java
index cde34a6..6c3620b 100644
--- a/java/org/apache/el/lang/ExpressionBuilder.java
+++ b/java/org/apache/el/lang/ExpressionBuilder.java
@@ -230,7 +230,7 @@ public final class ExpressionBuilder implements NodeVisitor
{
"" + methodParameterCount, "" +
node.jjtGetChild(0).jjtGetNumChildren()));
}
} else if (node instanceof AstIdentifier && this.varMapper != null) {
-String variable = ((AstIdentifier) node).getImage();
+String variable = node.getImage();
// simply capture it
this.varMapper.resolveVariable(variable);
@@ -258,8 +258,7 @@ public final class ExpressionBuilder implements NodeVisitor
{
return new
[tomcat] 01/02: No functional change. Align 10.0.x, 9.0.x, 8.5.x.
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
commit bfffb596f74c27f893ba93f3a7d31741ee8ccb06
Author: Mark Thomas
AuthorDate: Mon Mar 29 14:12:17 2021 +0100
No functional change. Align 10.0.x, 9.0.x, 8.5.x.
---
java/org/apache/catalina/core/LocalStrings.properties | 1 +
java/org/apache/catalina/core/LocalStrings_fr.properties| 1 +
java/org/apache/catalina/core/LocalStrings_ja.properties| 1 +
java/org/apache/catalina/core/LocalStrings_ko.properties| 1 +
java/org/apache/catalina/core/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/core/StandardEngine.java | 5 +++--
6 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index e4a9874..5bedad0 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -218,6 +218,7 @@ standardContextValve.acknowledgeException=Failed to
acknowledge request with a 1
standardEngine.jvmRouteFail=Failed to set Engine's jvmRoute attribute from
system property
standardEngine.notHost=Child of an Engine must be a Host
standardEngine.notParent=Engine cannot have a parent Container
+standardEngine.start=Starting Servlet engine: [{0}]
standardHost.clientAbort=Remote Client Aborted Request, IOException: [{0}]
standardHost.invalidErrorReportValveClass=Couldn''t load specified error
report valve class: [{0}]
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 71395c8..2a1e6ac 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -217,6 +217,7 @@ standardContextValve.acknowledgeException=Impossible de
confirmer la requête av
standardEngine.jvmRouteFail=Impossible de fixer la jvmRoute de l'Engine à
partir d'une propriété système
standardEngine.notHost=Le fils d'un moteur (child of an Engine) doit être un
hôte
standardEngine.notParent=Un moteur (engine) ne peut avoir de conteneur parent
(container)
+standardEngine.start=Démarrage du moteur de Servlets : [{0}]
standardHost.clientAbort=Le client distant a abandonné la requête, IOException
: [{0}]
standardHost.invalidErrorReportValveClass=Impossible de charger la classe
valve de rapport d''erreur : [{0}]
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 6ed2c6b..78c28b1 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -217,6 +217,7 @@ standardContextValve.acknowledgeException=100 (Continue)
レスポンスでリ
standardEngine.jvmRouteFail=EngineのjvmRoute属性をシステムプロパティから設定できませんでした
standardEngine.notHost=Engineの子供はHostでなければいけません
standardEngine.notParent=エンジンは親のコンテナを持つことはできません
+standardEngine.start=サーブレットエンジンの起動：[{0}]
standardHost.clientAbort=リモートクライアントがリクエストを中止しました, IOException: [{0}]
standardHost.invalidErrorReportValveClass=指定されたErrorReportValveクラスをロードできません:
[{0}]
diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties
b/java/org/apache/catalina/core/LocalStrings_ko.properties
index 942f4b4..c8dacaf 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -217,6 +217,7 @@ standardContextValve.acknowledgeException=요청에 대해, 100
(Continue) 응
standardEngine.jvmRouteFail=엔진의 jvmRoute 속성을 시스템 프로퍼티로부터 설정하지 못했습니다.
standardEngine.notHost=엔진의 자식은 반드시 호스트여야 합니다.
standardEngine.notParent=엔진은 부모 컨테이너를 가질 수 없습니다.
+standardEngine.start=서버 엔진을 시작합니다: [{0}]
standardHost.clientAbort=원격 클라이언트가 요청을 중단시켰습니다. IOException: [{0}]
standardHost.invalidErrorReportValveClass=지정된 오류 보고 Valve 클래스 [{0}]을(를) 로드할 수
없었습니다.
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index b9d3c66..8bde25e 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -217,6 +217,7 @@ standardContextValve.acknowledgeException=以100（继续）响应确认请求
standardEngine.jvmRouteFail=无法从系统属性设置引擎的jvmRoute 属性
standardEngine.notHost=Engine的子节点必须是一个Host
standardEngine.notParent=引擎不能有父容器
+standardEngine.start=正在启动 Servlet 引擎：[{0}]
standardHost.clientAbort=远程客户端中止请求，IOException:[{0}]。
standardHost.invalidErrorReportValveClass=无法加载指定的错误报告阀类：[{0}]
diff --git a/java/org/apache/catalina/core/StandardEngine.java
b/java/org/apache/catalina/core/StandardEngine.java
index 6a6fbb5..f60c2e8 100644
--- a/java/org/apache/catalina/core/StandardEngine.java
+++ b/java/org/apache/catalina/core/StandardEngine.java
@@ -254,8 +254,9 @@ public class
[tomcat] 02/02: Align with 10.0.x, 9.0.x and 8.5.x
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
commit 44884913253fa91015662d12724392030bd821ca
Author: Mark Thomas
AuthorDate: Mon Mar 29 14:17:22 2021 +0100
Align with 10.0.x, 9.0.x and 8.5.x
---
java/org/apache/catalina/core/NamingContextListener.java | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/catalina/core/NamingContextListener.java
b/java/org/apache/catalina/core/NamingContextListener.java
index 8616587..e7e99e5 100644
--- a/java/org/apache/catalina/core/NamingContextListener.java
+++ b/java/org/apache/catalina/core/NamingContextListener.java
@@ -1120,7 +1120,7 @@ public class NamingContextListener
try {
envCtx.unbind(name);
} catch (NamingException e) {
-log.error(sm.getString("naming.unbindFailed", e));
+log.error(sm.getString("naming.unbindFailed", name), e);
}
}
@@ -1136,7 +1136,7 @@ public class NamingContextListener
try {
envCtx.unbind(name);
} catch (NamingException e) {
-log.error(sm.getString("naming.unbindFailed", e));
+log.error(sm.getString("naming.unbindFailed", name), e);
}
}
@@ -1152,7 +1152,7 @@ public class NamingContextListener
try {
envCtx.unbind(name);
} catch (NamingException e) {
-log.error(sm.getString("naming.unbindFailed", e));
+log.error(sm.getString("naming.unbindFailed", name), e);
}
}
@@ -1169,7 +1169,7 @@ public class NamingContextListener
try {
envCtx.unbind(name);
} catch (NamingException e) {
-log.error(sm.getString("naming.unbindFailed", e));
+log.error(sm.getString("naming.unbindFailed", name), e);
}
}
@@ -1185,7 +1185,7 @@ public class NamingContextListener
try {
envCtx.unbind(name);
} catch (NamingException e) {
-log.error(sm.getString("naming.unbindFailed", e));
+log.error(sm.getString("naming.unbindFailed", name), e);
}
}
@@ -1201,7 +1201,7 @@ public class NamingContextListener
try {
envCtx.unbind(name);
} catch (NamingException e) {
-log.error(sm.getString("naming.unbindFailed", e));
+log.error(sm.getString("naming.unbindFailed", name), e);
}
ObjectName on = objectNames.get(name);
@@ -1224,7 +1224,7 @@ public class NamingContextListener
try {
envCtx.unbind(name);
} catch (NamingException e) {
-log.error(sm.getString("naming.unbindFailed", e));
+log.error(sm.getString("naming.unbindFailed", name), e);
}
}
@@ -1240,7 +1240,7 @@ public class NamingContextListener
try {
envCtx.unbind(name);
} catch (NamingException e) {
-log.error(sm.getString("naming.unbindFailed", e));
+log.error(sm.getString("naming.unbindFailed", name), e);
}
ResourceLinkFactory.deregisterGlobalResourceAccess(getGlobalNamingContext(),
name);
-
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 (f2b1280 -> 4488491)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from f2b1280 No functional change. Align 10.0.x, 9.0.x and 8.5.x new bfffb59 No functional change. Align 10.0.x, 9.0.x, 8.5.x. new 4488491 Align with 10.0.x, 9.0.x and 8.5.x The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: java/org/apache/catalina/core/LocalStrings.properties| 1 + java/org/apache/catalina/core/LocalStrings_fr.properties | 1 + java/org/apache/catalina/core/LocalStrings_ja.properties | 1 + java/org/apache/catalina/core/LocalStrings_ko.properties | 1 + .../apache/catalina/core/LocalStrings_zh_CN.properties | 1 + java/org/apache/catalina/core/NamingContextListener.java | 16 java/org/apache/catalina/core/StandardEngine.java| 5 +++-- 7 files changed, 16 insertions(+), 10 deletions(-) - 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: No functional change. Align 10.0.x, 9.0.x and 8.5.x
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 f2b1280 No functional change. Align 10.0.x, 9.0.x and 8.5.x
f2b1280 is described below
commit f2b1280ca1a31aa96353c8646da8dae72f52c47f
Author: Mark Thomas
AuthorDate: Mon Mar 29 14:02:15 2021 +0100
No functional change. Align 10.0.x, 9.0.x and 8.5.x
---
java/org/apache/catalina/Globals.java | 1 -
java/org/apache/catalina/Loader.java | 8
java/org/apache/catalina/TomcatPrincipal.java | 1 -
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/Globals.java
b/java/org/apache/catalina/Globals.java
index 52a9f96..f1d2815 100644
--- a/java/org/apache/catalina/Globals.java
+++ b/java/org/apache/catalina/Globals.java
@@ -95,7 +95,6 @@ public final class Globals {
/**
- * The subject under which the AccessControlContext is running.
* The request attribute that is set to the value of {@code Boolean.TRUE}
* by the RemoteIpFilter, RemoteIpValve (and other similar components)
that identifies
* a request which been forwarded via one or more proxies.
diff --git a/java/org/apache/catalina/Loader.java
b/java/org/apache/catalina/Loader.java
index dfe2461..b14deb5 100644
--- a/java/org/apache/catalina/Loader.java
+++ b/java/org/apache/catalina/Loader.java
@@ -96,7 +96,11 @@ public interface Loader {
/**
* @return the reloadable flag for this Loader.
+ *
+ * @deprecated Use {@link Context#getReloadable()}. This method will be
+ * removed in Tomcat 10.
*/
+@Deprecated
public boolean getReloadable();
@@ -104,7 +108,11 @@ public interface Loader {
* Set the reloadable flag for this Loader.
*
* @param reloadable The new reloadable flag
+ *
+ * @deprecated Use {@link Context#setReloadable(boolean)}. This method will
+ * be removed in Tomcat 10.
*/
+@Deprecated
public void setReloadable(boolean reloadable);
diff --git a/java/org/apache/catalina/TomcatPrincipal.java
b/java/org/apache/catalina/TomcatPrincipal.java
index 4d5dad6..6a5ffae 100644
--- a/java/org/apache/catalina/TomcatPrincipal.java
+++ b/java/org/apache/catalina/TomcatPrincipal.java
@@ -44,7 +44,6 @@ public interface TomcatPrincipal extends Principal {
* to allow for future expansion of this method to cover
* other logout mechanisms that might throw a different
* exception to LoginContext
- *
*/
void logout() throws Exception;
}
-
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: No functional change. Align 10.0.x, 9.0.x and 8.5.x
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 1c2cc82 No functional change. Align 10.0.x, 9.0.x and 8.5.x
1c2cc82 is described below
commit 1c2cc82038f6440df5c58685a5cd885c6874e3ba
Author: Mark Thomas
AuthorDate: Mon Mar 29 14:01:35 2021 +0100
No functional change. Align 10.0.x, 9.0.x and 8.5.x
---
java/org/apache/catalina/Globals.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/java/org/apache/catalina/Globals.java
b/java/org/apache/catalina/Globals.java
index 52a9f96..f1d2815 100644
--- a/java/org/apache/catalina/Globals.java
+++ b/java/org/apache/catalina/Globals.java
@@ -95,7 +95,6 @@ public final class Globals {
/**
- * The subject under which the AccessControlContext is running.
* The request attribute that is set to the value of {@code Boolean.TRUE}
* by the RemoteIpFilter, RemoteIpValve (and other similar components)
that identifies
* a request which been forwarded via one or more proxies.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: No functional change. Align 10.0.x, 9.0.x and 8.5.x
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 769d093 No functional change. Align 10.0.x, 9.0.x and 8.5.x
769d093 is described below
commit 769d0930b477d94edd19f051506c3b7d4f5c4ebf
Author: Mark Thomas
AuthorDate: Mon Mar 29 14:01:23 2021 +0100
No functional change. Align 10.0.x, 9.0.x and 8.5.x
---
java/org/apache/catalina/Context.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/java/org/apache/catalina/Context.java
b/java/org/apache/catalina/Context.java
index ad40de5..030c135 100644
--- a/java/org/apache/catalina/Context.java
+++ b/java/org/apache/catalina/Context.java
@@ -86,7 +86,6 @@ public interface Context extends Container, ContextBind {
// - Properties
-
/**
* Returns true if requests mapped to servlets without
* "multipart config" to parse multipart/form-data requests anyway.
-
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: No functional change. Refactor Contained. Align 10.0.x, 9.0.x & 8.5.x
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 54f1fcb No functional change. Refactor Contained. Align 10.0.x, 9.0.x
& 8.5.x
54f1fcb is described below
commit 54f1fcba9fe53885163ef81606c0365ff5611789
Author: Mark Thomas
AuthorDate: Mon Mar 29 13:54:19 2021 +0100
No functional change. Refactor Contained. Align 10.0.x, 9.0.x & 8.5.x
---
java/org/apache/catalina/Cluster.java | 23 ++
java/org/apache/catalina/Pipeline.java | 16 +--
java/org/apache/catalina/Realm.java| 22 ++---
.../org/apache/catalina/core/StandardPipeline.java | 3 +--
4 files changed, 6 insertions(+), 58 deletions(-)
diff --git a/java/org/apache/catalina/Cluster.java
b/java/org/apache/catalina/Cluster.java
index 1ae57e1..e76f1dd 100644
--- a/java/org/apache/catalina/Cluster.java
+++ b/java/org/apache/catalina/Cluster.java
@@ -28,9 +28,7 @@ package org.apache.catalina;
* @author Bip Thelin
* @author Remy Maucherat
*/
-public interface Cluster {
-
-// - Properties
+public interface Cluster extends Contained {
/**
* Return the name of the cluster that this Server is currently
@@ -49,22 +47,6 @@ public interface Cluster {
*/
public void setClusterName(String clusterName);
-/**
- * Set the Container associated with our Cluster
- *
- * @param container The Container to use
- */
-public void setContainer(Container container);
-
-/**
- * Get the Container associated with our Cluster
- *
- * @return The Container associated with our Cluster
- */
-public Container getContainer();
-
-
-// - Public Methods
/**
* Create a new manager which will use this cluster to replicate its
@@ -86,14 +68,13 @@ public interface Cluster {
*/
public void registerManager(Manager manager);
+
/**
* Removes a manager from the cluster
* @param manager Manager
*/
public void removeManager(Manager manager);
-// - Cluster Wide
Deployments
-
/**
* Execute a periodic task, such as reloading, etc. This method will be
diff --git a/java/org/apache/catalina/Pipeline.java
b/java/org/apache/catalina/Pipeline.java
index a9c8ebe..58d2670 100644
--- a/java/org/apache/catalina/Pipeline.java
+++ b/java/org/apache/catalina/Pipeline.java
@@ -36,7 +36,7 @@ import java.util.Set;
* @author Craig R. McClanahan
* @author Peter Donald
*/
-public interface Pipeline {
+public interface Pipeline extends Contained {
/**
* @return the Valve instance that has been distinguished as the basic
@@ -124,20 +124,6 @@ public interface Pipeline {
/**
- * @return the Container with which this Pipeline is associated.
- */
-public Container getContainer();
-
-
-/**
- * Set the Container with which this Pipeline is associated.
- *
- * @param container The new associated container
- */
-public void setContainer(Container container);
-
-
-/**
* Identifies the Valves, if any, in this Pipeline that do not support
* async.
*
diff --git a/java/org/apache/catalina/Realm.java
b/java/org/apache/catalina/Realm.java
index cfe69c4..17ed927 100644
--- a/java/org/apache/catalina/Realm.java
+++ b/java/org/apache/catalina/Realm.java
@@ -35,30 +35,14 @@ import org.ietf.jgss.GSSContext;
*
* @author Craig R. McClanahan
*/
-public interface Realm {
-
-
-// - Properties
-
-/**
- * @return the Container with which this Realm has been associated.
- */
-public Container getContainer();
-
-
-/**
- * Set the Container with which this Realm has been associated.
- *
- * @param container The associated Container
- */
-public void setContainer(Container container);
-
+public interface Realm extends Contained {
/**
* @return the CredentialHandler configured for this Realm.
*/
public CredentialHandler getCredentialHandler();
+
/**
* Set the CredentialHandler to be used by this Realm.
*
@@ -67,8 +51,6 @@ public interface Realm {
public void setCredentialHandler(CredentialHandler credentialHandler);
-// - Public Methods
-
/**
* Add a property change listener to this component.
*
diff --git a/java/org/apache/catalina/core/StandardPipeline.java
b/java/org/apache/catalina/core/StandardPipeline.java
index 9394b1c..dadd49b 100644
--- a/java/org/apache/catalina/core/StandardPipeline.java
+++
svn commit: r46786 - /dev/tomcat/tomcat-connectors/native/1.2.27/ /release/tomcat/tomcat-connectors/native/1.2.27/
Author: markt Date: Mon Mar 29 12:47:05 2021 New Revision: 46786 Log: Release Apache Tomcat Native 1.2.27 Added: release/tomcat/tomcat-connectors/native/1.2.27/ - copied from r46785, dev/tomcat/tomcat-connectors/native/1.2.27/ Removed: dev/tomcat/tomcat-connectors/native/1.2.27/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE][RESULT] Release Apache Tomcat Native 1.2.27
The following votes were cast: Binding: +1: markt, remm, isapir No other votes were cast. The vote therefore passes. Thanks to everyone who contributed towards this release. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 65208] New: Multi-threaded loading of servlets
https://bz.apache.org/bugzilla/show_bug.cgi?id=65208 Bug ID: 65208 Summary: Multi-threaded loading of servlets Product: Tomcat 9 Version: 9.0.40 Hardware: PC OS: Linux Status: NEW Severity: enhancement Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: andreas.bergan...@gmail.com Target Milestone: - Created attachment 37788 --> https://bz.apache.org/bugzilla/attachment.cgi?id=37788=edit Implementation of a context which loads servlets in parallel I'm not sure if this is something that you would like to add to Tomcat, but for us it made a huge difference on the startup time to have the servlets load using multiple threads instead of single threaded. We have a lot of dynamic jsp files in our database (sort of a CMS system). So to avoid adding time on the first request to those files we register them as servlets using ServletContext.addJspFile(...) to pre-compile them. But since we have thousands of those it takes very long time to compile them using the single threaded approach currently implemented in Tomcat. Our server has many cores that is just idling during this time, so I wanted to put them in use. What I did was I override the loadOnStartup method in StandardContext and added the possibility to use Tomcat's executor service to parallelize the loading of servlets. I don't think this breaks any rules, since the JSP spec says "The container may choose the order of loading of servlets with the same load-on-startup value". So I thought I would share the code (see attached file) and some benchmarks with you so that you can decide if this is something for you or not. Development environment, compiling 200 jsp files: Single threaded: 70 seconds Using 8 CPU cores: 30 seconds Production environment, compiling 12.000 jsp files: Single threaded: 17 minutes Using 96 CPU cores: 4 minutes -- You are receiving this mail because: You are the assignee for the bug. - 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: No functional change. Align 10.0.x, 9.0.x and 8.5.x
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 a532333 No functional change. Align 10.0.x, 9.0.x and 8.5.x
a532333 is described below
commit a5323332f45630d41996f20574529392f690f3e4
Author: Mark Thomas
AuthorDate: Mon Mar 29 10:45:14 2021 +0100
No functional change. Align 10.0.x, 9.0.x and 8.5.x
---
.../apache/catalina/core/LocalStrings.properties | 3 +++
.../catalina/core/LocalStrings_fr.properties | 3 +++
.../catalina/core/LocalStrings_ja.properties | 3 +++
.../catalina/core/LocalStrings_ko.properties | 3 +++
.../catalina/core/LocalStrings_zh_CN.properties| 3 +++
.../catalina/core/StandardThreadExecutor.java | 22 --
6 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index bf9f5ee..e4a9874 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -258,6 +258,9 @@ standardService.mapperListener.stopFailed=Failed to stop
associated MapperListen
standardService.start.name=Starting service [{0}]
standardService.stop.name=Stopping service [{0}]
+standardThreadExecutor.notStarted=The executor has not been started
+standardThreadExecutor.queueFull=The executor's work queue is full
+
standardWrapper.allocate=Error allocating a servlet instance
standardWrapper.allocateException=Allocate exception for servlet [{0}]
standardWrapper.deallocateException=Deallocate exception for servlet [{0}]
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 0a96a71..71395c8 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -252,6 +252,9 @@ standardService.mapperListener.stopFailed=Impossible
d'arrêter le MapperListene
standardService.start.name=Démarrage du service [{0}]
standardService.stop.name=Arrêt du service [{0}]
+standardThreadExecutor.notStarted=L'exécuteur n'a pas encore été démarré
+standardThreadExecutor.queueFull=La file de travail de l'exécuteur est pleine
+
standardWrapper.allocate=Erreur d'allocation à une instance de servlet
standardWrapper.allocateException=Exception lors de l''allocation pour la
servlet [{0}]
standardWrapper.deallocateException=Exception à la désallocation pour la
servlet [{0}]
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 9989f7b..6ed2c6b 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -252,6 +252,9 @@
standardService.mapperListener.stopFailed=関連付けられたMapperListenerの
standardService.start.name=サービス [{0}] を起動します
standardService.stop.name=サービス [{0}] を停止します
+standardThreadExecutor.notStarted=エグゼキュターは開始ししていません。
+standardThreadExecutor.queueFull=エグゼキュターの作業キューは満杯です。
+
standardWrapper.allocate=サーブレットインスタンスを割り当て中のエラーです
standardWrapper.allocateException=サーブレット [{0}] に例外を割り当てます
standardWrapper.deallocateException=サーブレット [{0}] に対する例外の割り当てを解除します
diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties
b/java/org/apache/catalina/core/LocalStrings_ko.properties
index 209effd..942f4b4 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -252,6 +252,9 @@ standardService.mapperListener.stopFailed=연관된
MapperListener를 중지시
standardService.start.name=서비스 [{0}]을(를) 시작합니다.
standardService.stop.name=서비스 [{0}]을(를) 중지시킵니다.
+standardThreadExecutor.notStarted=Executor가 아직 시작되지 않았습니다.
+standardThreadExecutor.queueFull=해당 Executor의 작업 큐가 꽉 찼습니다.
+
standardWrapper.allocate=서블릿 인스턴스를 할당하는 중 오류 발생
standardWrapper.allocateException=서블릿 [{0}]을(를) 위해 할당하던 중 예외 발생
standardWrapper.deallocateException=서블릿 [{0}]을(를) 위한 할당 해제 처리 중 예외 발생
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index 6b3ae82..b9d3c66 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -252,6 +252,9 @@
standardService.mapperListener.stopFailed=无法停止关联的MapperListener
standardService.start.name=正在启动服务[{0}]
standardService.stop.name=正在停止服务[{0}]
+standardThreadExecutor.notStarted=执行器尚未启动
+standardThreadExecutor.queueFull=执行者的工作队列已满
+
standardWrapper.allocate=分配一个servlet实例错误
standardWrapper.allocateException=分配异常的servlet [{0}]
standardWrapper.deallocateException=servlet[{0}]的解除分配异常
diff --git a/java/org/apache/catalina/core/StandardThreadExecutor.java
[tomcat] branch master updated: No funtional change. Align 10.0.x, 9.0.x and 8.5.x
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 6844ff1 No funtional change. Align 10.0.x, 9.0.x and 8.5.x
6844ff1 is described below
commit 6844ff1c8a37835ac5497c1f2916c1fa52399f43
Author: Mark Thomas
AuthorDate: Mon Mar 29 10:20:33 2021 +0100
No funtional change. Align 10.0.x, 9.0.x and 8.5.x
---
java/org/apache/catalina/core/StandardService.java | 2 --
1 file changed, 2 deletions(-)
diff --git a/java/org/apache/catalina/core/StandardService.java
b/java/org/apache/catalina/core/StandardService.java
index 5597cb0..17ae30b 100644
--- a/java/org/apache/catalina/core/StandardService.java
+++ b/java/org/apache/catalina/core/StandardService.java
@@ -217,7 +217,6 @@ public class StandardService extends LifecycleMBeanBase
implements Service {
// - Public Methods
-
/**
* Add a new Connector to the set of defined Connectors, and associate it
* with this Service's Container.
@@ -524,7 +523,6 @@ public class StandardService extends LifecycleMBeanBase
implements Service {
executor.stop();
}
}
-
}
-
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: No functional change. Align 10.0.x, 9.0.x and 8.5.x
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 2c7deb9 No functional change. Align 10.0.x, 9.0.x and 8.5.x
2c7deb9 is described below
commit 2c7deb91f72f2728bedee238bc08b9e67da70f61
Author: Mark Thomas
AuthorDate: Mon Mar 29 10:21:56 2021 +0100
No functional change. Align 10.0.x, 9.0.x and 8.5.x
---
java/org/apache/catalina/core/LocalStrings.properties | 3 +++
java/org/apache/catalina/core/LocalStrings_fr.properties| 3 +++
java/org/apache/catalina/core/LocalStrings_ja.properties| 3 +++
java/org/apache/catalina/core/LocalStrings_ko.properties| 3 +++
java/org/apache/catalina/core/LocalStrings_ru.properties| 1 +
java/org/apache/catalina/core/LocalStrings_zh_CN.properties | 3 +++
java/org/apache/catalina/core/StandardService.java | 6 +++---
java/org/apache/catalina/core/StandardWrapper.java | 9 -
java/org/apache/catalina/core/StandardWrapperValve.java | 2 ++
9 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index 6c294cf..bf9f5ee 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -251,6 +251,8 @@ standardService.connector.startFailed=Failed to start
connector [{0}]
standardService.connector.stopFailed=Failed to stop connector [{0}]
standardService.engine.startFailed=Failed to start associated Engine
standardService.engine.stopFailed=Failed to stop associated Engine
+standardService.executor.start=Error starting new executor
+standardService.executor.stop=Error stopping old executor
standardService.mapperListener.startFailed=Failed to start associated
MapperListener
standardService.mapperListener.stopFailed=Failed to stop associated
MapperListener
standardService.start.name=Starting service [{0}]
@@ -264,6 +266,7 @@ standardWrapper.destroyInstance=InstanceManager.destroy()
for servlet [{0}] thre
standardWrapper.initException=Servlet.init() for servlet [{0}] threw exception
standardWrapper.instantiate=Error instantiating servlet class [{0}]
standardWrapper.isUnavailable=Servlet [{0}] is currently unavailable
+standardWrapper.jspMonitorError=Error registering JSP monitor Mbean [{0}]
standardWrapper.notChild=Wrapper container may not have child containers
standardWrapper.notClass=No servlet class has been specified for servlet [{0}]
standardWrapper.notContext=Parent container of a Wrapper must be a Context
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 55c45dc..0a96a71 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -245,6 +245,8 @@ standardServer.storeConfig.notAvailable=Aucune
implémentation de StoreConfig n'
standardService.engine.startFailed=Impossible de démarrer l'Engine associé
standardService.engine.stopFailed=Echec de l'arrêt du moteur associé
+standardService.executor.start=Erreur lors du démarrage du nouvel exécuteur
+standardService.executor.stop=Erreur lors de l'arrêt de l'ancien exécuteur
standardService.mapperListener.startFailed=Impossible de démarrer le
MapperListener associé
standardService.mapperListener.stopFailed=Impossible d'arrêter le
MapperListener associé
standardService.start.name=Démarrage du service [{0}]
@@ -258,6 +260,7 @@ standardWrapper.destroyInstance=InstanceManager.destroy()
pour le Servlet [{0}]
standardWrapper.initException="Servlet.init()" pour la servlet [{0}] a généré
une exception
standardWrapper.instantiate=Erreur à l''instantiation de la classe servlet
[{0}]
standardWrapper.isUnavailable=La servlet [{0}] est actuellement indisponible
+standardWrapper.jspMonitorError=Erreur de l'enregistrement du Mbean du
moniteur de JSP
standardWrapper.notChild=L'enrobeur de conteneur (wrapper container) ne peut
pas avoir de conteneurs fils
standardWrapper.notClass=Aucune classe servlet n''a été spécifiée pour la
servlet [{0}]
standardWrapper.notContext=Le conteneur parent d'un enrobeur (wrapper) doit
être un contexte
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 0d4846d..9989f7b 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -245,6 +245,8 @@
standardServer.storeConfig.notAvailable=StoreConfig実装は[{0}]という名前
standardService.engine.startFailed=関連付けられたEngineの起動に失敗しました
standardService.engine.stopFailed=関連付けられたEngineの停止に失敗しました。
+standardService.executor.start=新しいエグゼキュターを開始できません。
+standardService.executor.stop=古いエグゼキュターの停止中のエラー
[tomcat] branch 9.0.x updated: No funtional change. Align 10.0.x, 9.0.x and 8.5.x
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 baf42cd No funtional change. Align 10.0.x, 9.0.x and 8.5.x
baf42cd is described below
commit baf42cd2eeb90d75b1010db5b6ea9ed945519a4f
Author: Mark Thomas
AuthorDate: Mon Mar 29 10:21:17 2021 +0100
No funtional change. Align 10.0.x, 9.0.x and 8.5.x
---
java/org/apache/catalina/core/StandardService.java | 2 --
1 file changed, 2 deletions(-)
diff --git a/java/org/apache/catalina/core/StandardService.java
b/java/org/apache/catalina/core/StandardService.java
index 5597cb0..17ae30b 100644
--- a/java/org/apache/catalina/core/StandardService.java
+++ b/java/org/apache/catalina/core/StandardService.java
@@ -217,7 +217,6 @@ public class StandardService extends LifecycleMBeanBase
implements Service {
// - Public Methods
-
/**
* Add a new Connector to the set of defined Connectors, and associate it
* with this Service's Container.
@@ -524,7 +523,6 @@ public class StandardService extends LifecycleMBeanBase
implements Service {
executor.stop();
}
}
-
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 65204] LinkageError AuthConfigFactoryImpl
https://bz.apache.org/bugzilla/show_bug.cgi?id=65204 --- Comment #10 from Lukas Vasek --- Hello, submitted also issue to jmockit https://github.com/jmockit/jmockit1/issues/707 -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [Bug 65207] New: Eyeglasses Missouri City | Eyeglass Repair Missouri City | Eyeglass in 1 Hour
Am 28.03.21 um 21:52 schrieb bugzi...@apache.org: > https://bz.apache.org/bugzilla/show_bug.cgi?id=65207 Deleted the issue and blocked the reporter as spammer. Felix - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
