This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch fix/WW-5603-move-xwork-default-to-test-resources in repository https://gitbox.apache.org/repos/asf/struts.git
commit ea9d22186c288bb8405245436bd66b65d38971b0 Author: Lukasz Lenart <[email protected]> AuthorDate: Sun Jan 11 10:40:32 2026 +0100 fix(core): move xwork-default.xml to test resources The Struts IDEA plugin incorrectly displayed xwork-default.xml as a framework configuration file. This was misleading since the file is only used in testing and is not loaded by the framework by default. Changes: - Move xwork-default.xml from core/src/main/resources to core/src/test/resources and rename to struts-tests-default.xml - Copy struts-tests-default.xml to plugins/spring/src/test/resources - Update all test file references to use the new filename - Update Javadoc examples to use modern Struts terminology (xwork -> struts, xwork-default -> struts-default) Closes [WW-5603](https://issues.apache.org/jira/browse/WW-5603) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <[email protected]> --- .../struts2/interceptor/ExceptionMappingInterceptor.java | 14 +++++++------- .../RepopulateConversionErrorFieldValidatorSupport.java | 16 ++++++++-------- .../interceptor/ChainingInterceptorWithConfigTest.java | 2 +- .../annotations/AnnotationWorkflowInterceptorTest.java | 2 +- .../java/org/apache/struts2/util/ResolverUtilTest.java | 13 +++++++------ .../struts2/validator/DoubleRangeFieldValidatorTest.java | 2 +- .../struts2/validator/ValidatorAnnotationTest.java | 2 +- .../resources/struts-tests-default.xml} | 0 .../interceptor/ActionAutowiringInterceptorTest.java | 2 +- .../spring/src/test/resources/struts-tests-default.xml | 0 10 files changed, 27 insertions(+), 26 deletions(-) diff --git a/core/src/main/java/org/apache/struts2/interceptor/ExceptionMappingInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ExceptionMappingInterceptor.java index acc906500..8e6271e09 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/ExceptionMappingInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ExceptionMappingInterceptor.java @@ -84,8 +84,8 @@ import java.util.Map; * * <pre> * <!-- START SNIPPET: example --> - * <xwork> - * <package name="default" extends="xwork-default"> + * <struts> + * <package name="default" extends="struts-default"> * <global-results> * <result name="error" type="freemarker">error.ftl</result> * </global-results> @@ -102,7 +102,7 @@ import java.util.Map; * <result name="success" type="freemarker">test.ftl</result> * </action> * </package> - * </xwork> + * </struts> * <!-- END SNIPPET: example --> * </pre> * @@ -113,8 +113,8 @@ import java.util.Map; * * <pre> * <!-- START SNIPPET: example2 --> - * <xwork> - * <package name="something" extends="xwork-default"> + * <struts> + * <package name="something" extends="struts-default"> * <interceptors> * <interceptor-stack name="exceptionmappingStack"> * <interceptor-ref name="exception"> @@ -150,7 +150,7 @@ import java.util.Map; * </action> * * </package> - * </xwork> + * </struts> * <!-- END SNIPPET: example2 --> * </pre> * @@ -257,7 +257,7 @@ public class ExceptionMappingInterceptor extends AbstractInterceptor { } Level level = Level.getLevel(logLevel); - if (level == null) { + if (level == null) { throw new IllegalArgumentException("LogLevel [" + logLevel + "] is not supported"); } logger.log(level, e.getMessage(), e); diff --git a/core/src/main/java/org/apache/struts2/validator/validators/RepopulateConversionErrorFieldValidatorSupport.java b/core/src/main/java/org/apache/struts2/validator/validators/RepopulateConversionErrorFieldValidatorSupport.java index 7987b84f6..b6dcd54de 100644 --- a/core/src/main/java/org/apache/struts2/validator/validators/RepopulateConversionErrorFieldValidatorSupport.java +++ b/core/src/main/java/org/apache/struts2/validator/validators/RepopulateConversionErrorFieldValidatorSupport.java @@ -36,7 +36,7 @@ import java.util.Map; * a fake parameter map when a conversion error has occurred and the 'repopulateField' * property is set to "true". * </p> - * + * <p> * <!-- START SNIPPET: javadoc --> * <p> * The capability of auto-repopulating the stack with a fake parameter map when @@ -52,9 +52,9 @@ import java.util.Map; * property set to true, it will, meaning the textfield will have 'one' as its value * upon conversion error. * </p> - * + * <p> * <!-- END SNIPPET: javadoc --> - + * * * <pre> * <!-- START SNIPPET: exampleJspPage --> @@ -75,11 +75,11 @@ import java.util.Map; * <pre> * <!-- START SNIPPET: exampleXwork --> * - * <!-- xwork.xml --> - * <xwork> - * <include file="xwork-default.xml" /> + * <!-- struts.xml --> + * <struts> + * <include file="struts-default.xml" /> * .... - * <package name="myPackage" extends="xwork-default"> + * <package name="myPackage" extends="struts-default"> * .... * <action name="someAction" class="example.MyActionSupport.java"> * <result name="input">myJspPage.jsp</result> @@ -88,7 +88,7 @@ import java.util.Map; * .... * </package> * .... - * </xwork> + * </struts> * * <!-- END SNIPPET:exampleXwork --> * </pre> 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 88d5fcc8c..2f7cddfd9 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/ChainingInterceptorWithConfigTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/ChainingInterceptorWithConfigTest.java @@ -67,7 +67,7 @@ public class ChainingInterceptorWithConfigTest extends XWorkTestCase { @Override protected void setUp() throws Exception { super.setUp(); - XmlConfigurationProvider provider = new StrutsXmlConfigurationProvider("xwork-default.xml"); + XmlConfigurationProvider provider = new StrutsXmlConfigurationProvider("struts-tests-default.xml"); container.inject(provider); this.objectFactory = container.getInstance(ObjectFactory.class); loadConfigurationProviders(provider, new MockConfigurationProvider()); diff --git a/core/src/test/java/org/apache/struts2/interceptor/annotations/AnnotationWorkflowInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/annotations/AnnotationWorkflowInterceptorTest.java index dcb80b943..aa73365e3 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/annotations/AnnotationWorkflowInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/annotations/AnnotationWorkflowInterceptorTest.java @@ -51,7 +51,7 @@ public class AnnotationWorkflowInterceptorTest extends XWorkTestCase { @Override public void setUp() throws Exception { super.setUp(); - XmlConfigurationProvider provider = new StrutsXmlConfigurationProvider("xwork-default.xml"); + XmlConfigurationProvider provider = new StrutsXmlConfigurationProvider("struts-tests-default.xml"); container.inject(provider); loadConfigurationProviders(provider, new MockConfigurationProvider()); } diff --git a/core/src/test/java/org/apache/struts2/util/ResolverUtilTest.java b/core/src/test/java/org/apache/struts2/util/ResolverUtilTest.java index ecc31cf55..ed4aa9053 100644 --- a/core/src/test/java/org/apache/struts2/util/ResolverUtilTest.java +++ b/core/src/test/java/org/apache/struts2/util/ResolverUtilTest.java @@ -21,12 +21,13 @@ package org.apache.struts2.util; import org.apache.struts2.ObjectFactory; import junit.framework.TestCase; +import java.net.URI; import java.net.URL; import java.util.Set; public class ResolverUtilTest extends TestCase { - public void testSimpleFind() throws Exception { + public void testSimpleFind() { ResolverUtil<ObjectFactory> resolver = new ResolverUtil<>(); resolver.findImplementations(ObjectFactory.class, "org"); Set<Class<? extends ObjectFactory>> impls = resolver.getClasses(); @@ -35,7 +36,7 @@ public class ResolverUtilTest extends TestCase { assertTrue(impls.contains(DummyObjectFactory.class)); } - public void testMissingSomeFind() throws Exception { + public void testMissingSomeFind() { ResolverUtil<ObjectFactory> resolver = new ResolverUtil<>(); resolver.findImplementations(ObjectFactory.class, "org.apache.struts2.util"); Set<Class<? extends ObjectFactory>> impls = resolver.getClasses(); @@ -44,15 +45,15 @@ public class ResolverUtilTest extends TestCase { assertTrue(impls.contains(DummyObjectFactory.class)); } - public void testFindNamedResource() throws Exception { - ResolverUtil resolver = new ResolverUtil(); - resolver.findNamedResource("xwork-default.xml", ""); + public void testFindNamedResource() { + ResolverUtil resolver = new ResolverUtil<>(); + resolver.findNamedResource("struts-tests-default.xml", ""); Set<URL> impls = resolver.getResources(); assertTrue(impls.size() > 0); } - public void testFindNamedResourceInDir() throws Exception { + public void testFindNamedResourceInDir() { ResolverUtil resolver = new ResolverUtil(); resolver.findNamedResource("SimpleAction.properties", "org/apache"); Set<URL> impls = resolver.getResources(); diff --git a/core/src/test/java/org/apache/struts2/validator/DoubleRangeFieldValidatorTest.java b/core/src/test/java/org/apache/struts2/validator/DoubleRangeFieldValidatorTest.java index 522a58bec..fc88f3a1a 100644 --- a/core/src/test/java/org/apache/struts2/validator/DoubleRangeFieldValidatorTest.java +++ b/core/src/test/java/org/apache/struts2/validator/DoubleRangeFieldValidatorTest.java @@ -303,7 +303,7 @@ public class DoubleRangeFieldValidatorTest extends XWorkTestCase { @Override protected void setUp() throws Exception { super.setUp(); - XmlConfigurationProvider provider = new StrutsXmlConfigurationProvider("xwork-default.xml"); + XmlConfigurationProvider provider = new StrutsXmlConfigurationProvider("struts-tests-default.xml"); container.inject(provider); loadConfigurationProviders(provider, new MockConfigurationProvider()); val = new DoubleRangeFieldValidator(); diff --git a/core/src/test/java/org/apache/struts2/validator/ValidatorAnnotationTest.java b/core/src/test/java/org/apache/struts2/validator/ValidatorAnnotationTest.java index f85319e09..7b0ff8cba 100644 --- a/core/src/test/java/org/apache/struts2/validator/ValidatorAnnotationTest.java +++ b/core/src/test/java/org/apache/struts2/validator/ValidatorAnnotationTest.java @@ -120,7 +120,7 @@ public class ValidatorAnnotationTest extends XWorkTestCase { protected void setUp() throws Exception { super.setUp(); - XmlConfigurationProvider provider1 = new StrutsXmlConfigurationProvider("xwork-default.xml"); + XmlConfigurationProvider provider1 = new StrutsXmlConfigurationProvider("struts-tests-default.xml"); container.inject(provider1); XmlConfigurationProvider provider2 = new StrutsXmlConfigurationProvider("xwork-test-validation.xml"); container.inject(provider2); diff --git a/core/src/main/resources/xwork-default.xml b/core/src/test/resources/struts-tests-default.xml similarity index 100% copy from core/src/main/resources/xwork-default.xml copy to core/src/test/resources/struts-tests-default.xml diff --git a/plugins/spring/src/test/java/org/apache/struts2/spring/interceptor/ActionAutowiringInterceptorTest.java b/plugins/spring/src/test/java/org/apache/struts2/spring/interceptor/ActionAutowiringInterceptorTest.java index ea10d70bd..b109f1ae7 100644 --- a/plugins/spring/src/test/java/org/apache/struts2/spring/interceptor/ActionAutowiringInterceptorTest.java +++ b/plugins/spring/src/test/java/org/apache/struts2/spring/interceptor/ActionAutowiringInterceptorTest.java @@ -57,7 +57,7 @@ public class ActionAutowiringInterceptorTest extends XWorkTestCase { } public void testSetAutowireType() throws Exception { - XmlConfigurationProvider prov = new StrutsXmlConfigurationProvider("xwork-default.xml"); + XmlConfigurationProvider prov = new StrutsXmlConfigurationProvider("struts-tests-default.xml"); container.inject(prov); prov.setThrowExceptionOnDuplicateBeans(false); XmlConfigurationProvider c = new StrutsXmlConfigurationProvider("org/apache/struts2/spring/xwork-autowire.xml"); diff --git a/core/src/main/resources/xwork-default.xml b/plugins/spring/src/test/resources/struts-tests-default.xml similarity index 100% rename from core/src/main/resources/xwork-default.xml rename to plugins/spring/src/test/resources/struts-tests-default.xml
