This is an automated email from the ASF dual-hosted git repository.
kusal pushed a change to branch temp/6.3
in repository https://gitbox.apache.org/repos/asf/struts.git
discard 97fc4b0bd Prepare milestone
discard e8ea52fa5 Merge branch 'WW-5379-velocity-stack-alt' into temp/6.3
add 8f4d9a6f6 WW-5381 Introduce RootAccessor interface for extension point
add aef5d5c6c WW-5381 Introduce extension point for CompoundRootAccessor
add f3c160d9d WW-5381 Revert bean removals for backwards compatibility
add 94dd7a526 WW-5362 Removes type attribute out of <s:script/> tag
add 80038f0ca WW-5362 Removes language attribute
add b9c797e1b WW-5362 Removes deprecated language attribute
add 3dabcf127 Merge pull request #812 from
apache/feature/WW-5362-remove-type
add f0ac0a9ad Bump actions/upload-artifact from 3.1.3 to 4.0.0
add 52f14721e Merge pull request #816 from
apache/dependabot/github_actions/actions/upload-artifact-4.0.0
add e98f6ffe5 Bump org.apache.commons:commons-compress from 1.23.0 to
1.24.0
add afa40c17e Merge pull request #818 from
apache/dependabot/maven/org.apache.commons-commons-compress-1.24.0
add 9976ed3f1 Merge pull request #821 from
apache/WW-5378-no-context-fallback
add 8954ad61c WW-5364 Add String.class to system allowlist
add 83a4503a7 Merge pull request #828 from apache/WW-5364-fix-str-access
add 031d66dba Merge pull request #823 from
apache/WW-5381-compoundroot-interface
add 3eddd56d2 WW-5379 Add support for internal and chained contexts
add 450ee91b0 WW-5379 Fix not looking in chained contexts' chained contexts
add ee600f99b WW-5379 Use ValueStackProvider marker interface for Velocity
context implementation flexibility
add 07718b5bf Merge pull request #822 from
apache/WW-5379-velocity-stack-alt
add 469873367 WW-5352 Repackage ParametersInterceptor and related classes
add 2ae36b609 WW-5352 Fix SonarCloud logging warnings
add 19cc1514a WW-5352 Move ParameterNameAware and ParameterValueAware
add fd94c1766 WW-5352 Gut deprecated interfaces
add ed06d61f2 Merge pull request #829 from
apache/WW-5352-parameter-annotation
add 69a7195df Merge branch 'master' into WW-5381-compoundroot-interface-2
add 370d8829d Merge pull request #824 from
apache/WW-5381-compoundroot-interface-2
add cc78033d3 WW-5383 Updates RegEx to excludes JARs by default
add 5e9dd3d69 Merge pull request #830 from
apache/feature/WW-5383-exclude-jars
new a11678060 Merge remote-tracking branch 'origin/master' into fork/6.3
add 32584c355 WW-5382 Fix StrutsInternalTestCase
add 15acd72d2 WW-5382 Fix stale injections in Dispatcher
add 2024d8317 WW-5382 Fix stale bootstrap context on ActionContext
add 6f1e1222b WW-5382 Rework existing Dispatcher tests and base test
classes
add fa5b46c78 WW-5382 Add test for Dispatcher reinjection
add ae71c464a WW-5382 Delete redundant code
add 946737c81 WW-5382 Rework Dispatcher injections
add 3d25caa0a WW-5382 Update Dispatcher#getContainer JavaDoc
new de28971f7 Merge remote-tracking branch 'origin/WW-5382-stale-config'
into fork/6.3
add c322abacb WW-5381 Introduce extension point for MethodAccessor
add 573dbbcea WW-5381 Revert bean removal for backwards compatibility
new 2ac9f5220 Merge remote-tracking branch
'origin/WW-5381-method-accessor' into fork/6.3
new e1b603523 [maven-release-plugin] prepare release
struts2-parent-6.3.0.2-atlassian-2
new 09d31407a [maven-release-plugin] prepare for next development iteration
add fb7fec355 Stops cleaning nightlies to allow to coexist different
versions
add 9a0df704a Merge pull request #834 from apache/fix/do-not-clean
add 3b078995a Merge pull request #826 from apache/WW-5382-stale-config
add d4a0b3b85 WW-5381 Reimplement ability to register additional
MethodAccessors
add 78e97a42e Merge branch 'master' into WW-5381-method-accessor
add 503c8daa1 WW-5381 Remove unnecessary/confusing parameters
add 3b76678c0 Merge pull request #825 from apache/WW-5381-method-accessor
add 8a245e865 WW-5352 Refactor ParametersInterceptor
add aa4398ee2 WW-5352 Do not use setter notation for helper methods
add 199ea0db6 WW-5352 Rename acceptable name/value methods
add ecd02de8b Merge pull request #831 from
apache/WW-5352-parameter-annotation-2
add b9d072d18 Bump org.apache.maven.plugins:maven-release-plugin
add 07cecbf63 Merge pull request #837 from
apache/dependabot/maven/org.apache.maven.plugins-maven-release-plugin-3.0.1
add 5b020eb57 Reduces log level to debug to reduce noise in the logs
add f5a7c31f2 Merge pull request #838 from apache/fix/debug-level
add c5cf3fc28 WW-5379 Add one more method to provide Velocity directives
with ValueStack
new 10cab4497 Merge branch 'WW-5379-directives-valuestack' into temp/6.3
new 6b234f31c Milestone version
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (97fc4b0bd)
\
N -- N -- N refs/heads/temp/6.3 (6b234f31c)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 7 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:
.github/workflows/scorecards-analysis.yaml | 2 +-
Jenkinsfile | 3 +-
.../src/main/webapp/WEB-INF/decorators/main.jsp | 2 +-
.../webapp/WEB-INF/validation/ajaxFormSubmit.jsp | 2 +-
assembly/src/main/resources/template.vm | 8 +-
.../admin/src/main/resources/osgi/admin/shell.ftl | 12 +-
.../src/main/resources/osgi/admin/viewBundle.ftl | 14 +-
.../src/main/resources/osgi/admin/viewBundles.ftl | 10 +-
core/pom.xml | 2 +-
.../opensymphony/xwork2/XWorkJUnit4TestCase.java | 4 -
.../com/opensymphony/xwork2/XWorkTestCase.java | 4 -
.../xwork2/config/impl/DefaultConfiguration.java | 18 +-
.../StrutsDefaultConfigurationProvider.java | 7 -
.../xwork2/interceptor/NoParameters.java | 2 +-
.../interceptor/ParameterFilterInterceptor.java | 4 +-
.../xwork2/interceptor/ParameterNameAware.java | 17 +-
.../xwork2/interceptor/ParameterValueAware.java | 17 +-
.../xwork2/interceptor/ParametersInterceptor.java | 533 +-------
.../com/opensymphony/xwork2/ognl/OgnlUtil.java | 3 +-
.../opensymphony/xwork2/ognl/OgnlValueStack.java | 20 +-
.../xwork2/ognl/OgnlValueStackFactory.java | 89 +-
.../xwork2/ognl/SecurityMemberAccess.java | 9 +-
.../xwork2/ognl/accessor/CompoundRootAccessor.java | 12 +-
.../xwork2/ognl/accessor/RootAccessor.java | 18 +-
.../xwork2/security/AcceptedPatternsChecker.java | 12 +-
.../xwork2/security/ExcludedPatternsChecker.java | 12 +-
.../java/org/apache/struts2/StrutsConstants.java | 6 +
.../org/apache/struts2/action/NoParameters.java | 3 +-
.../apache/struts2/action}/ParameterNameAware.java | 12 +-
.../struts2/action}/ParameterValueAware.java | 20 +-
.../config/StrutsBeanSelectionProvider.java | 8 +-
.../apache/struts2/dispatcher/ContainerHolder.java | 12 +-
.../org/apache/struts2/dispatcher/Dispatcher.java | 159 ++-
.../struts2/dispatcher/ExecuteOperations.java | 4 +-
.../apache/struts2/dispatcher/InitOperations.java | 2 +-
.../apache/struts2/dispatcher/MockDispatcher.java | 42 -
.../org/apache/struts2/dispatcher/Parameter.java | 8 +-
.../struts2/dispatcher/PrepareOperations.java | 8 +-
.../ActionMappingParametersInterceptor.java | 12 +-
.../parameter}/ParametersInterceptor.java | 287 +++--
.../apache/struts2/util/StrutsTestCaseHelper.java | 26 +-
.../apache/struts2/util/ValueStackProvider.java | 12 +-
.../struts2/interceptor/debugging/browser.ftl | 20 +-
.../struts2/interceptor/debugging/console.ftl | 2 +-
core/src/main/resources/struts-beans.xml | 17 +-
.../resources/template/css_xhtml/form-validate.ftl | 2 +-
.../main/resources/template/simple/combobox.ftl | 2 +-
.../resources/template/simple/doubleselect.ftl | 2 +-
.../template/simple/form-close-tooltips.ftl | 2 +-
.../main/resources/template/simple/form-close.ftl | 2 +-
core/src/main/resources/template/simple/head.ftl | 2 +-
.../template/simple/inputtransferselect.ftl | 2 +-
.../template/simple/optiontransferselect.ftl | 2 +-
.../resources/template/simple/updownselect.ftl | 2 +-
.../template/xhtml/form-close-validate.ftl | 2 +-
.../main/resources/template/xhtml/form-close.ftl | 2 +-
.../resources/template/xhtml/form-validate.ftl | 2 +-
.../site/confluence/ww-template-autoexport.html | 2 +-
.../com/opensymphony/xwork2/ognl/OgnlUtilTest.java | 4 +-
.../xwork2/ognl/OgnlValueStackTest.java | 7 +-
.../org/apache/struts2/StrutsInternalTestCase.java | 28 +-
.../struts2/StrutsJUnit4InternalTestCase.java | 61 +-
.../org/apache/struts2/config/SettingsTest.java | 2 +-
.../apache/struts2/dispatcher/DispatcherTest.java | 482 ++++---
.../parameter}/ParametersInterceptorTest.java | 23 +-
.../apache/struts2/views/jsp/AbstractTagTest.java | 6 +-
.../org/apache/struts2/views/jsp/ui/ComboBox-1.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/ComboBox-2.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/ComboBox-3.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/ComboBox-4.txt | 2 +-
.../apache/struts2/views/jsp/ui/DoubleSelect-1.txt | 2 +-
.../apache/struts2/views/jsp/ui/DoubleSelect-2.txt | 2 +-
.../apache/struts2/views/jsp/ui/DoubleSelect-3.txt | 2 +-
.../apache/struts2/views/jsp/ui/DoubleSelect-4.txt | 2 +-
.../apache/struts2/views/jsp/ui/DoubleSelect-5.txt | 2 +-
.../apache/struts2/views/jsp/ui/DoubleSelect-6.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/Formtag-11.txt | 6 +-
.../org/apache/struts2/views/jsp/ui/Formtag-12.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/Formtag-2.txt | 8 +-
.../org/apache/struts2/views/jsp/ui/Formtag-22.txt | 8 +-
.../org/apache/struts2/views/jsp/ui/Formtag-24.txt | 8 +-
.../org/apache/struts2/views/jsp/ui/Formtag-6.txt | 6 +-
.../apache/struts2/views/jsp/ui/HeadTagTest-1.txt | 2 +-
.../struts2/views/jsp/ui/inputtransferselect-1.txt | 2 +-
.../struts2/views/jsp/ui/inputtransferselect-2.txt | 2 +-
.../views/jsp/ui/optiontransferselect-1.txt | 16 +-
.../views/jsp/ui/optiontransferselect-2.txt | 10 +-
.../views/jsp/ui/optiontransferselect-3.txt | 10 +-
.../views/jsp/ui/optiontransferselect-4.txt | 12 +-
.../views/jsp/ui/optiontransferselect-5.txt | 12 +-
.../views/jsp/ui/optiontransferselect-6.txt | 10 +-
.../views/jsp/ui/optiontransferselect-7.txt | 10 +-
.../views/jsp/ui/optiontransferselect-8.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/tooltip-1.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/tooltip-2.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/tooltip-3.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-1.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-10.txt | 10 +-
.../struts2/views/jsp/ui/updownselecttag-11.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-2.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-3.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-4.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-5.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-6.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-7.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-8.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-9.txt | 2 +-
core/src/test/resources/struts.properties | 2 +-
.../PackageBasedActionConfigBuilder.java | 190 +--
.../apache/struts2/validators/DWRValidator.java | 33 +-
plugins/junit/pom.xml | 2 +-
.../apache/struts2/junit/StrutsJUnit4TestCase.java | 10 +-
.../org/apache/struts2/junit/StrutsTestCase.java | 11 +-
plugins/pom.xml | 2 +-
.../portlet/dispatcher/Jsr168Dispatcher.java | 1348 ++++++++++----------
.../apache/struts2/StrutsTestCasePortletTests.java | 24 +-
.../sitemesh/OldDecorator2NewStrutsDecorator.java | 403 +++---
plugins/spring/pom.xml | 2 +-
.../org/apache/struts2/testng/StrutsTestCase.java | 12 +-
plugins/velocity/pom.xml | 2 +-
.../views/velocity/StrutsVelocityContext.java | 10 +-
.../velocity/components/AbstractDirective.java | 49 +-
.../views/velocity/StrutsVelocityContextTest.java | 4 +-
pom.xml | 8 +-
124 files changed, 1989 insertions(+), 2440 deletions(-)
copy
apps/showcase/src/main/java/org/apache/struts2/showcase/model/IdEntity.java =>
core/src/main/java/com/opensymphony/xwork2/ognl/accessor/RootAccessor.java (77%)
copy core/src/main/java/{com/opensymphony/xwork2/interceptor =>
org/apache/struts2/action}/ParameterNameAware.java (81%)
copy core/src/main/java/{com/opensymphony/xwork2/interceptor =>
org/apache/struts2/action}/ParameterValueAware.java (61%)
delete mode 100644
core/src/main/java/org/apache/struts2/dispatcher/MockDispatcher.java
copy core/src/main/java/{com/opensymphony/xwork2/interceptor =>
org/apache/struts2/interceptor/parameter}/ParametersInterceptor.java (67%)
copy plugins/cdi/src/test/java/org/apache/struts2/cdi/FooService.java =>
core/src/main/java/org/apache/struts2/util/ValueStackProvider.java (82%)
copy
plugins/testng/src/main/java/org/apache/struts2/testng/StrutsTestCase.java =>
core/src/test/java/org/apache/struts2/StrutsJUnit4InternalTestCase.java (50%)
rename core/src/test/java/{com/opensymphony/xwork2/interceptor =>
org/apache/struts2/interceptor/parameter}/ParametersInterceptorTest.java (98%)
