struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject [struts] 01/01: Merge pull request #384 from apache/WW-5049-velocity-plugin
Date Sun, 29 Dec 2019 15:30:46 GMT
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 59e7caf404021b5dd54716ac5a61ce5b9a53f231
Merge: 8952cff a456b1f
Author: Lukasz Lenart <lukaszlenart@apache.org>
AuthorDate: Sun Dec 29 16:30:34 2019 +0100

    Merge pull request #384 from apache/WW-5049-velocity-plugin
    
    [WW-5049] Velocity plugin

 apps/showcase/pom.xml                              |   5 +
 .../showcase/src/main/resources/struts-tags-ui.xml |   2 +-
 assembly/src/main/assembly/all.xml                 |   4 +
 .../config/providers/XmlConfigurationProvider.java |  22 ++-
 .../java/org/apache/struts2/StrutsConstants.java   |   3 -
 ...vider.java => StrutsBeanSelectionProvider.java} |   6 +-
 .../struts2/config/StrutsJavaConfiguration.java    |   4 +
 .../config/StrutsJavaConfigurationProvider.java    |  35 ++++-
 .../config/StrutsXmlConfigurationProvider.java     |   1 +
 .../entities/BeanSelectionConfig.java}             |  33 ++---
 .../struts2/config/entities/ConstantConfig.java    |   1 -
 .../org/apache/struts2/dispatcher/Dispatcher.java  |   4 +-
 .../struts2/dispatcher/StaticContentLoader.java    | 120 ++++++++--------
 .../apache/struts2/views/DefaultTagLibrary.java    |  90 +-----------
 .../struts2/views/TagLibraryDirectiveProvider.java |   2 +-
 core/src/main/resources/struts-2.6.dtd             | 157 +++++++++++++++++++++
 core/src/main/resources/struts-default.xml         |   8 +-
 .../resources/template/archive/ajax/a-close.vm     |  21 ---
 core/src/main/resources/template/archive/ajax/a.vm |  33 -----
 .../resources/template/archive/ajax/div-close.vm   |  21 ---
 .../main/resources/template/archive/ajax/div.vm    |  35 -----
 .../resources/template/archive/ajax/form-close.vm  |  22 ---
 .../main/resources/template/archive/ajax/form.vm   |  39 -----
 .../main/resources/template/archive/ajax/submit.vm |  33 -----
 .../resources/template/archive/ajax/tab-close.vm   |  27 ----
 .../main/resources/template/archive/ajax/tab.vm    |  37 -----
 .../resources/template/archive/simple/checkbox.vm  |  30 ----
 .../template/archive/simple/checkboxlist.vm        |  45 ------
 .../resources/template/archive/simple/combobox.vm  |  43 ------
 .../resources/template/archive/simple/debug.vm     |  85 -----------
 .../template/archive/simple/doubleselect.vm        | 108 --------------
 .../resources/template/archive/simple/empty.vm     |  20 ---
 .../main/resources/template/archive/simple/file.vm |  32 -----
 .../template/archive/simple/form-close.vm          |  21 ---
 .../main/resources/template/archive/simple/form.vm |  32 -----
 .../resources/template/archive/simple/hidden.vm    |  28 ----
 .../resources/template/archive/simple/label.vm     |  26 ----
 .../resources/template/archive/simple/password.vm  |  34 -----
 .../resources/template/archive/simple/radiomap.vm  |  55 --------
 .../template/archive/simple/scripting-events.vm    |  34 -----
 .../resources/template/archive/simple/select.vm    |  63 ---------
 .../resources/template/archive/simple/submit.vm    |  27 ----
 .../resources/template/archive/simple/table.vm     | 101 -------------
 .../main/resources/template/archive/simple/text.vm |  34 -----
 .../resources/template/archive/simple/textarea.vm  |  33 -----
 .../resources/template/archive/simple/token.vm     |  22 ---
 .../resources/template/archive/xhtml/checkbox.vm   |  39 -----
 .../template/archive/xhtml/checkboxlist.vm         |  23 ---
 .../resources/template/archive/xhtml/combobox.vm   |  21 ---
 .../template/archive/xhtml/controlfooter.vm        |  22 ---
 .../template/archive/xhtml/controlheader.vm        |  47 ------
 .../main/resources/template/archive/xhtml/debug.vm |  21 ---
 .../template/archive/xhtml/doubleselect.vm         |  21 ---
 .../main/resources/template/archive/xhtml/empty.vm |  20 ---
 .../main/resources/template/archive/xhtml/file.vm  |  21 ---
 .../resources/template/archive/xhtml/form-close.vm |  22 ---
 .../main/resources/template/archive/xhtml/form.vm  |  28 ----
 .../resources/template/archive/xhtml/hidden.vm     |  21 ---
 .../main/resources/template/archive/xhtml/label.vm |  21 ---
 .../resources/template/archive/xhtml/password.vm   |  21 ---
 .../resources/template/archive/xhtml/radiomap.vm   |  21 ---
 .../resources/template/archive/xhtml/select.vm     |  21 ---
 .../resources/template/archive/xhtml/submit.vm     |  23 ---
 .../main/resources/template/archive/xhtml/table.vm |  21 ---
 .../main/resources/template/archive/xhtml/text.vm  |  21 ---
 .../main/resources/template/archive/xhtml/token.vm |  21 ---
 core/src/main/resources/xwork-2.6.dtd              | 157 +++++++++++++++++++++
 .../xwork2/util/location/LocationUtilsTest.java    |   6 +
 ...t.java => StrutsBeanSelectionProviderTest.java} |   2 +-
 .../StrutsJavaConfigurationProviderTest.java       |  28 +++-
 .../struts2/config/TestBeanSelectionProvider.java} |  17 +--
 .../struts2/views/TemplateEngineManagerTest.java   |  12 +-
 plugins/config-browser/pom.xml                     |   7 +
 .../struts2/config_browser/ShowBeansAction.java    |   3 +-
 plugins/osgi/pom.xml                               |  10 +-
 plugins/pom.xml                                    |   3 +-
 plugins/portlet/pom.xml                            |   5 +
 plugins/sitemesh/pom.xml                           |  11 +-
 plugins/{sitemesh => velocity}/pom.xml             |  39 +++--
 .../views/velocity/StrutsResourceLoader.java       |   0
 .../views/velocity/StrutsVelocityContext.java      |  13 +-
 .../velocity/VelocityBeanSelectionProvider.java    |  55 ++++++++
 .../struts2/views/velocity/VelocityConstants.java  |  14 +-
 .../struts2/views/velocity/VelocityManager.java    |  52 +++----
 .../struts2/views/velocity/VelocityTagLibrary.java |  33 ++---
 .../velocity/components/AbstractDirective.java     |   0
 .../views/velocity/components/ActionDirective.java |   0
 .../velocity/components/ActionErrorDirective.java  |   0
 .../components/ActionMessageDirective.java         |   0
 .../views/velocity/components/AnchorDirective.java |   0
 .../views/velocity/components/BeanDirective.java   |   0
 .../velocity/components/CheckBoxDirective.java     |   0
 .../velocity/components/CheckBoxListDirective.java |   0
 .../velocity/components/ComboBoxDirective.java     |   0
 .../velocity/components/ComponentDirective.java    |   0
 .../views/velocity/components/DateDirective.java   |   0
 .../velocity/components/DoubleSelectDirective.java |   0
 .../velocity/components/FieldErrorDirective.java   |   0
 .../views/velocity/components/FileDirective.java   |   0
 .../views/velocity/components/FormDirective.java   |   0
 .../views/velocity/components/HeadDirective.java   |   0
 .../views/velocity/components/HiddenDirective.java |   0
 .../views/velocity/components/I18nDirective.java   |   0
 .../velocity/components/IncludeDirective.java      |   0
 .../components/InputTransferSelectDirective.java   |   0
 .../views/velocity/components/LabelDirective.java  |   0
 .../velocity/components/OptGroupDirective.java     |   0
 .../components/OptionTransferSelectDirective.java  |   0
 .../views/velocity/components/ParamDirective.java  |   0
 .../velocity/components/PasswordDirective.java     |   0
 .../velocity/components/PropertyDirective.java     |   0
 .../views/velocity/components/PushDirective.java   |   0
 .../views/velocity/components/RadioDirective.java  |   0
 .../views/velocity/components/ResetDirective.java  |   0
 .../views/velocity/components/SelectDirective.java |   0
 .../views/velocity/components/SetDirective.java    |   0
 .../views/velocity/components/SubmitDirective.java |   0
 .../velocity/components/TextAreaDirective.java     |   0
 .../views/velocity/components/TextDirective.java   |   0
 .../velocity/components/TextFieldDirective.java    |   0
 .../views/velocity/components/TokenDirective.java  |   0
 .../views/velocity/components/URLDirective.java    |   0
 .../velocity/components/UpDownSelectDirective.java |   0
 .../org/apache/struts2/views/velocity/package.html |   0
 .../views/velocity}/result/VelocityResult.java     |   3 +-
 .../velocity}/template/VelocityTemplateEngine.java |   6 +-
 .../velocity/src/main/resources/struts-plugin.xml  |  44 ++++++
 .../views/velocity}/result/VelocityResultTest.java |  22 +--
 .../template/VelocityTemplateEngineTest.java       |  48 +++----
 pom.xml                                            |   8 +-
 130 files changed, 744 insertions(+), 1968 deletions(-)


Mime
View raw message