This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git.
from 8952cff Merge pull request #391 from
apache/WW-5003-drops-xwork-exception
add 5c55e69 WW-5049 Moves Velocity support into a dedicated plugin
add a7cfed7 WW-5049 Allows define a custom bean provider
add ea8e2b5 Reorder modules to build apps at the end
add d0039d1 WW-5049 Drops name as not needed
add df4e193 WW-5049 Extends xwork DTD as well
add 934b5d1 WW-5049 Includes the new plugin in assembly
add 84f8438 WW-5049 Renames default bean provider
add 868ec77 WW-5049 Adds missing internal dependency
add 7c6dfe1 WW-5049 Sets proper order of configuration elements
add 0009bde WW-5049 Drops unused files
add 9c1b0cf WW-5049 Supports bean-selection via Java config
add 503c8b7 WW-5047 Avoids confusion about scope's default value
add 8d8b306 WW-5049 Drops empty space
add a456b1f WW-5049 Reverts to static final as this will be refactored
anyway
new 59e7caf Merge pull request #384 from apache/WW-5049-velocity-plugin
The 1 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:
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 +
.../config/entities/BeanSelectionConfig.java | 35 +++---
.../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 +-
.../resources/{struts-2.5.dtd => struts-2.6.dtd} | 12 ++-
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 ----
.../resources/template/archive/xhtml/textarea.vm | 22 ----
.../main/resources/template/archive/xhtml/token.vm | 21 ----
.../resources/{xwork-2.5.dtd => xwork-2.6.dtd} | 12 ++-
.../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/{testng => velocity}/pom.xml | 33 +++---
.../views/velocity/StrutsResourceLoader.java | 0
.../views/velocity/StrutsVelocityContext.java | 13 +--
.../velocity/VelocityBeanSelectionProvider.java | 41 ++++---
.../struts2/views/velocity/VelocityConstants.java | 17 +--
.../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 +-
.../src/main/resources/struts-plugin.xml | 22 +++-
.../views/velocity}/result/VelocityResultTest.java | 22 ++--
.../template/VelocityTemplateEngineTest.java | 48 ++++-----
pom.xml | 8 +-
131 files changed, 374 insertions(+), 2033 deletions(-)
rename
core/src/main/java/org/apache/struts2/config/{DefaultBeanSelectionProvider.java
=> StrutsBeanSelectionProvider.java} (98%)
copy
plugins/rest/src/test/java/org/apache/struts2/rest/handler/SimpleBean.java =>
core/src/main/java/org/apache/struts2/config/entities/BeanSelectionConfig.java
(59%)
copy core/src/main/resources/{struts-2.5.dtd => struts-2.6.dtd} (91%)
delete mode 100644 core/src/main/resources/template/archive/ajax/a-close.vm
delete mode 100644 core/src/main/resources/template/archive/ajax/a.vm
delete mode 100644 core/src/main/resources/template/archive/ajax/div-close.vm
delete mode 100644 core/src/main/resources/template/archive/ajax/div.vm
delete mode 100644 core/src/main/resources/template/archive/ajax/form-close.vm
delete mode 100644 core/src/main/resources/template/archive/ajax/form.vm
delete mode 100644 core/src/main/resources/template/archive/ajax/submit.vm
delete mode 100644 core/src/main/resources/template/archive/ajax/tab-close.vm
delete mode 100644 core/src/main/resources/template/archive/ajax/tab.vm
delete mode 100644 core/src/main/resources/template/archive/simple/checkbox.vm
delete mode 100644
core/src/main/resources/template/archive/simple/checkboxlist.vm
delete mode 100644 core/src/main/resources/template/archive/simple/combobox.vm
delete mode 100644 core/src/main/resources/template/archive/simple/debug.vm
delete mode 100644
core/src/main/resources/template/archive/simple/doubleselect.vm
delete mode 100644 core/src/main/resources/template/archive/simple/empty.vm
delete mode 100644 core/src/main/resources/template/archive/simple/file.vm
delete mode 100644
core/src/main/resources/template/archive/simple/form-close.vm
delete mode 100644 core/src/main/resources/template/archive/simple/form.vm
delete mode 100644 core/src/main/resources/template/archive/simple/hidden.vm
delete mode 100644 core/src/main/resources/template/archive/simple/label.vm
delete mode 100644 core/src/main/resources/template/archive/simple/password.vm
delete mode 100644 core/src/main/resources/template/archive/simple/radiomap.vm
delete mode 100644
core/src/main/resources/template/archive/simple/scripting-events.vm
delete mode 100644 core/src/main/resources/template/archive/simple/select.vm
delete mode 100644 core/src/main/resources/template/archive/simple/submit.vm
delete mode 100644 core/src/main/resources/template/archive/simple/table.vm
delete mode 100644 core/src/main/resources/template/archive/simple/text.vm
delete mode 100644 core/src/main/resources/template/archive/simple/textarea.vm
delete mode 100644 core/src/main/resources/template/archive/simple/token.vm
delete mode 100644 core/src/main/resources/template/archive/xhtml/checkbox.vm
delete mode 100644
core/src/main/resources/template/archive/xhtml/checkboxlist.vm
delete mode 100644 core/src/main/resources/template/archive/xhtml/combobox.vm
delete mode 100644
core/src/main/resources/template/archive/xhtml/controlfooter.vm
delete mode 100644
core/src/main/resources/template/archive/xhtml/controlheader.vm
delete mode 100644 core/src/main/resources/template/archive/xhtml/debug.vm
delete mode 100644
core/src/main/resources/template/archive/xhtml/doubleselect.vm
delete mode 100644 core/src/main/resources/template/archive/xhtml/empty.vm
delete mode 100644 core/src/main/resources/template/archive/xhtml/file.vm
delete mode 100644 core/src/main/resources/template/archive/xhtml/form-close.vm
delete mode 100644 core/src/main/resources/template/archive/xhtml/form.vm
delete mode 100644 core/src/main/resources/template/archive/xhtml/hidden.vm
delete mode 100644 core/src/main/resources/template/archive/xhtml/label.vm
delete mode 100644 core/src/main/resources/template/archive/xhtml/password.vm
delete mode 100644 core/src/main/resources/template/archive/xhtml/radiomap.vm
delete mode 100644 core/src/main/resources/template/archive/xhtml/select.vm
delete mode 100644 core/src/main/resources/template/archive/xhtml/submit.vm
delete mode 100644 core/src/main/resources/template/archive/xhtml/table.vm
delete mode 100644 core/src/main/resources/template/archive/xhtml/text.vm
delete mode 100644 core/src/main/resources/template/archive/xhtml/textarea.vm
delete mode 100644 core/src/main/resources/template/archive/xhtml/token.vm
copy core/src/main/resources/{xwork-2.5.dtd => xwork-2.6.dtd} (92%)
rename
core/src/test/java/org/apache/struts2/config/{DefaultBeanSelectionProviderTest.java
=> StrutsBeanSelectionProviderTest.java} (97%)
copy core/src/{main/java/org/apache/struts2/config/NullResult.java =>
test/java/org/apache/struts2/config/TestBeanSelectionProvider.java} (63%)
copy plugins/{testng => velocity}/pom.xml (72%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/StrutsResourceLoader.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityContext.java
(87%)
copy
core/src/main/java/org/apache/struts2/config/DefaultPropertiesProvider.java =>
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/VelocityBeanSelectionProvider.java
(55%)
copy
apps/showcase/src/main/java/org/apache/struts2/showcase/model/IdEntity.java =>
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/VelocityConstants.java
(75%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java
(95%)
copy core/src/main/java/org/apache/struts2/views/DefaultTagLibrary.java =>
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/VelocityTagLibrary.java
(86%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/ActionDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/ActionErrorDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/ActionMessageDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/AnchorDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/BeanDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxListDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/ComboBoxDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/ComponentDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/DateDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/DoubleSelectDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/FieldErrorDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/FileDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/FormDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/HeadDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/HiddenDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/I18nDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/IncludeDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/InputTransferSelectDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/LabelDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/OptGroupDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/OptionTransferSelectDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/ParamDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/PropertyDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/PushDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/RadioDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/ResetDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/SelectDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/SetDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/SubmitDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/TextAreaDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/TextDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/TextFieldDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/TokenDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/URLDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/components/UpDownSelectDirective.java
(100%)
rename {core =>
plugins/velocity}/src/main/java/org/apache/struts2/views/velocity/package.html
(100%)
rename {core/src/main/java/org/apache/struts2 =>
plugins/velocity/src/main/java/org/apache/struts2/views/velocity}/result/VelocityResult.java
(98%)
rename {core/src/main/java/org/apache/struts2/components =>
plugins/velocity/src/main/java/org/apache/struts2/views/velocity}/template/VelocityTemplateEngine.java
(93%)
copy plugins/{javatemplates => velocity}/src/main/resources/struts-plugin.xml
(54%)
rename {core/src/test/java/org/apache/struts2 =>
plugins/velocity/src/test/java/org/apache/struts2/views/velocity}/result/VelocityResultTest.java
(85%)
copy
core/src/test/java/org/apache/struts2/views/TemplateEngineManagerTest.java =>
plugins/velocity/src/test/java/org/apache/struts2/views/velocity/template/VelocityTemplateEngineTest.java
(84%)
