This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch temp/6.3
in repository https://gitbox.apache.org/repos/asf/struts.git
commit a116780601b8c6fd20c53e1dfdfb58ed8c3628ea
Merge: 8dd4bdabf 5e9dd3d69
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Fri Jan 5 13:09:22 2024 +1100
Merge remote-tracking branch 'origin/master' into fork/6.3
.github/workflows/codeql.yml | 6 +-
.github/workflows/scorecards-analysis.yaml | 4 +-
Jenkinsfile | 81 +++-
.../showcase/fileupload/FileUploadAction.java | 122 +++--
.../src/main/webapp/WEB-INF/decorators/main.jsp | 2 +-
.../webapp/WEB-INF/fileupload/upload-success.jsp | 9 +-
.../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 +-
.../xwork2/config/impl/DefaultConfiguration.java | 7 +-
.../StrutsDefaultConfigurationProvider.java | 3 -
.../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 | 64 +--
.../xwork2/ognl/OgnlValueStackFactory.java | 33 +-
.../xwork2/ognl/SecurityMemberAccess.java | 9 +-
.../xwork2/ognl/accessor/CompoundRootAccessor.java | 12 +-
.../xwork2/ognl/accessor/RootAccessor.java} | 14 +-
.../xwork2/util/MemberAccessValueStack.java | 16 -
.../java/org/apache/struts2/StrutsConstants.java | 11 +
.../org/apache/struts2/action/CspReportAction.java | 2 +-
.../org/apache/struts2/action/NoParameters.java | 3 +-
.../apache/struts2/action}/ParameterNameAware.java | 12 +-
.../struts2/action}/ParameterValueAware.java | 20 +-
.../{NoParameters.java => UploadedFilesAware.java} | 23 +-
.../config/StrutsBeanSelectionProvider.java | 6 +-
.../multipart/JakartaMultiPartRequest.java | 6 +-
.../multipart/JakartaStreamMultiPartRequest.java | 42 +-
.../dispatcher/multipart/StrutsUploadedFile.java | 64 ++-
.../struts2/dispatcher/multipart/UploadedFile.java | 8 +-
.../interceptor/AbstractFileUploadInterceptor.java | 263 ++++++++++
.../interceptor/ActionFileUploadInterceptor.java | 191 ++++++++
.../ActionMappingParametersInterceptor.java | 6 +-
.../struts2/interceptor/FileUploadInterceptor.java | 265 ++--------
.../parameter}/ParametersInterceptor.java | 15 +-
.../apache/struts2/util/ValueStackProvider.java} | 15 +-
.../struts2/interceptor/debugging/browser.ftl | 20 +-
.../struts2/interceptor/debugging/console.ftl | 2 +-
.../apache/struts2/struts-messages_en.properties | 27 +-
core/src/main/resources/struts-beans.xml | 12 +-
core/src/main/resources/struts-default.xml | 9 +
.../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 | 18 +-
.../conversion/UploadedFileConverterTest.java | 19 +-
...t.java => ActionFileUploadInterceptorTest.java} | 369 +++++++-------
.../interceptor/FileUploadInterceptorTest.java | 182 +++----
.../parameter}/ParametersInterceptorTest.java | 21 +-
.../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 +-
.../PackageBasedActionConfigBuilder.java | 190 ++++----
.../dispatcher/multipart/PellMultiPartRequest.java | 13 +-
.../views/velocity/StrutsVelocityContext.java | 14 +-
.../velocity/components/AbstractDirective.java | 33 +-
.../views/velocity/StrutsVelocityContextTest.java | 4 +-
pom.xml | 2 +-
113 files changed, 1538 insertions(+), 1565 deletions(-)
diff --cc
plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java
index 318a14c53,539f64bdd..34e06aad7
---
a/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java
+++
b/plugins/velocity/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java
@@@ -20,12 -20,14 +20,17 @@@ package org.apache.struts2.views.veloci
import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.components.Component;
+ import org.apache.struts2.util.ValueStackProvider;
+ import org.apache.struts2.views.util.ContextUtil;
+ import org.apache.velocity.context.AbstractContext;
+ import org.apache.velocity.context.Context;
import org.apache.velocity.context.InternalContextAdapter;
+ import org.apache.velocity.context.InternalWrapperContext;
import org.apache.velocity.exception.MethodInvocationException;
import org.apache.velocity.exception.ParseErrorException;
import org.apache.velocity.exception.ResourceNotFoundException;
