This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git
commit e014920acbc43d04937351a1eb1bd063fde95642
Merge: b39ac19 63d9255
Author: Lukasz Lenart <lukasz.len...@gmail.com>
AuthorDate: Wed Aug 14 17:02:01 2024 +0200
Merge pull request #2 from apache/feature/WW-5445-struts6
WW-5445 Adds support for Struts 6
build.gradle.kts | 6 +-
.../intellij/struts2/Struts2ResourceProvider.java | 4 +
.../java/com/intellij/struts2/StrutsConstants.java | 14 +-
.../StrutsFileTemplateGroupDescriptorFactory.java | 7 +
.../struts2/StrutsFileTemplateProvider.java | 16 ++-
.../struts2/annotators/ActionAnnotatorBase.java | 6 +-
.../annotators/StrutsFileSetCheckingAnnotator.java | 2 +-
.../intellij/struts2/facet/Struts2LibraryType.java | 2 +-
.../facet/StrutsFrameworkSupportProvider.java | 8 +-
.../java/com/intellij/struts2/facet/struts2.xml | 30 ++--
.../struts2/facet/ui/FileSetConfigurationTab.java | 4 +-
.../intellij/struts2/graph/StrutsDataModel.java | 3 +-
.../model/jam/convention/JamInterceptorRef.java | 2 +-
.../velocity/VelocityStrutsResultContributor.java | 4 +-
src/main/resources/META-INF/plugin.xml | 2 +-
.../resources/fileTemplates/j2ee/struts_6_0.xml.ft | 8 ++
.../fileTemplates/j2ee/struts_6_0.xml.html | 7 +
src/main/resources/resources/dtds/struts-6.0.dtd | 157 +++++++++++++++++++++
18 files changed, 242 insertions(+), 40 deletions(-)
