(tomcat) branch 10.1.x updated: Adding nonstandard support for c:set and c:remove
This is an automated email from the ASF dual-hosted git repository.
jengebr pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 9192fc8a84 Adding nonstandard support for c:set and c:remove
9192fc8a84 is described below
commit 9192fc8a849f425444f8dacd3d12595fd566f5d7
Author: John Engebretson
AuthorDate: Tue Apr 22 19:51:01 2025 +
Adding nonstandard support for c:set and c:remove
---
java/org/apache/jasper/EmbeddedServletOptions.java | 12 ++
java/org/apache/jasper/JspC.java | 16 ++
java/org/apache/jasper/Options.java| 8 +
java/org/apache/jasper/compiler/Generator.java | 227 +
.../apache/jasper/runtime/JspRuntimeLibrary.java | 27 +++
test/jakarta/servlet/jsp/TesterPageContext.java| 12 +-
.../jsp/TesterPageContextWithAttributes.java | 126
test/org/apache/jasper/compiler/TestGenerator.java | 86
.../compiler/TestNonstandardTagPerformance.java| 148 ++
.../jasper/runtime/TestJspRuntimeLibrary.java | 37
test/webapp/WEB-INF/web.xml| 28 +++
.../webapp/jsp/generator/nonstandard/remove-01.jsp | 26 +++
.../webapp/jsp/generator/nonstandard/remove-02.jsp | 26 +++
.../webapp/jsp/generator/nonstandard/remove-03.jsp | 26 +++
.../webapp/jsp/generator/nonstandard/remove-04.jsp | 26 +++
.../webapp/jsp/generator/nonstandard/remove-05.jsp | 26 +++
test/webapp/jsp/generator/nonstandard/set-01.jsp | 22 ++
test/webapp/jsp/generator/nonstandard/set-02.jsp | 22 ++
test/webapp/jsp/generator/nonstandard/set-03.jsp | 22 ++
test/webapp/jsp/generator/nonstandard/set-04.jsp | 22 ++
test/webapp/jsp/generator/nonstandard/set-05.jsp | 22 ++
webapps/docs/changelog.xml | 5 +
22 files changed, 970 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/jasper/EmbeddedServletOptions.java
b/java/org/apache/jasper/EmbeddedServletOptions.java
index 49ec95b63e..e9d212e89d 100644
--- a/java/org/apache/jasper/EmbeddedServletOptions.java
+++ b/java/org/apache/jasper/EmbeddedServletOptions.java
@@ -223,6 +223,8 @@ public final class EmbeddedServletOptions implements
Options {
private boolean useInstanceManagerForTags = false;
+private String useNonstandardTagOptimizations;
+
public String getProperty(String name) {
return settings.getProperty(name);
}
@@ -470,6 +472,11 @@ public final class EmbeddedServletOptions implements
Options {
return useInstanceManagerForTags;
}
+@Override
+public String getUseNonstandardTagOptimizations() {
+return useNonstandardTagOptimizations;
+}
+
/**
* Create an EmbeddedServletOptions object using data available from
ServletConfig and ServletContext.
*
@@ -652,6 +659,11 @@ public final class EmbeddedServletOptions implements
Options {
this.classpath = classpath;
}
+String useNonstandardTagOptimizations =
config.getInitParameter("useNonstandardTagOptimizations");
+if (useNonstandardTagOptimizations != null) {
+this.useNonstandardTagOptimizations =
useNonstandardTagOptimizations;
+}
+
/*
* scratchdir
*/
diff --git a/java/org/apache/jasper/JspC.java b/java/org/apache/jasper/JspC.java
index 8417538557..2bbde73f59 100644
--- a/java/org/apache/jasper/JspC.java
+++ b/java/org/apache/jasper/JspC.java
@@ -268,6 +268,8 @@ public class JspC extends Task implements Options {
protected boolean fullstop = false;
protected String[] args;
+protected String useNonstandardTagOptimizations;
+
public static void main(String[] arg) {
if (arg.length == 0) {
System.out.println(Localizer.getMessage("jspc.usage"));
@@ -995,6 +997,15 @@ public class JspC extends Task implements Options {
failOnError = b;
}
+/**
+ * Sets the set of custom tags to use nonstandard optimizations.
+ *
+ * @param useNonstandardTagOptimizations which tags to override
+ */
+public void setUseNonstandardTagOptimizations(String
useNonstandardTagOptimizations) {
+this.useNonstandardTagOptimizations = useNonstandardTagOptimizations;
+}
+
/**
* @return true if an exception will be thrown in case of a
compilation error.
*/
@@ -1722,6 +1733,11 @@ public class JspC extends Task implements Options {
}
}
+@Override
+public String getUseNonstandardTagOptimizations() {
+return useNonstandardTagOptimizations;
+}
+
private class ProcessFile implements Callable {
private final String file;
diff --git a/java/org/apache/jasper/Options.java
b/java/org/apache/jasper/Options.java
index 721a66ce88..b0802f8e1c 100644
--- a/java/org/apache/jasper/Options.java
+++ b/java/org/apache
(tomcat) branch 11.0.x updated: Adding nonstandard support for c:set and c:remove
This is an automated email from the ASF dual-hosted git repository.
jengebr pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 67df11e33d Adding nonstandard support for c:set and c:remove
67df11e33d is described below
commit 67df11e33d6d51953415fe07587964327fce5137
Author: John Engebretson
AuthorDate: Tue Apr 22 19:51:01 2025 +
Adding nonstandard support for c:set and c:remove
---
java/org/apache/jasper/EmbeddedServletOptions.java | 12 ++
java/org/apache/jasper/JspC.java | 16 ++
java/org/apache/jasper/Options.java| 8 +
java/org/apache/jasper/compiler/Generator.java | 227 +
.../apache/jasper/runtime/JspRuntimeLibrary.java | 27 +++
test/jakarta/servlet/jsp/TesterPageContext.java| 12 +-
.../jsp/TesterPageContextWithAttributes.java | 121 +++
test/org/apache/jasper/compiler/TestGenerator.java | 86
.../compiler/TestNonstandardTagPerformance.java| 148 ++
.../jasper/runtime/TestJspRuntimeLibrary.java | 37
test/webapp/WEB-INF/web.xml| 28 +++
.../webapp/jsp/generator/nonstandard/remove-01.jsp | 26 +++
.../webapp/jsp/generator/nonstandard/remove-02.jsp | 26 +++
.../webapp/jsp/generator/nonstandard/remove-03.jsp | 26 +++
.../webapp/jsp/generator/nonstandard/remove-04.jsp | 26 +++
.../webapp/jsp/generator/nonstandard/remove-05.jsp | 26 +++
test/webapp/jsp/generator/nonstandard/set-01.jsp | 22 ++
test/webapp/jsp/generator/nonstandard/set-02.jsp | 22 ++
test/webapp/jsp/generator/nonstandard/set-03.jsp | 22 ++
test/webapp/jsp/generator/nonstandard/set-04.jsp | 22 ++
test/webapp/jsp/generator/nonstandard/set-05.jsp | 22 ++
webapps/docs/changelog.xml | 5 +
22 files changed, 965 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/jasper/EmbeddedServletOptions.java
b/java/org/apache/jasper/EmbeddedServletOptions.java
index 16852f93d4..42ff0a98f4 100644
--- a/java/org/apache/jasper/EmbeddedServletOptions.java
+++ b/java/org/apache/jasper/EmbeddedServletOptions.java
@@ -223,6 +223,8 @@ public final class EmbeddedServletOptions implements
Options {
private boolean useInstanceManagerForTags = false;
+private String useNonstandardTagOptimizations;
+
public String getProperty(String name) {
return settings.getProperty(name);
}
@@ -470,6 +472,11 @@ public final class EmbeddedServletOptions implements
Options {
return useInstanceManagerForTags;
}
+@Override
+public String getUseNonstandardTagOptimizations() {
+return useNonstandardTagOptimizations;
+}
+
/**
* Create an EmbeddedServletOptions object using data available from
ServletConfig and ServletContext.
*
@@ -652,6 +659,11 @@ public final class EmbeddedServletOptions implements
Options {
this.classpath = classpath;
}
+String useNonstandardTagOptimizations =
config.getInitParameter("useNonstandardTagOptimizations");
+if (useNonstandardTagOptimizations != null) {
+this.useNonstandardTagOptimizations =
useNonstandardTagOptimizations;
+}
+
/*
* scratchdir
*/
diff --git a/java/org/apache/jasper/JspC.java b/java/org/apache/jasper/JspC.java
index 5102349509..9a7be63e89 100644
--- a/java/org/apache/jasper/JspC.java
+++ b/java/org/apache/jasper/JspC.java
@@ -268,6 +268,8 @@ public class JspC extends Task implements Options {
protected boolean fullstop = false;
protected String[] args;
+protected String useNonstandardTagOptimizations;
+
public static void main(String[] arg) {
if (arg.length == 0) {
System.out.println(Localizer.getMessage("jspc.usage"));
@@ -995,6 +997,15 @@ public class JspC extends Task implements Options {
failOnError = b;
}
+/**
+ * Sets the set of custom tags to use nonstandard optimizations.
+ *
+ * @param useNonstandardTagOptimizations which tags to override
+ */
+public void setUseNonstandardTagOptimizations(String
useNonstandardTagOptimizations) {
+this.useNonstandardTagOptimizations = useNonstandardTagOptimizations;
+}
+
/**
* @return true if an exception will be thrown in case of a
compilation error.
*/
@@ -1722,6 +1733,11 @@ public class JspC extends Task implements Options {
}
}
+@Override
+public String getUseNonstandardTagOptimizations() {
+return useNonstandardTagOptimizations;
+}
+
private class ProcessFile implements Callable {
private final String file;
diff --git a/java/org/apache/jasper/Options.java
b/java/org/apache/jasper/Options.java
index 721a66ce88..b0802f8e1c 100644
--- a/java/org/apache/jasper/Options.java
+++ b/java/org/apache
(tomcat) branch main updated (490c5871d6 -> 5ca117b919)
This is an automated email from the ASF dual-hosted git repository.
jengebr pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 490c5871d6 Fix off by one validation logic for partial PUT ranges
add c288103193 Adding nonstandard support for c:set and c:remove
new 5ca117b919 Merge pull request #842 from jengebr/nonstandard_tags
The 1 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/jasper/EmbeddedServletOptions.java | 12 ++
java/org/apache/jasper/JspC.java | 19 ++
java/org/apache/jasper/Options.java| 8 +
java/org/apache/jasper/compiler/Generator.java | 227 +
.../apache/jasper/runtime/JspRuntimeLibrary.java | 27 +++
test/jakarta/servlet/jsp/TesterPageContext.java| 12 +-
.../jsp/TesterPageContextWithAttributes.java | 121 +++
test/org/apache/jasper/compiler/TestGenerator.java | 86
.../compiler/TestNonstandardTagPerformance.java| 156 ++
.../jasper/runtime/TestJspRuntimeLibrary.java | 37 +++-
test/webapp/WEB-INF/web.xml| 28 +++
.../generator/nonstandard/remove-01.jsp} | 26 +--
.../generator/nonstandard/remove-02.jsp} | 26 +--
.../generator/nonstandard/remove-03.jsp} | 26 +--
.../generator/nonstandard/remove-04.jsp} | 26 +--
.../generator/nonstandard/remove-05.jsp} | 26 +--
.../generator/nonstandard/set-01.jsp} | 19 +-
.../generator/nonstandard/set-02.jsp} | 19 +-
.../generator/nonstandard/set-03.jsp} | 19 +-
.../generator/nonstandard/set-04.jsp} | 19 +-
.../generator/nonstandard/set-05.jsp} | 19 +-
webapps/docs/changelog.xml | 5 +
22 files changed, 815 insertions(+), 148 deletions(-)
create mode 100644
test/jakarta/servlet/jsp/TesterPageContextWithAttributes.java
create mode 100644
test/org/apache/jasper/compiler/TestNonstandardTagPerformance.java
copy test/webapp/{bug6/bug64872-byte.jsp =>
jsp/generator/nonstandard/remove-01.jsp} (57%)
copy test/webapp/{bug6/bug64872-byte.jsp =>
jsp/generator/nonstandard/remove-02.jsp} (57%)
copy test/webapp/{bug6/bug64872-byte.jsp =>
jsp/generator/nonstandard/remove-03.jsp} (57%)
copy test/webapp/{bug6/bug64872-byte.jsp =>
jsp/generator/nonstandard/remove-04.jsp} (57%)
copy test/webapp/{bug6/bug64872-byte.jsp =>
jsp/generator/nonstandard/remove-05.jsp} (58%)
copy test/webapp/{bug6/bug64872b-timeunit.jsp =>
jsp/generator/nonstandard/set-01.jsp} (70%)
copy test/webapp/{bug6/bug64872b-timeunit.jsp =>
jsp/generator/nonstandard/set-02.jsp} (69%)
copy test/webapp/{bug6/bug64872b-timeunit.jsp =>
jsp/generator/nonstandard/set-03.jsp} (69%)
copy test/webapp/{bug6/bug64872b-timeunit.jsp =>
jsp/generator/nonstandard/set-04.jsp} (69%)
copy test/webapp/{bug6/bug64872b-timeunit.jsp =>
jsp/generator/nonstandard/set-05.jsp} (68%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/01: Merge pull request #842 from jengebr/nonstandard_tags
This is an automated email from the ASF dual-hosted git repository. jengebr pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 5ca117b919515b4f8d810e458b898d35255c7da3 Merge: 490c5871d6 c288103193 Author: jengebr <73608737+jeng...@users.noreply.github.com> AuthorDate: Wed Apr 16 14:53:40 2025 -0500 Merge pull request #842 from jengebr/nonstandard_tags Adding nonstandard support for c:set and c:remove java/org/apache/jasper/EmbeddedServletOptions.java | 12 ++ java/org/apache/jasper/JspC.java | 19 ++ java/org/apache/jasper/Options.java| 8 + java/org/apache/jasper/compiler/Generator.java | 227 + .../apache/jasper/runtime/JspRuntimeLibrary.java | 27 +++ test/jakarta/servlet/jsp/TesterPageContext.java| 12 +- .../jsp/TesterPageContextWithAttributes.java | 121 +++ test/org/apache/jasper/compiler/TestGenerator.java | 86 .../compiler/TestNonstandardTagPerformance.java| 156 ++ .../jasper/runtime/TestJspRuntimeLibrary.java | 37 +++- test/webapp/WEB-INF/web.xml| 28 +++ .../webapp/jsp/generator/nonstandard/remove-01.jsp | 26 +++ .../webapp/jsp/generator/nonstandard/remove-02.jsp | 26 +++ .../webapp/jsp/generator/nonstandard/remove-03.jsp | 26 +++ .../webapp/jsp/generator/nonstandard/remove-04.jsp | 26 +++ .../webapp/jsp/generator/nonstandard/remove-05.jsp | 26 +++ test/webapp/jsp/generator/nonstandard/set-01.jsp | 22 ++ test/webapp/jsp/generator/nonstandard/set-02.jsp | 22 ++ test/webapp/jsp/generator/nonstandard/set-03.jsp | 22 ++ test/webapp/jsp/generator/nonstandard/set-04.jsp | 22 ++ test/webapp/jsp/generator/nonstandard/set-05.jsp | 22 ++ webapps/docs/changelog.xml | 5 + 22 files changed, 975 insertions(+), 3 deletions(-) diff --cc webapps/docs/changelog.xml index 653ef0f363,cb8ec31bd9..3cb02f44ca --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@@ -212,11 -198,12 +212,16 @@@ compilerTargetVM have been updated to 21 to align with Java 21 being the minimum Java version required for Tomcat 12. (markt) + + Add support for optimized execution of c:set and c:remove tags, when + activated via JSP servlet param useNonstandardTagOptimizations. + (jengebr) + + +69635: Add support to jakarta.el.ImportHandler +for resolving inner classes. (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: Adding nonstandard support for c:set and c:remove
This is an automated email from the ASF dual-hosted git repository.
jengebr 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 285b8215eb Adding nonstandard support for c:set and c:remove
285b8215eb is described below
commit 285b8215eb46e641bf8319c92b2aeb2574db38b9
Author: John Engebretson
AuthorDate: Fri Apr 18 13:28:19 2025 +
Adding nonstandard support for c:set and c:remove
---
java/org/apache/jasper/EmbeddedServletOptions.java | 12 ++
java/org/apache/jasper/JspC.java | 18 ++
java/org/apache/jasper/Options.java| 8 +
java/org/apache/jasper/compiler/Generator.java | 227 +
.../apache/jasper/runtime/JspRuntimeLibrary.java | 27 +++
test/javax/servlet/jsp/TesterPageContext.java | 12 +-
.../jsp/TesterPageContextWithAttributes.java | 126
test/org/apache/jasper/compiler/TestGenerator.java | 86
.../compiler/TestNonstandardTagPerformance.java| 162 +++
.../jasper/runtime/TestJspRuntimeLibrary.java | 37
test/webapp/WEB-INF/web.xml| 28 +++
.../webapp/jsp/generator/nonstandard/remove-01.jsp | 26 +++
.../webapp/jsp/generator/nonstandard/remove-02.jsp | 26 +++
.../webapp/jsp/generator/nonstandard/remove-03.jsp | 26 +++
.../webapp/jsp/generator/nonstandard/remove-04.jsp | 26 +++
.../webapp/jsp/generator/nonstandard/remove-05.jsp | 26 +++
test/webapp/jsp/generator/nonstandard/set-01.jsp | 22 ++
test/webapp/jsp/generator/nonstandard/set-02.jsp | 22 ++
test/webapp/jsp/generator/nonstandard/set-03.jsp | 22 ++
test/webapp/jsp/generator/nonstandard/set-04.jsp | 22 ++
test/webapp/jsp/generator/nonstandard/set-05.jsp | 22 ++
webapps/docs/changelog.xml | 5 +
22 files changed, 986 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/jasper/EmbeddedServletOptions.java
b/java/org/apache/jasper/EmbeddedServletOptions.java
index 650edcf2ee..f250941498 100644
--- a/java/org/apache/jasper/EmbeddedServletOptions.java
+++ b/java/org/apache/jasper/EmbeddedServletOptions.java
@@ -67,6 +67,8 @@ public final class EmbeddedServletOptions implements Options {
*/
private TrimSpacesOption trimSpaces = TrimSpacesOption.FALSE;
+private String useNonstandardTagOptimizations;
+
/**
* Determines whether tag handler pooling is enabled.
*/
@@ -233,6 +235,11 @@ public final class EmbeddedServletOptions implements
Options {
}
@Override
+public String getUseNonstandardTagOptimizations() {
+return useNonstandardTagOptimizations;
+}
+
+ @Override
public boolean isPoolingEnabled() {
return isPoolingEnabled;
}
@@ -578,6 +585,11 @@ public final class EmbeddedServletOptions implements
Options {
this.classpath = classpath;
}
+String useNonstandardTagOptimizations =
config.getInitParameter("useNonstandardTagOptimizations");
+if (useNonstandardTagOptimizations != null) {
+this.useNonstandardTagOptimizations =
useNonstandardTagOptimizations;
+}
+
/*
* scratchdir
*/
diff --git a/java/org/apache/jasper/JspC.java b/java/org/apache/jasper/JspC.java
index 877873b73a..df980cb499 100644
--- a/java/org/apache/jasper/JspC.java
+++ b/java/org/apache/jasper/JspC.java
@@ -140,6 +140,7 @@ public class JspC extends Task implements Options {
protected static final String SWITCH_QUOTE_ATTRIBUTE_EL =
"-quoteAttributeEL";
protected static final String SWITCH_NO_QUOTE_ATTRIBUTE_EL =
"-no-quoteAttributeEL";
protected static final String SWITCH_THREAD_COUNT = "-threadCount";
+protected static final String SWITCH_USENONSTANDARD_TAG_OPTIMIZATIONS =
"-useNonstandardTagOptimizations";
protected static final String SHOW_SUCCESS = "-s";
protected static final String LIST_ERRORS = "-l";
protected static final int INC_WEBXML = 10;
@@ -271,6 +272,7 @@ public class JspC extends Task implements Options {
protected int argPos;
protected boolean fullstop = false;
protected String[] args;
+protected String useNonstandardTagOptimizations;
public static void main(String[] arg) {
if (arg.length == 0) {
@@ -403,6 +405,8 @@ public class JspC extends Task implements Options {
setQuoteAttributeEL(false);
} else if (tok.equals(SWITCH_THREAD_COUNT)) {
setThreadCount(nextArg());
+} else if (tok.equals(SWITCH_USENONSTANDARD_TAG_OPTIMIZATIONS)) {
+setUseNonstandardTagOptimizations(nextArg());
} else {
if (tok.startsWith("-")) {
throw new
JasperException(Localizer.getMessage("jspc.error.unknownOpt
svn commit: r1924081 - /tomcat/site/trunk/xdocs/whoweare.xml
Author: jengebr Date: Thu Feb 27 14:43:53 2025 New Revision: 1924081 URL: http://svn.apache.org/viewvc?rev=1924081&view=rev Log: Add new committer - John Engebretson Modified: tomcat/site/trunk/xdocs/whoweare.xml Modified: tomcat/site/trunk/xdocs/whoweare.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whoweare.xml?rev=1924081&r1=1924080&r2=1924081&view=diff == --- tomcat/site/trunk/xdocs/whoweare.xml (original) +++ tomcat/site/trunk/xdocs/whoweare.xml Thu Feb 27 14:43:53 2025 @@ -162,6 +162,9 @@ A complete list of all the Apache Commit Huxing Zhang (huxing at apache.org) +John Engebretson (jengebr at apache.org) + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1924082 - /tomcat/site/trunk/docs/whoweare.html
Author: jengebr Date: Thu Feb 27 15:33:23 2025 New Revision: 1924082 URL: http://svn.apache.org/viewvc?rev=1924082&view=rev Log: Add new committer - John Engebretson Modified: tomcat/site/trunk/docs/whoweare.html Modified: tomcat/site/trunk/docs/whoweare.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whoweare.html?rev=1924082&r1=1924081&r2=1924082&view=diff == --- tomcat/site/trunk/docs/whoweare.html (original) +++ tomcat/site/trunk/docs/whoweare.html Thu Feb 27 15:33:23 2025 @@ -152,6 +152,9 @@ A complete list of all the Apache Commit Huxing Zhang (huxing at apache.org) +John Engebretson (jengebr at apache.org) + + Emeritus PMC members http://www.apache.org/foundation/glossary.html#Emeritus";> - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
