From 83cb936c3a9536d9fe9105a7e7fb2de8d567068a Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Sat, 2 Nov 2024 15:06:29 +0100 Subject: [PATCH] WW-5459 Moves ActionChainResult into org.apache.struts2.result package --- .../org/apache/struts2/ActionInvocation.java | 1 + .../struts2/DefaultActionInvocation.java | 1 + .../interceptor/ChainingInterceptor.java | 2 +- .../{ => result}/ActionChainResult.java | 12 ++++++++---- .../org/apache/struts2/result/Result.java | 4 +--- core/src/main/resources/struts-default.xml | 2 +- core/src/main/resources/xwork-default.xml | 2 +- .../apache/struts2/ActionChainResultTest.java | 1 + .../org/apache/struts2/ChainResultTest.java | 2 +- .../struts2/DefaultActionInvocationTest.java | 1 + ...onfigurationProviderOgnlAllowlistTest.java | 4 ++-- .../providers/MockConfigurationProvider.java | 2 +- ...gurationProviderExceptionMappingsTest.java | 2 +- ...mlConfigurationProviderMultilevelTest.java | 2 +- .../XmlConfigurationProviderResultsTest.java | 2 +- .../interceptor/ChainingInterceptorTest.java | 2 +- .../ChainingInterceptorWithConfigTest.java | 2 +- .../struts2/config/providers/xwork- test.xml | 2 +- .../config/providers/xwork-include-parent.xml | 2 +- ...rk-test-actions-packagedefaultclassref.xml | 2 +- .../config/providers/xwork-test-actions.xml | 2 +- .../providers/xwork-test-allowlist-2.xml | 2 +- .../xwork-test-exception-mappings.xml | 2 +- .../providers/xwork-test-multilevel.xml | 2 +- .../xwork-test-result-inheritance.xml | 2 +- .../providers/xwork-test-result-names.xml | 2 +- .../config/providers/xwork-test-results.xml | 2 +- core/src/test/resources/xwork - jar.jar | Bin 2042 -> 902 bytes core/src/test/resources/xwork - zip.zip | Bin 2653 -> 3117 bytes core/src/test/resources/xwork-jar.jar | Bin 2026 -> 898 bytes core/src/test/resources/xwork-proxyinvoke.xml | 2 +- .../src/test/resources/xwork-test-default.xml | 2 +- .../test/resources/xwork-test-validation.xml | 2 +- core/src/test/resources/xwork-zip.zip | Bin 2645 -> 3084 bytes .../PackageBasedActionConfigBuilderTest.java | 2 +- .../spring/SpringObjectFactoryTest.java | 2 +- .../struts2/spring/actionContext-xwork.xml | 2 +- 37 files changed, 41 insertions(+), 35 deletions(-) rename core/src/main/java/org/apache/struts2/{ => result}/ActionChainResult.java (97%) diff --git a/core/src/main/java/org/apache/struts2/ActionInvocation.java b/core/src/main/java/org/apache/struts2/ActionInvocation.java index b38014980..bd52e185a 100644 --- a/core/src/main/java/org/apache/struts2/ActionInvocation.java +++ b/core/src/main/java/org/apache/struts2/ActionInvocation.java @@ -20,6 +20,7 @@ package org.apache.struts2; import org.apache.struts2.action.Action; import org.apache.struts2.interceptor.PreResultListener; +import org.apache.struts2.result.ActionChainResult; import org.apache.struts2.result.Result; import org.apache.struts2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/DefaultActionInvocation.java b/core/src/main/java/org/apache/struts2/DefaultActionInvocation.java index 17ab2e71e..cc477abc2 100644 --- a/core/src/main/java/org/apache/struts2/DefaultActionInvocation.java +++ b/core/src/main/java/org/apache/struts2/DefaultActionInvocation.java @@ -34,6 +34,7 @@ import org.apache.struts2.interceptor.Interceptor; import org.apache.struts2.interceptor.PreResultListener; import org.apache.struts2.interceptor.WithLazyParams; import org.apache.struts2.ognl.OgnlUtil; +import org.apache.struts2.result.ActionChainResult; import org.apache.struts2.result.Result; import org.apache.struts2.util.ValueStack; import org.apache.struts2.util.ValueStackFactory; diff --git a/core/src/main/java/org/apache/struts2/interceptor/ChainingInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ChainingInterceptor.java index f7755d212..c114d65e1 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/ChainingInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ChainingInterceptor.java @@ -20,7 +20,7 @@ package org.apache.struts2.interceptor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.struts2.ActionChainResult; +import org.apache.struts2.result.ActionChainResult; import org.apache.struts2.ActionInvocation; import org.apache.struts2.StrutsConstants; import org.apache.struts2.Unchainable; diff --git a/core/src/main/java/org/apache/struts2/ActionChainResult.java b/core/src/main/java/org/apache/struts2/result/ActionChainResult.java similarity index 97% rename from core/src/main/java/org/apache/struts2/ActionChainResult.java rename to core/src/main/java/org/apache/struts2/result/ActionChainResult.java index 30f59b1a6..ba1ca315f 100644 --- a/core/src/main/java/org/apache/struts2/ActionChainResult.java +++ b/core/src/main/java/org/apache/struts2/result/ActionChainResult.java @@ -16,13 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.struts2; +package org.apache.struts2.result; +import org.apache.struts2.ActionContext; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.ActionProxy; +import org.apache.struts2.ActionProxyFactory; +import org.apache.struts2.StrutsException; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.TextParseUtil; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.struts2.inject.Inject; -import org.apache.struts2.result.Result; -import org.apache.struts2.util.TextParseUtil; import java.util.HashSet; import java.util.LinkedList; diff --git a/core/src/main/java/org/apache/struts2/result/Result.java b/core/src/main/java/org/apache/struts2/result/Result.java index fbbc86cd3..082e4866f 100644 --- a/core/src/main/java/org/apache/struts2/result/Result.java +++ b/core/src/main/java/org/apache/struts2/result/Result.java @@ -18,10 +18,8 @@ */ package org.apache.struts2.result; -import org.apache.struts2.Action; -import org.apache.struts2.ActionInvocation; - import org.apache.struts2.action.Action; +import org.apache.struts2.ActionInvocation; import java.io.Serializable; diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml index 4f2ccb18d..f9a0eced0 100644 --- a/core/src/main/resources/struts-default.xml +++ b/core/src/main/resources/struts-default.xml @@ -31,7 +31,7 @@ - + diff --git a/core/src/main/resources/xwork-default.xml b/core/src/main/resources/xwork-default.xml index e56b2e6e0..504c21b35 100644 --- a/core/src/main/resources/xwork-default.xml +++ b/core/src/main/resources/xwork-default.xml @@ -26,7 +26,7 @@ - + diff --git a/core/src/test/java/org/apache/struts2/ActionChainResultTest.java b/core/src/test/java/org/apache/struts2/ActionChainResultTest.java index 58f4ea90a..11075c9cc 100644 --- a/core/src/test/java/org/apache/struts2/ActionChainResultTest.java +++ b/core/src/test/java/org/apache/struts2/ActionChainResultTest.java @@ -18,6 +18,7 @@ */ package org.apache.struts2; +import org.apache.struts2.result.ActionChainResult; import org.apache.struts2.result.Result; import org.junit.Test; diff --git a/core/src/test/java/org/apache/struts2/ChainResultTest.java b/core/src/test/java/org/apache/struts2/ChainResultTest.java index dbdecf2c8..109d72352 100644 --- a/core/src/test/java/org/apache/struts2/ChainResultTest.java +++ b/core/src/test/java/org/apache/struts2/ChainResultTest.java @@ -21,9 +21,9 @@ package org.apache.struts2; import com.mockobjects.dynamic.Mock; import org.apache.struts2.config.providers.XmlConfigurationProvider; import org.apache.struts2.mock.MockResult; +import org.apache.struts2.result.ActionChainResult; import org.apache.struts2.util.ValueStack; import junit.framework.TestCase; -import org.apache.struts2.StrutsException; import org.apache.struts2.config.StrutsXmlConfigurationProvider; import java.util.HashMap; diff --git a/core/src/test/java/org/apache/struts2/DefaultActionInvocationTest.java b/core/src/test/java/org/apache/struts2/DefaultActionInvocationTest.java index b853a23ce..76d3cd432 100644 --- a/core/src/test/java/org/apache/struts2/DefaultActionInvocationTest.java +++ b/core/src/test/java/org/apache/struts2/DefaultActionInvocationTest.java @@ -28,6 +28,7 @@ import org.apache.struts2.interceptor.Interceptor; import org.apache.struts2.mock.MockActionProxy; import org.apache.struts2.mock.MockInterceptor; import org.apache.struts2.mock.MockResult; +import org.apache.struts2.result.ActionChainResult; import org.apache.struts2.result.Result; import org.apache.struts2.util.ValueStack; import org.apache.struts2.util.ValueStackFactory; diff --git a/core/src/test/java/org/apache/struts2/config/providers/ConfigurationProviderOgnlAllowlistTest.java b/core/src/test/java/org/apache/struts2/config/providers/ConfigurationProviderOgnlAllowlistTest.java index 7d243150a..f0eabcc3a 100644 --- a/core/src/test/java/org/apache/struts2/config/providers/ConfigurationProviderOgnlAllowlistTest.java +++ b/core/src/test/java/org/apache/struts2/config/providers/ConfigurationProviderOgnlAllowlistTest.java @@ -51,7 +51,7 @@ public class ConfigurationProviderOgnlAllowlistTest extends XWorkJUnit4TestCase Class.forName("org.apache.struts2.mock.MockResult"), Class.forName("org.apache.struts2.interceptor.ConditionalInterceptor"), Class.forName("org.apache.struts2.ActionSupport"), - Class.forName("org.apache.struts2.ActionChainResult"), + Class.forName("org.apache.struts2.result.ActionChainResult"), Class.forName("org.apache.struts2.TextProvider"), Class.forName("org.apache.struts2.interceptor.NoOpInterceptor"), Class.forName("org.apache.struts2.interceptor.Interceptor"), @@ -100,7 +100,7 @@ public class ConfigurationProviderOgnlAllowlistTest extends XWorkJUnit4TestCase Class.forName("java.io.Serializable"), Class.forName("org.apache.struts2.interceptor.ConditionalInterceptor"), Class.forName("org.apache.struts2.ActionSupport"), - Class.forName("org.apache.struts2.ActionChainResult"), + Class.forName("org.apache.struts2.result.ActionChainResult"), Class.forName("org.apache.struts2.TextProvider"), Class.forName("org.apache.struts2.interceptor.NoOpInterceptor"), Class.forName("org.apache.struts2.interceptor.Interceptor"), diff --git a/core/src/test/java/org/apache/struts2/config/providers/MockConfigurationProvider.java b/core/src/test/java/org/apache/struts2/config/providers/MockConfigurationProvider.java index 197008175..7b89a4ad7 100644 --- a/core/src/test/java/org/apache/struts2/config/providers/MockConfigurationProvider.java +++ b/core/src/test/java/org/apache/struts2/config/providers/MockConfigurationProvider.java @@ -19,7 +19,7 @@ package org.apache.struts2.config.providers; import org.apache.struts2.action.Action; -import org.apache.struts2.ActionChainResult; +import org.apache.struts2.result.ActionChainResult; import org.apache.struts2.ModelDrivenAction; import org.apache.struts2.ObjectFactory; import org.apache.struts2.SimpleAction; diff --git a/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderExceptionMappingsTest.java b/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderExceptionMappingsTest.java index d120e91d2..af68d7dc6 100644 --- a/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderExceptionMappingsTest.java +++ b/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderExceptionMappingsTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.config.providers; -import org.apache.struts2.ActionChainResult; +import org.apache.struts2.result.ActionChainResult; import org.apache.struts2.SimpleAction; import org.apache.struts2.config.ConfigurationException; import org.apache.struts2.config.ConfigurationProvider; diff --git a/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderMultilevelTest.java b/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderMultilevelTest.java index cd6827fa1..a1fdcaccf 100644 --- a/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderMultilevelTest.java +++ b/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderMultilevelTest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.config.providers; -import org.apache.struts2.ActionChainResult; +import org.apache.struts2.result.ActionChainResult; import org.apache.struts2.config.ConfigurationProvider; import org.apache.struts2.config.entities.ActionConfig; import org.apache.struts2.config.entities.InterceptorMapping; diff --git a/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderResultsTest.java b/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderResultsTest.java index ba9ab6564..1f7285db9 100644 --- a/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderResultsTest.java +++ b/core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderResultsTest.java @@ -19,7 +19,7 @@ package org.apache.struts2.config.providers; import org.apache.struts2.action.Action; -import org.apache.struts2.ActionChainResult; +import org.apache.struts2.result.ActionChainResult; import org.apache.struts2.SimpleAction; import org.apache.struts2.config.ConfigurationException; import org.apache.struts2.config.ConfigurationProvider; diff --git a/core/src/test/java/org/apache/struts2/interceptor/ChainingInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/ChainingInterceptorTest.java index 9fa6f2613..85df164cc 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/ChainingInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/ChainingInterceptorTest.java @@ -20,7 +20,7 @@ package org.apache.struts2.interceptor; import com.mockobjects.dynamic.Mock; import org.apache.struts2.action.Action; -import org.apache.struts2.ActionChainResult; +import org.apache.struts2.result.ActionChainResult; import org.apache.struts2.ActionContext; import org.apache.struts2.ActionInvocation; import org.apache.struts2.SimpleAction; diff --git a/core/src/test/java/org/apache/struts2/interceptor/ChainingInterceptorWithConfigTest.java b/core/src/test/java/org/apache/struts2/interceptor/ChainingInterceptorWithConfigTest.java index b8e912705..88d5fcc8c 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/ChainingInterceptorWithConfigTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/ChainingInterceptorWithConfigTest.java @@ -19,7 +19,7 @@ package org.apache.struts2.interceptor; import org.apache.struts2.action.Action; -import org.apache.struts2.ActionChainResult; +import org.apache.struts2.result.ActionChainResult; import org.apache.struts2.ActionProxy; import org.apache.struts2.ActionProxyFactory; import org.apache.struts2.DefaultActionProxyFactory; diff --git a/core/src/test/resources/org/apache/struts2/config/providers/xwork- test.xml b/core/src/test/resources/org/apache/struts2/config/providers/xwork- test.xml index 42941e5f2..4febcad9d 100644 --- a/core/src/test/resources/org/apache/struts2/config/providers/xwork- test.xml +++ b/core/src/test/resources/org/apache/struts2/config/providers/xwork- test.xml @@ -26,7 +26,7 @@ - + diff --git a/core/src/test/resources/org/apache/struts2/config/providers/xwork-include-parent.xml b/core/src/test/resources/org/apache/struts2/config/providers/xwork-include-parent.xml index ca38ab0ab..d74c500f2 100644 --- a/core/src/test/resources/org/apache/struts2/config/providers/xwork-include-parent.xml +++ b/core/src/test/resources/org/apache/struts2/config/providers/xwork-include-parent.xml @@ -27,7 +27,7 @@ - + diff --git a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-actions-packagedefaultclassref.xml b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-actions-packagedefaultclassref.xml index f94e7fd13..0e0259b47 100644 --- a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-actions-packagedefaultclassref.xml +++ b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-actions-packagedefaultclassref.xml @@ -26,7 +26,7 @@ - + diff --git a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-actions.xml b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-actions.xml index 42941e5f2..4febcad9d 100644 --- a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-actions.xml +++ b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-actions.xml @@ -26,7 +26,7 @@ - + diff --git a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-allowlist-2.xml b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-allowlist-2.xml index d920b03bd..ff884c86c 100644 --- a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-allowlist-2.xml +++ b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-allowlist-2.xml @@ -25,7 +25,7 @@ - + diff --git a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-exception-mappings.xml b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-exception-mappings.xml index 99a6b4ecc..951eca5be 100644 --- a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-exception-mappings.xml +++ b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-exception-mappings.xml @@ -26,7 +26,7 @@ - + diff --git a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-multilevel.xml b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-multilevel.xml index f710519b7..71d4c82b4 100644 --- a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-multilevel.xml +++ b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-multilevel.xml @@ -26,7 +26,7 @@ - + diff --git a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-result-inheritance.xml b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-result-inheritance.xml index e42274f2e..b4bc03a1b 100644 --- a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-result-inheritance.xml +++ b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-result-inheritance.xml @@ -26,7 +26,7 @@ - + diff --git a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-result-names.xml b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-result-names.xml index f7c67b165..99bfcf69f 100644 --- a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-result-names.xml +++ b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-result-names.xml @@ -26,7 +26,7 @@ - + diff --git a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-results.xml b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-results.xml index 82582db3c..9020e1a1a 100644 --- a/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-results.xml +++ b/core/src/test/resources/org/apache/struts2/config/providers/xwork-test-results.xml @@ -26,7 +26,7 @@ - + diff --git a/core/src/test/resources/xwork - jar.jar b/core/src/test/resources/xwork - jar.jar index 001de63fc56f667c02c5167dcd1e73f351369d7f..4258db034ab69334ba1070e33f09337b8a11915d 100644 GIT binary patch literal 902 zcmWIWW@Zs#;Nak3a4b)XWIzI(3@i-3t|5-Po_=on|4uP5Ff#;rvvYt{FhP|C;M6Pv zQ~}rQ>*(j{<{BKL=j-;__snS@Z(Y5MyxzK6=gyqp9At3C_`%a6JuhD!Pv48Bt5~>Z zyq0_+DW#cF@#Oh3HPNNhvOg7lEMf%P?Hl}u!3t=yB@iR*Hbrx|08qA~JijPgL02Iw zvB*fTA~(mi*Ppw|LFCB!x63Qu-mMiV;S~1bZPIYGF1b_k*Lj=vZvQWj)iX`D&wOb9 zc>Ut&8Mc!oWNyxrQThJ(sfYt+=v%I91gcca>)l)HbQ+A7FdFj*UHr@B? z?R;kGjjlcG|LhMDF10@L)BVKz6$aZ5HF0e}a<8THnI+yLh~RW%!9f^+Ix&lA`GZW z50mk(-J5l26&@tMNSr=gogmOKqg!(QZhs~0hD}@!yS}-5MU>eiJq8{b%Wvt fSvM$d5MUM~R5v`P0=!w-K=Ld=_#H@Bg8d8tFk%X# literal 2042 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 literal 2026 zcmWIWW@Zs#;Nak3IBKUD$$$hn8CV#6T|*poJ^kGD|D9rBU}gyLX6FE@V1gq)6YNAW0Wq&IASi}gn+c)?RgB8$ZOCUzrt(GW{;&6VTY(;r~QMQ7v zLRMmtUPW%s*|2E;+Xfh;H;k?WaH$(IONohqQe8xqTTmvqF|)%cGsn~7Dr856;dL+||a?$;<6gt!D~zJ0^bkkQdzH^seq=zmdb)#qG0hhA_?2QgWK4sdp>#nu{va zvBxu(eN+=LRsMcw)%;Lz??}Dl8mG1fPb=N-yFRs+)z53b@VUeV^0lXTwD)XaWxcxL zibU4ok|mesUe1~AxN!@Y%U!<-p54dHBr`O9_BNgM3T>M4(J-w~_roi{wU1t@@iuIK zZsFipc}~ed?Z6j3gI=|-41x}#3xqUm&!yHKDBNby<69m7qFiEzLAJ%VidUIiABHQv z-po_bb9C7{i3=*pNBAOF3!I*N!8WFM-8zeFADjM`-xlqz+bbzs^4+(6=XRsR^S_>s zykGzI@}K`zy_4Tee!>|T99tS+UDtAb@s1l2({9H9$QInw{Ww@J&+YEvyyEr^CF^w$ ztW0}%lj}p`btaiLVL4m2o;f_hgVUFL`t2uewad&pdOz0kNGhLNBqw$;STgfL{pU$1 zN+su)PWkuQOG?;C`%9^nU(;rv^FEm>pF#rnCO5V=@#lZEEtB+1{(j5L|CteoPMEyj z75Sro0{r9Np4p{!q9RK+Y;r>1IbCVfnW-uvDq6=ZSJc)V)=|IBe@y9?{Ii-$|CR-U zl|S!1zuxd}R_$N;$xELXxlFa27P?;HnB21Zj~dyGT2G#N$&}cb><|6V2Fj0<`1WRA z2WH6M-1zbYFDy^!j^>Eb95Iq|1S69O18M~atGz%K94dg? DgTFYF diff --git a/core/src/test/resources/xwork-proxyinvoke.xml b/core/src/test/resources/xwork-proxyinvoke.xml index 7a4b78425..64919e306 100644 --- a/core/src/test/resources/xwork-proxyinvoke.xml +++ b/core/src/test/resources/xwork-proxyinvoke.xml @@ -30,7 +30,7 @@ - + diff --git a/core/src/test/resources/xwork-test-default.xml b/core/src/test/resources/xwork-test-default.xml index 7f9f3c0ae..31f92d9d6 100644 --- a/core/src/test/resources/xwork-test-default.xml +++ b/core/src/test/resources/xwork-test-default.xml @@ -25,7 +25,7 @@ - + diff --git a/core/src/test/resources/xwork-test-validation.xml b/core/src/test/resources/xwork-test-validation.xml index feb14423a..e45183636 100644 --- a/core/src/test/resources/xwork-test-validation.xml +++ b/core/src/test/resources/xwork-test-validation.xml @@ -26,7 +26,7 @@ - + diff --git a/core/src/test/resources/xwork-zip.zip b/core/src/test/resources/xwork-zip.zip index 19c19c12af467c9e1b10abb8cbd79861be781907..b60c94b523661708c06d6727ed0c8270cebcea10 100644 GIT binary patch literal 3084 zcmWIWW@Zs#00GwGq)0FWN^mhKFjSQ17iH^KWftg%hVU}5|5jH^hvCu+ZU#n{uZ#=~ zVEqALb2u0{P|UdlG)n|%PJFztqqBc-guY%p+(;A?Z8X%<(M(KE5KT@`NJ{wN>l5~Y zKdd95foXySv$}vZ<3}w8wvX=(1XyL9othT-Oz6{ec+jEs0qArXM)Shiu;~2R1`@S-b*<^X)iYS)Hf7BJ}@!J77f z_gvFvra7tn5q4TNq4V<^wN$%LEyuePosZ4@ByH8(wzO@|u};w=c{8e5e3~cRDER1b z^Nv6Zcd}E#nX|4UP7QPROjG@QZlk|LkMhgc6E*#u8Rv=$bPMXa^L(5k5XX1j*R{sw zt|d!ehvoK#EW3}a-LUn{nY_BG+h^N|G%Z@dyOg=nV|DkcR&Qqk?n5z?I8ME4FbQVV zSh7$4$Ui-ws0o!T@BDr`p)b?Bx93)~+S=u7({z_4SZEdbX}0$5DHXLBJJoBd;c)kc& z>z-Jbd}`3mS$W3lfYpRcONzu;&l%oc`re>p(u6IaJEX3a`p!bW zRN1!~^7jj8O#15{8}^p}c}=aq1h>tnPsQ3=E)Dk3B!Q12ek{a&Cs_Wmvw(ku^xk-G&AR zT}+t@^DoMJ7`Nbfu~k&WQ_mE^R$&UuwGHWcvGm*H|y+@N{KiBop*wiBF*BD@{a&Z5K!14LQM&+6cNWPML?x0ybLh_mLV`a zT8504A;YT-LCy`Je4>Q648fW)hDZq_lJnKUMA~`LqwhAJ%-i1=Tb`DE9V~uhv*Djv zn^p$Co_+h($*=AIq|SN7wB6q<04YHj?_55MC_xyRM3`~6$AAS57#wf}QHbIfr7Z<& zp`jHb0p1XEVeK>IwhyR%1_K8gJ%CJdT5HHQfZ9;VwF#&V1p{vz*%*;sPGXA+-5TWL z7gRODz}rSK79@`#LJHadCBC9Uwh@$&kv#?~)?wgnqYo>F$FQblP(hC;en6HWrwLGQ ifq}P;Q5^WZh1EVRc_+Y|l?`Mj8xUpy>-;`W5Dx&vU2vTM literal 2645 zcmWIWW@Zs#-~hrjC&fqxC}8AaVBlv^V5lh1FUnTXRjA4=(5uMJ2@T<8U{7Sfk_N-2 z72FJrEMFNJ7=VT_Fq{pG_P=c)QnzgXp@_?JYN~OPQkSQtG>NIGu!+76`}RUDFRS3u ziLwQkxBRy|?l;@po4aS@S4H2Ny!$`TS#H~V_n&M2m)ZiJB|{vN(o+)A0Phd>y~yGTsepH;L4Kc zoXrfZYSWhgz4u^7gNS;Rxl-^PW7cL>0e^v&;WA&9l{ZD@b$k6TXv^esJh5Sl-IWaS z1G+nGzZ>X$dMlbW{g_mf(K7z6T#XsoJuU6#vze!m(1j2|!AU-a z7td`{(-Jh0J8sfz-nc??XL{J*Em2V?i%i`D*R!Wamf!vobuIkCk}sA|W!QdQ+}=}t zf+IR0fY-Zsp_z}n)?Lf9+a$%jUpriR%QACYM$Y8MutQh0Z>$MX?U0whHfJe|_<)sJd0$hVOa1lP<0gfBg5|yq5;w zqtbqCuCsjmdwt!k|MBY!C)G}}QOsJl`d#+<{ts0W;?my1#p&rU*SfxUzB8|&(Da>L zN#ce@?-ft~+#70f@r!M=sGZFguHUakrT6N7Hc$z2x_rEQZ_(krVCmz>1Qxq*FkGhd zDpAmO>LfR&{5X+adQUd{UHKp9o$U0ib>F$;o(0ohzSQh>nWwd?TyI0jhli&7j_MuG zd=nS-@}m=5BkSwKOMfk1A^%cx&D_}LrrzaZNw%ENIPPvroLuSV%xtl6Bq7W+UjZYd#cHVU)R2b zPEwfFs~GsPdft-8+uwK2dD{1NCHI?;)x6@MkYMNdwfE7XO~5h$ItloPJ|bb!w!^~VBl?IA3LTOu-bwpX$5$* UvVlxu0m3#$28Nx$m||c60A4H}J^%m! diff --git a/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java b/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java index c17a75b02..dcb0b4352 100644 --- a/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java +++ b/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java @@ -18,10 +18,10 @@ */ package org.apache.struts2.convention; +import org.apache.struts2.result.ActionChainResult; import jakarta.servlet.ServletContext; import junit.framework.TestCase; import org.apache.commons.lang3.StringUtils; -import org.apache.struts2.ActionChainResult; import org.apache.struts2.ActionContext; import org.apache.struts2.FileManager; import org.apache.struts2.FileManagerFactory; diff --git a/plugins/spring/src/test/java/org/apache/struts2/spring/SpringObjectFactoryTest.java b/plugins/spring/src/test/java/org/apache/struts2/spring/SpringObjectFactoryTest.java index 9c1cc09b8..01990e59a 100644 --- a/plugins/spring/src/test/java/org/apache/struts2/spring/SpringObjectFactoryTest.java +++ b/plugins/spring/src/test/java/org/apache/struts2/spring/SpringObjectFactoryTest.java @@ -19,7 +19,7 @@ package org.apache.struts2.spring; import org.apache.struts2.action.Action; -import org.apache.struts2.ActionChainResult; +import org.apache.struts2.result.ActionChainResult; import org.apache.struts2.ActionContext; import org.apache.struts2.ModelDrivenAction; import org.apache.struts2.ObjectFactory; diff --git a/plugins/spring/src/test/resources/org/apache/struts2/spring/actionContext-xwork.xml b/plugins/spring/src/test/resources/org/apache/struts2/spring/actionContext-xwork.xml index 60f64ef5b..2a80b6fa3 100644 --- a/plugins/spring/src/test/resources/org/apache/struts2/spring/actionContext-xwork.xml +++ b/plugins/spring/src/test/resources/org/apache/struts2/spring/actionContext-xwork.xml @@ -31,7 +31,7 @@ + class="org.apache.struts2.result.ActionChainResult"/>