This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 9950295dbddf576c1bfbdae73d45b3ada9692be9 Merge: 7c4bd1a3778 6b042fbe8af Author: Matthias Bläsing <[email protected]> AuthorDate: Wed Nov 12 19:32:58 2025 +0100 Merge pull request #8976 from matthiasblaesing/jsp_update2 Enable parsing of JSP 3.0 (Jakarta) based sources .github/workflows/main.yml | 8 +- .gitignore | 1 + enterprise/libs.elimpl/nbproject/project.xml | 2 +- enterprise/libs.jstl/external/binaries-list | 2 + .../jakarta.servlet.jsp.jstl-1.2-license.txt | 2 +- enterprise/libs.jstl/manifest.mf | 2 +- enterprise/libs.jstl/nbproject/project.properties | 4 +- .../src/org/netbeans/libs/jstl/Bundle.properties | 8 +- .../src/org/netbeans/libs/jstl/jstl-jakarta.xml | 46 + .../libs.jstl/src/org/netbeans/libs/jstl/layer.xml | 3 + enterprise/servletjspapi/build.xml | 237 +++- enterprise/servletjspapi/external/binaries-list | 7 +- ... generated-servlet-jsp-api-6.1_3.0-license.txt} | 3 +- ...nse.txt => servlet-jsp-api-6.1_3.0-license.txt} | 4 +- enterprise/servletjspapi/manifest.mf | 2 +- .../servletjspapi/nbproject/project.properties | 7 +- enterprise/servletjspapi/nbproject/project.xml | 12 + .../modules/servletjspapi/Bundle.properties | 4 +- .../web.core.syntax/nbproject/project.properties | 13 +- enterprise/web.core.syntax/nbproject/project.xml | 31 +- .../modules/web/core/syntax/JSPProcessor.java | 37 +- .../web/core/syntax/JspHyperlinkProvider.java | 8 +- .../modules/web/core/syntax/JspSyntaxSupport.java | 62 +- .../core/syntax/completion/JspCompletionQuery.java | 4 +- .../syntax/completion/api/JspCompletionItem.java | 52 +- .../testfilesformatting/issue121102.jsp.formatted | 4 +- .../completion/api/JspCompletionItemTest.java | 48 +- .../web/core/syntax/SingleJspServletGenTest.java | 2 +- .../netbeans/test/web/core/syntax/TestBase2.java | 20 +- enterprise/web.core/nbproject/project.xml | 16 +- .../modules/web/core/api/JspColoringData.java | 89 +- .../web/core/palette/JspPaletteUtilities.java | 4 +- enterprise/web.el/nbproject/project.xml | 2 +- enterprise/web.jsf.editor/nbproject/project.xml | 12 +- enterprise/web.jsf/nbproject/project.xml | 6 +- enterprise/web.jsf20/nbproject/project.xml | 2 +- enterprise/web.jspparser/build.xml | 48 +- enterprise/web.jspparser/external/binaries-list | 7 + ...nerated-glassfish-jspparser-7.0.25-license.txt} | 4 +- .../jakarta.servlet.jsp.jstl-1.2-license.txt | 2 +- .../org/apache/jasper/compiler/GetParseData.java | 249 +++- .../org/apache/jasper/compiler/NbValidator.java | 2 +- .../jasper/compiler/NodeConverterVisitor.java | 135 +- .../modules/web/jspparser_ext/Bundle.properties | 18 - .../modules/web/jspparser_ext/OptionsImpl.java | 2 +- .../web/jspparser_ext/WebAppParseSupport.java | 23 +- enterprise/web.jspparser/manifest.mf | 4 +- .../org-netbeans-modules-web-jspparser.sig | 330 +++-- .../web.jspparser/nbproject/project.properties | 18 +- enterprise/web.jspparser/nbproject/project.xml | 25 +- .../modules/web/jspparser/JspParserImpl.java | 113 +- .../web/jspparser/ParserServletContext.java | 45 +- ...Context.java => ParserServletContextJavax.java} | 24 +- .../modules/web/jspparser/WebModuleProvider.java | 35 + .../modules/web/jsps/parserapi/DumpVisitor.java | 79 +- .../modules/web/jsps/parserapi/ELNode.java | 47 +- .../netbeans/modules/web/jsps/parserapi/Node.java | 542 ++++---- .../modules/web/jsps/parserapi/PageInfo.java | 269 ++-- .../web/jsps/parserapi/TagAttributeInfo.java | 83 ++ .../modules/web/jsps/parserapi/TagFileInfo.java | 59 + .../modules/web/jsps/parserapi/TagInfo.java | 127 ++ .../modules/web/jsps/parserapi/TagLibraryInfo.java | 139 ++ .../web/jsps/parserapi/TagVariableInfo.java | 79 ++ .../modules/web/jsps/parserapi/VariableInfo.java | 59 + .../test/unit/data/project2/build.xml | 15 +- .../unit/data/project2/nbproject/build-impl.xml | 1355 +++++++++++++++---- .../data/project2/nbproject/genfiles.properties | 12 +- .../data/project2/nbproject/project.properties | 6 +- .../test/unit/data/project2/nbproject/project.xml | 10 +- .../data/{project2 => project2_jakarta}/build.xml | 19 +- .../data/project2_jakarta/nbproject/ant-deploy.xml | 131 ++ .../data/project2_jakarta/nbproject/build-impl.xml | 1417 ++++++++++++++++++++ .../project2_jakarta/nbproject/genfiles.properties | 8 + .../nbproject/project.properties | 35 +- .../nbproject/project.xml | 2 +- .../data/project2_jakarta/outside/outsidewm.jsp | 5 + .../data/project2_jakarta/src/Bundle.properties | 7 + .../data/project2_jakarta/src/Bundle_fr.properties | 7 + .../data/project2_jakarta/src/Bundle_sv.properties | 7 + .../src/more_for_test/TestBean.java | 54 + .../data/project2_jakarta/web/META-INF/context.xml | 2 + .../web/WEB-INF/META-INF/MANIFEST.MF | 3 + .../project2_jakarta/web/WEB-INF/META-INF/c-rt.tld | 393 ++++++ .../project2_jakarta/web/WEB-INF/META-INF/c.tld | 416 ++++++ .../web/WEB-INF/META-INF/context.xml | 2 + .../web/WEB-INF/META-INF/fmt-rt.tld | 403 ++++++ .../project2_jakarta/web/WEB-INF/META-INF/fmt.tld | 442 ++++++ .../web/WEB-INF/META-INF/permittedTaglibs.tld | 42 + .../web/WEB-INF/META-INF/scriptfree.tld | 60 + .../web/WEB-INF/META-INF/sql-rt.tld | 188 +++ .../project2_jakarta/web/WEB-INF/META-INF/sql.tld | 213 +++ .../project2_jakarta/web/WEB-INF/META-INF/x-rt.tld | 256 ++++ .../project2_jakarta/web/WEB-INF/META-INF/x.tld | 273 ++++ .../web/WEB-INF/docs/cookies/CookieCutter.jsp | 40 + .../web/WEB-INF/docs/cookies/CookieMake.jsp | 15 + .../web/WEB-INF/docs/cookies/Tray.jsp | 21 + .../project2_jakarta/web/WEB-INF/docs/header.jspf | 2 + .../project2_jakarta/web/WEB-INF/docs/index.jsp | 8 + .../web/WEB-INF/docs/localized/Babel.jsp | 13 + .../project2_jakarta/web/WEB-INF/docs/main.jsp | 68 + .../web/WEB-INF/docs/parameters/Input.jsp | 27 + .../web/WEB-INF/docs/parameters/Output.jsp | 14 + .../data/project2_jakarta/web/WEB-INF/index.jsp | 6 + .../project2_jakarta/web/WEB-INF/tags/linklist.tag | 14 + .../web/WEB-INF/tags/myTags/first.tag | 32 + .../web/WEB-INF/tags/myTags/test.tag | 8 + .../web/WEB-INF/tags/myTags/testx.tagx | 8 + .../project2_jakarta/web/WEB-INF/tags/othertag.tag | 13 + .../unit/data/project2_jakarta/web/WEB-INF/web.ias | 4 + .../project2_jakarta/web/WEB-INF/web.warContent | Bin 0 -> 623 bytes .../project2_jakarta/web/WEB-INF/web.webj2eeri | 6 + .../project2_jakarta/web/WEB-INF/web.webweblogic | 4 + .../unit/data/project2_jakarta/web/WEB-INF/web.xml | 65 + .../project2_jakarta/web/WEB-INF/web.xml.default | 61 + .../web/WEB-INF/web.xml.include-prelude | 27 + .../test/unit/data/project2_jakarta/web/basic.jspx | 34 + .../test/unit/data/project2_jakarta/web/body.jsp | 2 + .../project2_jakarta/web/codaprelude/footer.jsp | 13 + .../project2_jakarta/web/codaprelude/header.jsp | 23 + .../test/unit/data/project2_jakarta/web/debug.jsp | 28 + .../data/project2_jakarta/web/encoding198637.jsp | 22 + .../test/unit/data/project2_jakarta/web/faulty.jsp | 14 + .../unit/data/project2_jakarta/web/header.jspf | 1 + .../unit/data/project2_jakarta/web/include.jsp | 19 + .../project2_jakarta/web/includePreludeCoda.jsp | 3 + .../unit/data/project2_jakarta/web/jspInclude.jsp | 19 + .../test/unit/data/project2_jakarta/web/links.jsp | 44 + .../test/unit/data/project2_jakarta/web/main.jsp | 25 + .../test/unit/data/project2_jakarta/web/main_1.jsp | 25 + .../test/unit/data/project2_jakarta/web/main_2.jsp | 7 + .../project2_jakarta/web/more_for_test/bean.jsp | 10 + .../unit/data/project2_jakarta/web/myotherpage.jsp | 5 + .../unit/data/project2_jakarta/web/testTagLibs.jsp | 13 + .../netbeans/modules/web/jspparser/CacheTest.java | 15 +- .../modules/web/jspparser/FastScanTest.java | 6 +- .../netbeans/modules/web/jspparser/ParseTest.java | 36 +- .../netbeans/modules/web/jspparser/TestUtil.java | 7 +- .../ParseTest/testAnalysisBeanJakarta.pass | 162 +++ .../ParseTest/testAnalysisFaultyJakarta.pass | 151 +++ .../ParseTest/testAnalysisMainJakarta.pass | 360 +++++ .../ParseTest/testAnalysisOutsideWMJakarta.pass | 5 + .../ParseTest/testAnalysisTagLinkListJakarta.pass | 127 ++ .../goldenfiles/ParseTest/testIncludeJakarta.pass | 204 +++ .../ParseTest/testIncludePreludeCodaJakarta.pass | 82 ++ .../ParseTest/testJSPIncludeJakarta.pass | 183 +++ enterprise/web.kit/nbproject/project.xml | 29 +- enterprise/web.project/nbproject/project.xml | 3 +- .../project/classpath/ClassPathProviderImpl.java | 6 +- .../websvc.saas.codegen.j2ee/nbproject/project.xml | 14 +- .../org/netbeans/nbbuild/extlibs/ignored-overlaps | 2 + nbbuild/l10n.patterns | 1 + 151 files changed, 9825 insertions(+), 1447 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
