svn commit: r1889950 - in /tomcat/site/trunk: docs/tomcat-70-eol.html xdocs/tomcat-70-eol.xml
Author: markt Date: Mon May 17 10:16:17 2021 New Revision: 1889950 URL: http://svn.apache.org/viewvc?rev=1889950&view=rev Log: Fix typo Modified: tomcat/site/trunk/docs/tomcat-70-eol.html tomcat/site/trunk/xdocs/tomcat-70-eol.xml Modified: tomcat/site/trunk/docs/tomcat-70-eol.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-70-eol.html?rev=1889950&r1=1889949&r2=1889950&view=diff == --- tomcat/site/trunk/docs/tomcat-70-eol.html (original) +++ tomcat/site/trunk/docs/tomcat-70-eol.html Mon May 17 10:16:17 2021 @@ -26,7 +26,7 @@ will end on 31 March 2021. Note that all 7.0.x releases will always be available from the archive. It is anticipated that the final 7.0.x release will be made shortly -before 31 Match 2021. +before 31 March 2021. Copyright © 1999-2021, The Apache Software Foundation Modified: tomcat/site/trunk/xdocs/tomcat-70-eol.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/tomcat-70-eol.xml?rev=1889950&r1=1889949&r2=1889950&view=diff == --- tomcat/site/trunk/xdocs/tomcat-70-eol.xml (original) +++ tomcat/site/trunk/xdocs/tomcat-70-eol.xml Mon May 17 10:16:17 2021 @@ -33,7 +33,7 @@ will end on 31 March 2021. Note that all 7.0.x releases will always be available from the archive. It is anticipated that the final 7.0.x release will be made shortly -before 31 Match 2021. +before 31 March 2021. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (939efed -> d03377e)
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 939efed Guard new escape routines for null values
add 22c7f19 Remove unnecessary code. Only called for Tag files.
add 2b9fa20 Remove unnecessary code.
add d03377e Improve code coverage of Generator tests
No new revisions were added by this update.
Summary of changes:
java/org/apache/jasper/compiler/Generator.java | 42 +-
test/org/apache/jasper/compiler/TestGenerator.java | 634 -
.../jasper/runtime/TestCustomHttpJspPage.java | 20 +-
test/org/apache/jasper/runtime/TesterBean.java | 26 +
test/webapp/WEB-INF/bugs.tld | 102 +++-
.../bug58444.jsp => WEB-INF/tags/circular01.tag} | 18 +-
.../bug58444.jsp => WEB-INF/tags/circular02.tag} | 18 +-
.../bug58444.jsp => WEB-INF/tags/dobody.tagx} | 25 +-
.../tags/echo-deferred-method.tag} | 16 +-
.../bug58444.jsp => WEB-INF/tags/forward.tag} | 13 +-
.../bug58444.jsp => WEB-INF/tags/invoke.tagx} | 23 +-
.../bug58444.jsp => WEB-INF/tags/jsp-root.tagx}| 20 +-
.../bug58444.jsp => WEB-INF/tags/no-jsp-root.tagx} | 18 +-
.../bug58444.jsp => WEB-INF/tags/setters.tag} | 15 +-
.../tags/variable-from-attr.tag} | 16 +-
.../bug58444.jsp => WEB-INF/tags/variable.tag} | 18 +-
test/webapp/WEB-INF/web.xml| 134 +
.../bug5/{bug58444.jsp => bug58444a.jsp} | 0
.../bug5/{bug58444.jsp => bug58444b.jsp} | 0
.../generator/attribute-01.jsp}| 22 +-
test/webapp/jsp/generator/attribute-02.jsp | 36 ++
.../generator/attribute-03.jsp}| 19 +-
test/webapp/jsp/generator/attribute-04.jsp | 62 ++
.../bug58444.jsp => jsp/generator/beaninfo-01.jsp} | 13 +-
.../generator/break-el-interpreter.jsp}| 14 +-
.../generator/break-string-interpreter.jsp}| 14 +-
.../bug58444.jsp => jsp/generator/circular-01.jsp} | 11 +-
.../generator/customtag-02.jsp}| 18 +-
.../generator/customtag-03.jsp}| 14 +-
.../generator/customtag-04.jsp}| 14 +-
.../generator/deferred-method-01.jsp} | 17 +-
.../generator/deferred-method-02.jsp} | 17 +-
.../bug58444.jsp => jsp/generator/dobody-01.jsp} | 13 +-
.../bug58444.jsp => jsp/generator/element-01.jsp} | 20 +-
.../bug58444.jsp => jsp/generator/forward-01.jsp} | 14 +-
.../bug58444.jsp => jsp/generator/forward-02.jsp} | 15 +-
.../bug58444.jsp => jsp/generator/forward-03.jsp} | 13 +-
.../bug58444.jsp => jsp/generator/forward-04.jsp} | 11 +-
.../bug58444.jsp => jsp/generator/include-01.jsp} | 17 +-
.../generator/info-conflict-none.jsp} | 13 +-
.../generator/info-conflict.jsp} | 13 +-
.../bug58444.jsp => jsp/generator/info.jsp}| 12 +-
.../bug58444.jsp => jsp/generator/invoke-01.jsp} | 13 +-
.../bug58444.jsp => jsp/generator/jsp-id.jsp} | 14 +-
.../bug58444.jsp => jsp/generator/jsp-id.jspx} | 22 +-
test/webapp/jsp/generator/plugin-01.jspx | 54 ++
.../generator/scriptingvariables-01.jsp} | 20 +-
.../generator/scriptingvariables-02.jsp} | 19 +-
test/webapp/jsp/generator/setproperty-01.jsp | 32 ++
.../bug58444.jsp => jsp/generator/setters-01.jsp} | 11 +-
.../generator/single-threaded.jsp} | 12 +-
test/webapp/jsp/generator/templatetext-01.jsp | 283 +
test/webapp/jsp/generator/templatetext-02.jsp | 19 +
.../generator/try-catch-finally.jsp} | 16 +-
.../bug58444.jsp => jsp/generator/usebean-01.jsp} | 13 +-
.../bug58444.jsp => jsp/generator/usebean-02.jsp} | 13 +-
.../bug58444.jsp => jsp/generator/usebean-03.jsp} | 29 +-
.../bug58444.jsp => jsp/generator/usebean-04.jsp} | 13 +-
.../bug58444.jsp => jsp/generator/usebean-05.jsp} | 13 +-
.../bug58444.jsp => jsp/generator/usebean-06.jsp} | 13 +-
.../bug58444.jsp => jsp/generator/usebean-07.jsp} | 13 +-
.../bug58444.jsp => jsp/generator/usebean-08.jsp} | 23 +-
.../generator/variable-from-attr-nested.jsp} | 16 +-
.../variable-tagfile-from-attr-nested.jsp} | 14 +-
.../generator/variable-tagfile-nested.jsp} | 21 +-
.../generator/variable-tei-nested.jsp} | 20 +-
.../generator/x-powered-by.jsp}| 13 +-
.../generator/xml-doctype-01.jspx} | 22 +-
.../generator/xml-doctype-02.jspx} | 23 +-
.../generator/xml-prolog-01.jspx} | 21 +-
.../generator/xml-prolog-02.jspx} | 21 +-
.../generator/xml-prolog-tag.jspx} | 18 +-
72 files changed, 1859 insertions(+), 545 deletions(-)
copy test/webapp/{bug5/bug58444.jsp => WEB-INF/tags/c
[tomcat] branch 9.0.x updated (937b156 -> 74717b3)
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 937b156 Guard new escape routines for null values
new d5b958a Remove unnecessary code. Only called for Tag files.
new cb66b1f Remove unnecessary code.
new 74717b3 Improve code coverage of Generator tests
The 3 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/compiler/Generator.java | 42 +-
test/org/apache/jasper/compiler/TestGenerator.java | 634 -
.../jasper/runtime/TestCustomHttpJspPage.java | 20 +-
test/org/apache/jasper/runtime/TesterBean.java | 26 +
test/webapp/WEB-INF/bugs.tld | 102 +++-
.../bug58444.jsp => WEB-INF/tags/circular01.tag} | 18 +-
.../bug58444.jsp => WEB-INF/tags/circular02.tag} | 18 +-
.../bug58444.jsp => WEB-INF/tags/dobody.tagx} | 25 +-
.../tags/echo-deferred-method.tag} | 16 +-
.../bug58444.jsp => WEB-INF/tags/forward.tag} | 13 +-
.../bug58444.jsp => WEB-INF/tags/invoke.tagx} | 23 +-
.../bug58444.jsp => WEB-INF/tags/jsp-root.tagx}| 20 +-
.../bug58444.jsp => WEB-INF/tags/no-jsp-root.tagx} | 18 +-
.../bug58444.jsp => WEB-INF/tags/setters.tag} | 15 +-
.../tags/variable-from-attr.tag} | 16 +-
.../bug58444.jsp => WEB-INF/tags/variable.tag} | 18 +-
test/webapp/WEB-INF/web.xml| 134 +
.../bug5/{bug58444.jsp => bug58444a.jsp} | 0
.../bug5/{bug58444.jsp => bug58444b.jsp} | 0
.../generator/attribute-01.jsp}| 22 +-
test/webapp/jsp/generator/attribute-02.jsp | 36 ++
.../generator/attribute-03.jsp}| 19 +-
test/webapp/jsp/generator/attribute-04.jsp | 62 ++
.../bug58444.jsp => jsp/generator/beaninfo-01.jsp} | 13 +-
.../generator/break-el-interpreter.jsp}| 14 +-
.../generator/break-string-interpreter.jsp}| 14 +-
.../bug58444.jsp => jsp/generator/circular-01.jsp} | 11 +-
.../generator/customtag-02.jsp}| 18 +-
.../generator/customtag-03.jsp}| 14 +-
.../generator/customtag-04.jsp}| 14 +-
.../generator/deferred-method-01.jsp} | 17 +-
.../generator/deferred-method-02.jsp} | 17 +-
.../bug58444.jsp => jsp/generator/dobody-01.jsp} | 13 +-
.../bug58444.jsp => jsp/generator/element-01.jsp} | 20 +-
.../bug58444.jsp => jsp/generator/forward-01.jsp} | 14 +-
.../bug58444.jsp => jsp/generator/forward-02.jsp} | 15 +-
.../bug58444.jsp => jsp/generator/forward-03.jsp} | 13 +-
.../bug58444.jsp => jsp/generator/forward-04.jsp} | 11 +-
.../bug58444.jsp => jsp/generator/include-01.jsp} | 17 +-
.../generator/info-conflict-none.jsp} | 13 +-
.../generator/info-conflict.jsp} | 13 +-
.../bug58444.jsp => jsp/generator/info.jsp}| 12 +-
.../bug58444.jsp => jsp/generator/invoke-01.jsp} | 13 +-
.../bug58444.jsp => jsp/generator/jsp-id.jsp} | 14 +-
.../bug58444.jsp => jsp/generator/jsp-id.jspx} | 22 +-
test/webapp/jsp/generator/plugin-01.jspx | 54 ++
.../generator/scriptingvariables-01.jsp} | 20 +-
.../generator/scriptingvariables-02.jsp} | 19 +-
test/webapp/jsp/generator/setproperty-01.jsp | 32 ++
.../bug58444.jsp => jsp/generator/setters-01.jsp} | 11 +-
.../generator/single-threaded.jsp} | 12 +-
test/webapp/jsp/generator/templatetext-01.jsp | 283 +
test/webapp/jsp/generator/templatetext-02.jsp | 19 +
.../generator/try-catch-finally.jsp} | 16 +-
.../bug58444.jsp => jsp/generator/usebean-01.jsp} | 13 +-
.../bug58444.jsp => jsp/generator/usebean-02.jsp} | 13 +-
.../bug58444.jsp => jsp/generator/usebean-03.jsp} | 29 +-
.../bug58444.jsp => jsp/generator/usebean-04.jsp} | 13 +-
.../bug58444.jsp => jsp/generator/usebean-05.jsp} | 13 +-
.../bug58444.jsp => jsp/generator/usebean-06.jsp} | 13 +-
.../bug58444.jsp => jsp/generator/usebean-07.jsp} | 13 +-
.../bug58444.jsp => jsp/generator/usebean-08.jsp} | 23 +-
.../generator/variable-from-attr-nested.jsp} | 16 +-
.../variable-tagfile-from-attr-nested.jsp} | 14 +-
.../generator/variable-tagfile-nested.jsp} | 21 +-
.../generator/variable-tei-nested.jsp} | 20 +-
.../generator/x-powered-by.jsp}| 13 +-
.../generator/xml-doctype-01.jspx} | 22 +-
.../generator/xml-doctype-02.jspx} | 23 +-
.../generator/xml-prolog-01.jspx} | 21 +-
.../generator/xml-prolog-02.jspx}
[tomcat] 01/03: Remove unnecessary code. Only called for Tag files.
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 d5b958a03dbf7ebcba27ea7dd019371ac6de8cc0
Author: Mark Thomas
AuthorDate: Fri May 14 11:51:37 2021 +0100
Remove unnecessary code. Only called for Tag files.
---
java/org/apache/jasper/compiler/Generator.java | 15 +++
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/jasper/compiler/Generator.java
b/java/org/apache/jasper/compiler/Generator.java
index 930ab4c..b13f80e 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -3830,14 +3830,13 @@ class Generator {
out.print(" = ");
out.print(javaName);
out.println(";");
-if (ctxt.isTagFile()) {
-// Tag files should also set jspContext attributes
-out.printin("jspContext.setAttribute(\"");
-out.print(attrInfo.getName());
-out.print("\", ");
-out.print(javaName);
-out.println(");");
-}
+// Tag files should also set jspContext attributes
+// Only called for tag files so always set the jspContext
+out.printin("jspContext.setAttribute(\"");
+out.print(attrInfo.getName());
+out.print("\", ");
+out.print(javaName);
+out.println(");");
out.popIndent();
out.printil("}");
out.println();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/03: Remove unnecessary code.
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 cb66b1fc93d24ef5a781a2709dafb17c24f8bc5e
Author: Mark Thomas
AuthorDate: Fri May 14 13:28:13 2021 +0100
Remove unnecessary code.
If a tag file uses a named attribute, the TagFileDirectiveVisitor will
ensure that an alias is configured.
---
java/org/apache/jasper/compiler/Generator.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/jasper/compiler/Generator.java
b/java/org/apache/jasper/compiler/Generator.java
index b13f80e..771283e 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -3859,8 +3859,9 @@ class Generator {
boolean aliasSeen = false;
TagVariableInfo[] tagVars = tagInfo.getTagVariableInfos();
for (TagVariableInfo var : tagVars) {
-if (var.getNameFromAttribute() != null
-&& var.getNameGiven() != null) {
+// If a tag file uses a named attribute, the
TagFileDirectiveVisitor
+// will ensure that an alias is configured.
+if (var.getNameFromAttribute() != null) {
aliasSeen = true;
break;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat-jakartaee-migration] ShamithaSIlva opened a new issue #20: Skipping files
ShamithaSIlva opened a new issue #20: URL: https://github.com/apache/tomcat-jakartaee-migration/issues/20 Hi Guys I tried to skip these kind of jars ( [WEB-INF/lib/jcl-over-slf4j-1.7.21.jar] ) with -exclude=**WEB-INF/lib/*.jar. but seems it is not working. Any idea or what should be the glob pattern to skip WEB-INF/lib/ jar files? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated (edd46e4 -> ddb4d14)
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 edd46e4 Guard new escape routines for null values
new 551960d Remove unnecessary code. Only called for Tag files.
new b4385c7 Remove unnecessary code.
new ddb4d14 Improve code coverage of Generator tests
The 3 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/compiler/Generator.java | 39 +-
test/org/apache/jasper/compiler/TestGenerator.java | 634 -
.../jasper/runtime/TestCustomHttpJspPage.java | 20 +-
test/org/apache/jasper/runtime/TesterBean.java | 278 +
test/org/apache/jasper/runtime/TesterTypeA.java| 42 ++
test/org/apache/jasper/runtime/TesterTypeB.java| 25 +
test/webapp/WEB-INF/bugs.tld | 102 +++-
.../bug58444.jsp => WEB-INF/tags/circular01.tag} | 18 +-
.../bug58444.jsp => WEB-INF/tags/circular02.tag} | 18 +-
.../bug58444.jsp => WEB-INF/tags/dobody.tagx} | 25 +-
.../tags/echo-deferred-method.tag} | 16 +-
.../bug58444.jsp => WEB-INF/tags/forward.tag} | 13 +-
.../bug58444.jsp => WEB-INF/tags/invoke.tagx} | 23 +-
.../bug58444.jsp => WEB-INF/tags/jsp-root.tagx}| 20 +-
.../bug58444.jsp => WEB-INF/tags/no-jsp-root.tagx} | 18 +-
.../bug58444.jsp => WEB-INF/tags/setters.tag} | 15 +-
.../tags/variable-from-attr.tag} | 16 +-
.../bug58444.jsp => WEB-INF/tags/variable.tag} | 18 +-
test/webapp/WEB-INF/web.xml| 134 +
.../bug5/{bug58444.jsp => bug58444a.jsp} | 0
.../bug5/{bug58444.jsp => bug58444b.jsp} | 0
.../generator/attribute-01.jsp}| 22 +-
test/webapp/jsp/generator/attribute-02.jsp | 36 ++
.../generator/attribute-03.jsp}| 19 +-
test/webapp/jsp/generator/attribute-04.jsp | 62 ++
.../bug58444.jsp => jsp/generator/beaninfo-01.jsp} | 13 +-
.../generator/break-el-interpreter.jsp}| 14 +-
.../generator/break-string-interpreter.jsp}| 14 +-
.../bug58444.jsp => jsp/generator/circular-01.jsp} | 11 +-
.../generator/customtag-02.jsp}| 18 +-
.../generator/customtag-03.jsp}| 14 +-
.../generator/customtag-04.jsp}| 14 +-
.../generator/deferred-method-01.jsp} | 17 +-
.../generator/deferred-method-02.jsp} | 17 +-
.../bug58444.jsp => jsp/generator/dobody-01.jsp} | 13 +-
.../bug58444.jsp => jsp/generator/element-01.jsp} | 20 +-
.../bug58444.jsp => jsp/generator/forward-01.jsp} | 14 +-
.../bug58444.jsp => jsp/generator/forward-02.jsp} | 15 +-
.../bug58444.jsp => jsp/generator/forward-03.jsp} | 13 +-
.../bug58444.jsp => jsp/generator/forward-04.jsp} | 11 +-
.../bug58444.jsp => jsp/generator/include-01.jsp} | 17 +-
.../generator/info-conflict-none.jsp} | 13 +-
.../generator/info-conflict.jsp} | 13 +-
.../bug58444.jsp => jsp/generator/info.jsp}| 12 +-
.../bug58444.jsp => jsp/generator/invoke-01.jsp} | 13 +-
.../bug58444.jsp => jsp/generator/jsp-id.jsp} | 14 +-
.../bug58444.jsp => jsp/generator/jsp-id.jspx} | 22 +-
test/webapp/jsp/generator/plugin-01.jspx | 54 ++
.../generator/scriptingvariables-01.jsp} | 20 +-
.../generator/scriptingvariables-02.jsp} | 19 +-
test/webapp/jsp/generator/setproperty-01.jsp | 32 ++
.../bug58444.jsp => jsp/generator/setters-01.jsp} | 11 +-
.../generator/single-threaded.jsp} | 12 +-
test/webapp/jsp/generator/templatetext-01.jsp | 283 +
test/webapp/jsp/generator/templatetext-02.jsp | 19 +
.../generator/try-catch-finally.jsp} | 16 +-
.../bug58444.jsp => jsp/generator/usebean-01.jsp} | 13 +-
.../bug58444.jsp => jsp/generator/usebean-02.jsp} | 13 +-
.../bug58444.jsp => jsp/generator/usebean-03.jsp} | 29 +-
.../bug58444.jsp => jsp/generator/usebean-04.jsp} | 13 +-
.../bug58444.jsp => jsp/generator/usebean-05.jsp} | 13 +-
.../bug58444.jsp => jsp/generator/usebean-06.jsp} | 13 +-
.../bug58444.jsp => jsp/generator/usebean-07.jsp} | 13 +-
.../bug58444.jsp => jsp/generator/usebean-08.jsp} | 23 +-
.../generator/variable-from-attr-nested.jsp} | 16 +-
.../variable-tagfile-from-attr-nested.jsp} | 14 +-
.../generator/variable-tagfile-nested.jsp} | 21 +-
.../generator/variable-tei-nested.jsp} | 20 +-
.../generator/x-powered-by.jsp}| 13 +-
.../generator/xml-doctype-01.jspx} | 22 +-
.../generator/xml-doctype-02.jspx}
[tomcat] 01/03: Remove unnecessary code. Only called for Tag files.
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 551960d706adc7d5e4a8475a901a1288985e7440
Author: Mark Thomas
AuthorDate: Fri May 14 11:51:37 2021 +0100
Remove unnecessary code. Only called for Tag files.
---
java/org/apache/jasper/compiler/Generator.java | 15 +++
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/jasper/compiler/Generator.java
b/java/org/apache/jasper/compiler/Generator.java
index a3b73d3..77ca3a3 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -3797,14 +3797,13 @@ class Generator {
out.print(" = ");
out.print(javaName);
out.println(";");
-if (ctxt.isTagFile()) {
-// Tag files should also set jspContext attributes
-out.printin("jspContext.setAttribute(\"");
-out.print(attrInfo.getName());
-out.print("\", ");
-out.print(javaName);
-out.println(");");
-}
+// Tag files should also set jspContext attributes
+// Only called for tag files so always set the jspContext
+out.printin("jspContext.setAttribute(\"");
+out.print(attrInfo.getName());
+out.print("\", ");
+out.print(javaName);
+out.println(");");
out.popIndent();
out.printil("}");
out.println();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/03: Remove unnecessary code.
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 b4385c721491156cee17edcd0c3c782abaf49cdf
Author: Mark Thomas
AuthorDate: Fri May 14 13:28:13 2021 +0100
Remove unnecessary code.
If a tag file uses a named attribute, the TagFileDirectiveVisitor will
ensure that an alias is configured.
---
java/org/apache/jasper/compiler/Generator.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/jasper/compiler/Generator.java
b/java/org/apache/jasper/compiler/Generator.java
index 77ca3a3..7ff6c23 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -3826,8 +3826,9 @@ class Generator {
boolean aliasSeen = false;
TagVariableInfo[] tagVars = tagInfo.getTagVariableInfos();
for (TagVariableInfo var : tagVars) {
-if (var.getNameFromAttribute() != null
-&& var.getNameGiven() != null) {
+// If a tag file uses a named attribute, the
TagFileDirectiveVisitor
+// will ensure that an alias is configured.
+if (var.getNameFromAttribute() != null) {
aliasSeen = true;
break;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 65124] Inefficient generated JSP code
https://bz.apache.org/bugzilla/show_bug.cgi?id=65124 --- Comment #11 from Mark Thomas --- It has taken a while but I have just committed additional tests that bring the code coverage for Generator close to 100%. Next steps will be looking at the optimisations. The work on the tests identified some unnecessary code in Generator which has been removed but I don't expect that to have had a measurable performance impact. -- 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
[GitHub] [tomcat-jakartaee-migration] markt-asf commented on issue #20: Skipping files
markt-asf commented on issue #20: URL: https://github.com/apache/tomcat-jakartaee-migration/issues/20#issuecomment-842272261 Pattern applies only to the file name so, assuming this is a WAR file, `-exclude=*.jar` should work. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat-jakartaee-migration] ShamithaSIlva commented on issue #20: Skipping files
ShamithaSIlva commented on issue #20: URL: https://github.com/apache/tomcat-jakartaee-migration/issues/20#issuecomment-842293747 > Pattern applies only to the file name so, assuming this is a WAR file, `-exclude=*.jar` should work. It gives me : Migration skipped for archive [WEB-INF/lib/xyz.jar] because it is excluded (the archive was copied unchanged) for all the jars but still taking like 30 mins, without exclude it took 32 mins. Really need to skip jar conversion after first time to save time -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat-jakartaee-migration] markt-asf closed issue #20: Skipping files
markt-asf closed issue #20: URL: https://github.com/apache/tomcat-jakartaee-migration/issues/20 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat-jakartaee-migration] markt-asf commented on issue #20: Skipping files
markt-asf commented on issue #20: URL: https://github.com/apache/tomcat-jakartaee-migration/issues/20#issuecomment-842299148 That suggests JAR conversion isn't where the time is being spent. Have you run this with a profiler? Can you share the WAR (or better a pointer to a project to build the WAR)? If not, can you create a fake project you can share that exhibits the same performance? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat-jakartaee-migration] ShamithaSIlva commented on issue #20: Skipping files
ShamithaSIlva commented on issue #20: URL: https://github.com/apache/tomcat-jakartaee-migration/issues/20#issuecomment-842304084 > That suggests JAR conversion isn't where the time is being spent. Have you run this with a profiler? Can you share the WAR (or better a pointer to a project to build the WAR)? If not, can you create a fake project you can share that exhibits the same performance? Sorry I cannot provide the war and I'm not giving any profiler which makes it default to TOMCAT. I can post the convertion log since the project uses open source libraries: java -jar jakartaee-migration-1.0.1-SNAPSHOT-shaded.jar JavaxApp\sm-api.war converted.war -zipInMemory -exclude=*.jar Performing migration from source [C:\Source\tomcat-jakartaee-migration\target\JavaxApp\xyz.war] to destination [C:\Source\tomcat-jakartaee-migration\target\converted.war] with Jakarta EE specification profile [TOMCAT] Migration starting for archive [xyz.war] using in memory copy Migration skipped for archive [WEB-INF/lib/jdbc-4.1.0.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/jdbc-6.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/spring-boot-starter-logging-1.3.7.RELEASE.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/spring-boot-autoconfigure-1.3.7.RELEASE.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/grails-core-3.1.8.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/spring-boot-starter-actuator-1.3.7.RELEASE.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/spring-boot-starter-tomcat-1.3.7.RELEASE.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/grails-plugin-url-mappings-3.1.8.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/grails-plugin-rest-3.1.8.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/grails-plugin-codecs-3.1.8.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/grails-plugin-interceptors-3.1.8.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/grails-plugin-services-3.1.8.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/grails-plugin-datasource-3.1.8.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/grails-plugin-databinding-3.1.8.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/grails-plugin-async-3.1.8.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/grails-web-boot-3.1.8.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/grails-logging-3.1.8.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/cache-3.0.2.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/docx4j-6.1.2.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/docx4j-export-fo-3.3.0.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/pdfbox-2.0.3.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/tika-core-1.26.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/tika-parsers-1.26.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/hibernate4-5.0.8.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/hibernate-ehcache-4.3.11.Final.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/audit-logging-2.0.1.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/grails-melody-plugin-1.67.0.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/liquibase-core-3.4.1.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/views-json-1.0.12.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/mail-2.0.0.RC6.jar] because it is exclud
[GitHub] [tomcat-jakartaee-migration] rmaucher commented on issue #20: Skipping files
rmaucher commented on issue #20: URL: https://github.com/apache/tomcat-jakartaee-migration/issues/20#issuecomment-842311068 Ok so do you *really* need to use the in memory mode ? That is far less efficient than the default. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat-jakartaee-migration] ShamithaSIlva commented on issue #20: Skipping files
ShamithaSIlva commented on issue #20: URL: https://github.com/apache/tomcat-jakartaee-migration/issues/20#issuecomment-842314996 > Ok so do you _really_ need to use the in memory mode ? That is far less efficient than the default. Without that I'm getting this exception: Migration starting for archive [xyz.war] using streaming Failed to migrate archive [xyz.war]. Using the "-zipInMemory" option may help. Exception in thread "main" java.util.zip.ZipException: duplicate entry: WEB-INF/classes/xyz_api_activityStreamXYZ_getActivityStreamData_gson$_run_closure1.class at java.util.zip.ZipOutputStream.putNextEntry(Unknown Source) at org.apache.tomcat.jakartaee.Migration.migrateArchiveStreaming(Migration.java:228) at org.apache.tomcat.jakartaee.Migration.migrateStream(Migration.java:289) at org.apache.tomcat.jakartaee.Migration.migrateFile(Migration.java:200) at org.apache.tomcat.jakartaee.Migration.execute(Migration.java:166) at org.apache.tomcat.jakartaee.MigrationCLI.main(MigrationCLI.java:104) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat-jakartaee-migration] ShamithaSIlva edited a comment on issue #20: Skipping files
ShamithaSIlva edited a comment on issue #20: URL: https://github.com/apache/tomcat-jakartaee-migration/issues/20#issuecomment-842304084 > That suggests JAR conversion isn't where the time is being spent. Have you run this with a profiler? Can you share the WAR (or better a pointer to a project to build the WAR)? If not, can you create a fake project you can share that exhibits the same performance? Sorry I cannot provide the war and I'm not giving any profiler which makes it default to TOMCAT. I can post the convertion log since the project uses open source libraries: java -jar jakartaee-migration-1.0.1-SNAPSHOT-shaded.jar JavaxApp\xyz.war converted.war -zipInMemory -exclude=*.jar Performing migration from source [C:\Source\tomcat-jakartaee-migration\target\JavaxApp\xyz.war] to destination [C:\Source\tomcat-jakartaee-migration\target\converted.war] with Jakarta EE specification profile [TOMCAT] Migration starting for archive [xyz.war] using in memory copy Migration skipped for archive [WEB-INF/lib/jdbc-4.1.0.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/jdbc-6.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/spring-boot-starter-logging-1.3.7.RELEASE.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/spring-boot-autoconfigure-1.3.7.RELEASE.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/grails-core-3.1.8.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/spring-boot-starter-actuator-1.3.7.RELEASE.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/spring-boot-starter-tomcat-1.3.7.RELEASE.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/grails-plugin-url-mappings-3.1.8.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/grails-plugin-rest-3.1.8.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/grails-plugin-codecs-3.1.8.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/grails-plugin-interceptors-3.1.8.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/grails-plugin-services-3.1.8.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/grails-plugin-datasource-3.1.8.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/grails-plugin-databinding-3.1.8.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/grails-plugin-async-3.1.8.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/grails-web-boot-3.1.8.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/grails-logging-3.1.8.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/cache-3.0.2.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/docx4j-6.1.2.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/docx4j-export-fo-3.3.0.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/pdfbox-2.0.3.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/tika-core-1.26.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/tika-parsers-1.26.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/hibernate4-5.0.8.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/hibernate-ehcache-4.3.11.Final.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/audit-logging-2.0.1.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/grails-melody-plugin-1.67.0.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/liquibase-core-3.4.1.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/views-json-1.0.12.jar] because it is excluded (the archive was copied unchanged) Migration skipped for archive [WEB-INF/lib/mail-2.0.0.RC6.jar] because it is ex
[GitHub] [tomcat-jakartaee-migration] ShamithaSIlva edited a comment on issue #20: Skipping files
ShamithaSIlva edited a comment on issue #20: URL: https://github.com/apache/tomcat-jakartaee-migration/issues/20#issuecomment-842304084 > That suggests JAR conversion isn't where the time is being spent. Have you run this with a profiler? Can you share the WAR (or better a pointer to a project to build the WAR)? If not, can you create a fake project you can share that exhibits the same performance? Sorry I cannot provide the war and I'm not giving any profiler which makes it default to TOMCAT. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (d03377e -> c5f7c63)
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 d03377e Improve code coverage of Generator tests new 75d8c79 Improve readability of Java source new c5f7c63 Correct bug id 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/jasper/compiler/Generator.java | 2 +- webapps/docs/changelog.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Correct bug id
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 c5f7c636dbf775606d91bd24414cb325b78afc62 Author: Mark Thomas AuthorDate: Mon May 17 19:01:54 2021 +0100 Correct bug id --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 630110e..20a366a 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -107,7 +107,7 @@ -63508: NPE in JNDIRealm when no userRoleAttribute +65308: NPE in JNDIRealm when no userRoleAttribute is given. (fschumacher) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Improve readability of Java source
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 75d8c7958c472274f25589695b12e7336165d41f
Author: Mark Thomas
AuthorDate: Mon May 17 13:41:29 2021 +0100
Improve readability of Java source
---
java/org/apache/jasper/compiler/Generator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/jasper/compiler/Generator.java
b/java/org/apache/jasper/compiler/Generator.java
index 74b3518..4c228e8 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -3184,7 +3184,7 @@ class Generator {
out.printin(tagHandlerVar);
out.print(".setParent(");
out.print("new jakarta.servlet.jsp.tagext.TagAdapter(");
-out.print("(jakarta.servlet.jsp.tagext.SimpleTag) this ));");
+out.println("(jakarta.servlet.jsp.tagext.SimpleTag) this ));");
} else if (!simpleTag) {
out.printin(tagHandlerVar);
out.print(".setParent(");
-
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 (74717b3 -> 2928b0d)
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 74717b3 Improve code coverage of Generator tests new af3b0ba Improve readability of Java source new 2928b0d Correct bug id 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/jasper/compiler/Generator.java | 2 +- webapps/docs/changelog.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Improve readability of Java source
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 af3b0bab91fe37eb4e82987a987ca89cd72605ba
Author: Mark Thomas
AuthorDate: Mon May 17 13:41:29 2021 +0100
Improve readability of Java source
---
java/org/apache/jasper/compiler/Generator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/jasper/compiler/Generator.java
b/java/org/apache/jasper/compiler/Generator.java
index 05cc767..1fec7df 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -3197,7 +3197,7 @@ class Generator {
out.printin(tagHandlerVar);
out.print(".setParent(");
out.print("new javax.servlet.jsp.tagext.TagAdapter(");
-out.print("(javax.servlet.jsp.tagext.SimpleTag) this ));");
+out.println("(javax.servlet.jsp.tagext.SimpleTag) this ));");
} else if (!simpleTag) {
out.printin(tagHandlerVar);
out.print(".setParent(");
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Correct bug id
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 2928b0df9bfb0bc9c00d340458f215c4769cf323 Author: Mark Thomas AuthorDate: Mon May 17 19:01:54 2021 +0100 Correct bug id --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 8d5f8d9..7ded262 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -107,7 +107,7 @@ -63508: NPE in JNDIRealm when no userRoleAttribute +65308: NPE in JNDIRealm when no userRoleAttribute is given. (fschumacher) - 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 (ddb4d14 -> ef77b54)
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 ddb4d14 Improve code coverage of Generator tests new a938f26 Improve readability of Java source new ef77b54 Correct bug id 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/jasper/compiler/Generator.java | 2 +- webapps/docs/changelog.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Improve readability of Java source
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 a938f26571b286c91d7475e90b3b96b083df6262
Author: Mark Thomas
AuthorDate: Mon May 17 13:41:29 2021 +0100
Improve readability of Java source
---
java/org/apache/jasper/compiler/Generator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/jasper/compiler/Generator.java
b/java/org/apache/jasper/compiler/Generator.java
index a802fc9..32e37f7 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -3166,7 +3166,7 @@ class Generator {
out.printin(tagHandlerVar);
out.print(".setParent(");
out.print("new javax.servlet.jsp.tagext.TagAdapter(");
-out.print("(javax.servlet.jsp.tagext.SimpleTag) this ));");
+out.println("(javax.servlet.jsp.tagext.SimpleTag) this ));");
} else if (!simpleTag) {
out.printin(tagHandlerVar);
out.print(".setParent(");
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Correct bug id
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 ef77b54bdc2c75a593340da47bd990426752f5e1 Author: Mark Thomas AuthorDate: Mon May 17 19:01:54 2021 +0100 Correct bug id --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index bd59929..c9b3a5c 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -107,7 +107,7 @@ -63508: NPE in JNDIRealm when no userRoleAttribute +65308: NPE in JNDIRealm when no userRoleAttribute is given. (fschumacher) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat-jakartaee-migration] rmaucher commented on issue #20: Skipping files
rmaucher commented on issue #20: URL: https://github.com/apache/tomcat-jakartaee-migration/issues/20#issuecomment-842311068 Ok so do you *really* need to use the in memory mode ? That is far less efficient than the default. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat-jakartaee-migration] markt-asf closed issue #20: Skipping files
markt-asf closed issue #20: URL: https://github.com/apache/tomcat-jakartaee-migration/issues/20 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat-jakartaee-migration] ShamithaSIlva commented on issue #20: Skipping files
ShamithaSIlva commented on issue #20: URL: https://github.com/apache/tomcat-jakartaee-migration/issues/20#issuecomment-842293747 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat-jakartaee-migration] markt-asf commented on issue #20: Skipping files
markt-asf commented on issue #20: URL: https://github.com/apache/tomcat-jakartaee-migration/issues/20#issuecomment-842272261 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat-jakartaee-migration] ShamithaSIlva edited a comment on issue #20: Skipping files
ShamithaSIlva edited a comment on issue #20: URL: https://github.com/apache/tomcat-jakartaee-migration/issues/20#issuecomment-842304084 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
JSP code generation optimizations
Hi all,
I am looking at some of the optimizations requested in [1]
One of the examples is show below. Code like this is used when the JSP
calls a tag.
private boolean _jspx_meth_mytag_005fhelloWorld_005f0(
jakarta.servlet.jsp.PageContext _jspx_page_context)
throws java.lang.Throwable {
jakarta.servlet.jsp.PageContext pageContext = _jspx_page_context;
// mytag:helloWorld
}
The question is, can the generated code above be changed to something
like this:
private boolean _jspx_meth_mytag_005fhelloWorld_005f0(
final jakarta.servlet.jsp.PageContext pageContext)
throws java.lang.Throwable {
// mytag:helloWorld
}
I am assuming that the aliasing of _jspx_page_context to pageContext is
so that _jspx_page_context always references the original even if the
tag decides to do something like:
pageContext = new MyCustomPageContextImpl();
The question is, is behaviour like this allowed?
I can't see anything in the spec that disallows this.
I don't think the aliasing is a defence against malicious apps as it is
only the implicit objects that are protected this way. Internal objects
(those name _jsp*) are unprotected.
Given that the original authors (who were on the JSP EG at the time)
added this aliasing for the implicit objects, it looks like the
intention was to allow applications to manipulate/replace the implicit
objects if they wish - without breaking Jasper.
If the above assumptions are correct, what do we want to do about [1]?
The aliasing is often unnecessary but will sometimes be essential. Do we
reject this optimization request? Do we add a configuration option? Do
we try and make this aspect of the code generation pluggable somehow?
Something else?
Thoughts very welcome.
Mark
[1] https://bz.apache.org/bugzilla/show_bug.cgi?id=65124
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat-jakartaee-migration] markt-asf commented on issue #20: Skipping files
markt-asf commented on issue #20: URL: https://github.com/apache/tomcat-jakartaee-migration/issues/20#issuecomment-842558546 By profiler I mean something like YourKit Java Profiler which will tell you where all the time is being spent. Failing that an example we can test would help. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: JSP code generation optimizations
On Mon, May 17, 2021 at 8:47 PM Mark Thomas wrote:
> Hi all,
>
> I am looking at some of the optimizations requested in [1]
>
> One of the examples is show below. Code like this is used when the JSP
> calls a tag.
>
>
> private boolean _jspx_meth_mytag_005fhelloWorld_005f0(
> jakarta.servlet.jsp.PageContext _jspx_page_context)
> throws java.lang.Throwable {
> jakarta.servlet.jsp.PageContext pageContext = _jspx_page_context;
> // mytag:helloWorld
>
> }
>
> The question is, can the generated code above be changed to something
> like this:
>
> private boolean _jspx_meth_mytag_005fhelloWorld_005f0(
> final jakarta.servlet.jsp.PageContext pageContext)
> throws java.lang.Throwable {
> // mytag:helloWorld
>
> }
>
>
> I am assuming that the aliasing of _jspx_page_context to pageContext is
> so that _jspx_page_context always references the original even if the
> tag decides to do something like:
>
> pageContext = new MyCustomPageContextImpl();
>
> The question is, is behaviour like this allowed?
>
> I can't see anything in the spec that disallows this.
>
> I don't think the aliasing is a defence against malicious apps as it is
> only the implicit objects that are protected this way. Internal objects
> (those name _jsp*) are unprotected.
>
> Given that the original authors (who were on the JSP EG at the time)
> added this aliasing for the implicit objects, it looks like the
> intention was to allow applications to manipulate/replace the implicit
> objects if they wish - without breaking Jasper.
>
> If the above assumptions are correct, what do we want to do about [1]?
> The aliasing is often unnecessary but will sometimes be essential. Do we
> reject this optimization request? Do we add a configuration option? Do
> we try and make this aspect of the code generation pluggable somehow?
> Something else?
>
> Thoughts very welcome.
>
Well, although I do see how this makes the generated code a little bit
smaller, this is a rather small optimization (even with 1000s of
occurrences). Since you've identified a risk, and it seems correct to me
(I'm almost certain this was on purpose and because the idea is not
forbidden in the specification), I would say we should skip that one.
Rémy
>
> Mark
>
>
> [1] https://bz.apache.org/bugzilla/show_bug.cgi?id=65124
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>
