You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2022/10/14 10:36:26 UTC
[struts] branch WW-5233-tiles updated (f71e32202 -> 360f51dd5)
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch WW-5233-tiles
in repository https://gitbox.apache.org/repos/asf/struts.git
from f71e32202 Merge pull request #610 from gregh3269/WW-5233-tiles
new 88caa890f Add generating of Autotags and tests.
new 64db73184 Make plugin standalone with all generated resources.
new 360f51dd5 Merge pull request #612 from gregh3269/WW-5233-tiles
The 6386 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:
plugins/tiles/pom.xml | 44 +-
.../org/apache/struts2/tiles/BuildAutotags.java | 171 +++
.../StrutsWildcardServletApplicationContext.java | 1 -
.../org/apache/tiles/api/AttributeContext.java | 1 -
.../core/AutotagRuntimeException.java} | 30 +-
.../tiles/autotag/freemarker/FMModelGenerator.java | 63 ++
.../freemarker/FMModelRepositoryGenerator.java | 61 +
.../freemarker/FMTemplateGeneratorFactory.java | 69 ++
.../tiles/autotag/freemarker}/package-info.java | 6 +-
.../generate/AbstractTemplateClassGenerator.java | 143 +++
.../generate/AbstractTemplateSuiteGenerator.java | 128 +++
.../autotag/generate/BasicTemplateGenerator.java | 187 +++
.../autotag/generate/TemplateClassGenerator.java} | 32 +-
.../tiles/autotag/generate/TemplateGenerator.java | 56 +
.../autotag/generate/TemplateGeneratorBuilder.java | 180 +++
.../generate/TemplateGeneratorFactory.java} | 13 +-
.../autotag/generate/TemplateSuiteGenerator.java} | 27 +-
.../generate}/package-info.java | 4 +-
.../autotag/jsp/JspTemplateGeneratorFactory.java | 79 ++
.../org/apache/tiles/autotag/jsp/TLDGenerator.java | 60 +
.../tiles/autotag/jsp/TagClassGenerator.java | 63 ++
.../{freemarker => autotag/jsp}/package-info.java | 4 +-
.../org/apache/tiles/autotag/tool/StringTool.java | 138 +++
.../locale/impl => autotag/tool}/package-info.java | 4 +-
.../tiles/core/definition/dao/DefinitionDAO.java | 1 -
.../pattern/PatternDefinitionResolver.java | 1 -
.../pattern/PrefixedPatternDefinitionResolver.java | 1 -
.../freemarker/template/AddAttributeFMModel.java | 58 +-
.../template/AddListAttributeFMModel.java | 48 +-
.../freemarker/template/DefinitionFMModel.java | 56 +-
.../freemarker/template/GetAsStringFMModel.java | 66 +-
.../template/ImportAttributeFMModel.java | 51 +-
.../template/InsertAttributeFMModel.java | 75 +-
.../template/InsertDefinitionFMModel.java | 91 +-
.../freemarker/template/InsertTemplateFMModel.java | 91 +-
.../freemarker/template/PutAttributeFMModel.java | 64 +-
.../template/PutListAttributeFMModel.java | 54 +-
.../template/SetCurrentContainerFMModel.java | 43 +-
.../template/TilesFMModelRepository.java | 144 ++-
.../tiles/web/jsp/taglib/AddAttributeTag.java | 37 +-
.../tiles/web/jsp/taglib/AddListAttributeTag.java | 19 +-
.../apache/tiles/web/jsp/taglib/DefinitionTag.java | 43 +-
.../tiles/web/jsp/taglib/GetAsStringTag.java | 56 +-
.../tiles/web/jsp/taglib/ImportAttributeTag.java | 31 +-
.../tiles/web/jsp/taglib/InsertAttributeTag.java | 58 +-
.../tiles/web/jsp/taglib/InsertDefinitionTag.java | 61 +-
.../tiles/web/jsp/taglib/InsertTemplateTag.java | 55 +-
.../tiles/web/jsp/taglib/PutAttributeTag.java | 43 +-
.../tiles/web/jsp/taglib/PutListAttributeTag.java | 22 +-
.../web/jsp/taglib/SetCurrentContainerTag.java | 19 +-
.../src/main/resources/META-INF/template-suite.xml | 1188 ++++++++++++++++++++
.../src/main/resources/META-INF/tld/tiles-jsp.tld | 228 ++--
.../apache/tiles/autotag/freemarker/fmModel.vm} | 69 +-
.../apache/tiles/autotag/freemarker/repository.vm} | 48 +-
.../org/apache/tiles/autotag/jsp/bodyTag.vm} | 72 +-
.../resources/org/apache/tiles/autotag/jsp/tld.vm | 66 ++
.../org/apache/tiles/autotag/velocity.properties | 114 ++
.../autotag/freemarker/FMModelGeneratorTest.java | 139 +++
.../freemarker/FMModelRepositoryGeneratorTest.java | 126 +++
.../freemarker/FMTemplateGeneratorFactoryTest.java | 58 +
.../jsp/JspTemplateGeneratorFactoryTest.java | 61 +
.../apache/tiles/autotag/jsp/TLDGeneratorTest.java | 129 +++
.../tiles/autotag/jsp/TagClassGeneratorTest.java | 139 +++
.../tiles/web/jsp/taglib/UseAttributeTagTest.java | 220 ++++
.../autotag/freemarker/test/DoStuffFMModel.javat} | 63 +-
.../freemarker/test/DoStuffNoBodyFMModel.javat} | 53 +-
.../test/TldtestFMModelRepository.javat} | 39 +-
.../tiles/autotag/jsp/test/DoStuffNoBodyTag.java | 134 +++
.../apache/tiles/autotag/jsp/test/DoStuffTag.java | 136 +++
.../resources/tldtest-jsp.tld} | 76 +-
70 files changed, 5020 insertions(+), 990 deletions(-)
create mode 100644 plugins/tiles/src/main/java/org/apache/struts2/tiles/BuildAutotags.java
copy plugins/tiles/src/main/java/org/apache/tiles/{request/render/RenderException.java => autotag/core/AutotagRuntimeException.java} (68%)
create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/freemarker/FMModelGenerator.java
create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/freemarker/FMModelRepositoryGenerator.java
create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/freemarker/FMTemplateGeneratorFactory.java
copy plugins/{portlet-tiles/src/main/java/org/apache/tiles/request/portlet => tiles/src/main/java/org/apache/tiles/autotag/freemarker}/package-info.java (84%)
create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/generate/AbstractTemplateClassGenerator.java
create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/generate/AbstractTemplateSuiteGenerator.java
create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/generate/BasicTemplateGenerator.java
copy plugins/{portlet-tiles/src/main/java/org/apache/tiles/request/portlet/delegate/RequestDelegate.java => tiles/src/main/java/org/apache/tiles/autotag/generate/TemplateClassGenerator.java} (52%)
create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/generate/TemplateGenerator.java
create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/generate/TemplateGeneratorBuilder.java
copy plugins/tiles/src/main/java/org/apache/tiles/{request/RequestWrapper.java => autotag/generate/TemplateGeneratorFactory.java} (76%)
copy plugins/{portlet-tiles/src/main/java/org/apache/tiles/request/portlet/delegate/RequestDelegate.java => tiles/src/main/java/org/apache/tiles/autotag/generate/TemplateSuiteGenerator.java} (61%)
copy plugins/tiles/src/main/java/org/apache/tiles/{freemarker => autotag/generate}/package-info.java (90%)
create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/jsp/JspTemplateGeneratorFactory.java
create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/jsp/TLDGenerator.java
create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/jsp/TagClassGenerator.java
copy plugins/tiles/src/main/java/org/apache/tiles/{freemarker => autotag/jsp}/package-info.java (90%)
create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/tool/StringTool.java
copy plugins/tiles/src/main/java/org/apache/tiles/{core/locale/impl => autotag/tool}/package-info.java (89%)
create mode 100644 plugins/tiles/src/main/resources/META-INF/template-suite.xml
copy plugins/tiles/src/main/{java/org/apache/tiles/freemarker/template/AddListAttributeFMModel.java => resources/org/apache/tiles/autotag/freemarker/fmModel.vm} (52%)
copy plugins/tiles/src/main/{java/org/apache/tiles/freemarker/template/TilesFMModelRepository.java => resources/org/apache/tiles/autotag/freemarker/repository.vm} (51%)
copy plugins/tiles/src/main/{java/org/apache/tiles/web/jsp/taglib/AddListAttributeTag.java => resources/org/apache/tiles/autotag/jsp/bodyTag.vm} (50%)
create mode 100644 plugins/tiles/src/main/resources/org/apache/tiles/autotag/jsp/tld.vm
create mode 100644 plugins/tiles/src/main/resources/org/apache/tiles/autotag/velocity.properties
create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/autotag/freemarker/FMModelGeneratorTest.java
create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/autotag/freemarker/FMModelRepositoryGeneratorTest.java
create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/autotag/freemarker/FMTemplateGeneratorFactoryTest.java
create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/autotag/jsp/JspTemplateGeneratorFactoryTest.java
create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/autotag/jsp/TLDGeneratorTest.java
create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/autotag/jsp/TagClassGeneratorTest.java
create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/web/jsp/taglib/UseAttributeTagTest.java
copy plugins/tiles/src/{main/java/org/apache/tiles/freemarker/template/AddListAttributeFMModel.java => test/resources/org/apache/tiles/autotag/freemarker/test/DoStuffFMModel.javat} (52%)
copy plugins/tiles/src/{main/java/org/apache/tiles/freemarker/template/SetCurrentContainerFMModel.java => test/resources/org/apache/tiles/autotag/freemarker/test/DoStuffNoBodyFMModel.javat} (50%)
copy plugins/tiles/src/{main/java/org/apache/tiles/freemarker/template/TilesFMModelRepository.java => test/resources/org/apache/tiles/autotag/freemarker/test/TldtestFMModelRepository.javat} (52%)
create mode 100644 plugins/tiles/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffNoBodyTag.java
create mode 100644 plugins/tiles/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffTag.java
copy plugins/tiles/src/{main/resources/META-INF/tld/tiles-extras-jsp.tld => test/resources/tldtest-jsp.tld} (62%)