Skip to content

Commit ea9d221

Browse files
lukaszlenartclaude
lukaszlenart
and
claude
committed
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]>
1 parent 0f57b33 commit ea9d221

File tree

10 files changed

+99
-26
lines changed

10 files changed

+99
-26
lines changed

‎core/src/main/java/org/apache/struts2/interceptor/ExceptionMappingInterceptor.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@
8484
*
8585
* <pre>
8686
* <!-- START SNIPPET: example -->
87-
* &lt;xwork&gt;
88-
* &lt;package name="default" extends="xwork-default"&gt;
87+
* &lt;struts&gt;
88+
* &lt;package name="default" extends="struts-default"&gt;
8989
* &lt;global-results&gt;
9090
* &lt;result name="error" type="freemarker"&gt;error.ftl&lt;/result&gt;
9191
* &lt;/global-results&gt;
@@ -102,7 +102,7 @@
102102
* &lt;result name="success" type="freemarker"&gt;test.ftl&lt;/result&gt;
103103
* &lt;/action&gt;
104104
* &lt;/package&gt;
105-
* &lt;/xwork&gt;
105+
* &lt;/struts&gt;
106106
* <!-- END SNIPPET: example -->
107107
* </pre>
108108
*
@@ -113,8 +113,8 @@
113113
*
114114
* <pre>
115115
* <!-- START SNIPPET: example2 -->
116-
* &lt;xwork&gt;
117-
* &lt;package name="something" extends="xwork-default"&gt;
116+
* &lt;struts&gt;
117+
* &lt;package name="something" extends="struts-default"&gt;
118118
* &lt;interceptors&gt;
119119
* &lt;interceptor-stack name="exceptionmappingStack"&gt;
120120
* &lt;interceptor-ref name="exception"&gt;
@@ -150,7 +150,7 @@
150150
* &lt;/action&gt;
151151
*
152152
* &lt;/package&gt;
153-
* &lt;/xwork&gt;
153+
* &lt;/struts&gt;
154154
* <!-- END SNIPPET: example2 -->
155155
* </pre>
156156
*
@@ -257,7 +257,7 @@ protected void doLog(Logger logger, Exception e) {
257257
}
258258

259259
Level level = Level.getLevel(logLevel);
260-
if (level == null) {
260+
if (level == null) {
261261
throw new IllegalArgumentException("LogLevel [" + logLevel + "] is not supported");
262262
}
263263
logger.log(level, e.getMessage(), e);

‎core/src/main/java/org/apache/struts2/validator/validators/RepopulateConversionErrorFieldValidatorSupport.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
* a fake parameter map when a conversion error has occurred and the 'repopulateField'
3737
* property is set to "true".
3838
* </p>
39-
*
39+
* <p>
4040
* <!-- START SNIPPET: javadoc -->
4141
* <p>
4242
* The capability of auto-repopulating the stack with a fake parameter map when
@@ -52,9 +52,9 @@
5252
* property set to true, it will, meaning the textfield will have 'one' as its value
5353
* upon conversion error.
5454
* </p>
55-
*
55+
* <p>
5656
* <!-- END SNIPPET: javadoc -->
57-
57+
*
5858
*
5959
* <pre>
6060
* <!-- START SNIPPET: exampleJspPage -->
@@ -75,11 +75,11 @@
7575
* <pre>
7676
* <!-- START SNIPPET: exampleXwork -->
7777
*
78-
* &lt;!-- xwork.xml --&gt;
79-
* &lt;xwork&gt;
80-
* &lt;include file="xwork-default.xml" /&gt;
78+
* &lt;!-- struts.xml --&gt;
79+
* &lt;struts&gt;
80+
* &lt;include file="struts-default.xml" /&gt;
8181
* ....
82-
* &lt;package name="myPackage" extends="xwork-default"&gt;
82+
* &lt;package name="myPackage" extends="struts-default"&gt;
8383
* ....
8484
* &lt;action name="someAction" class="example.MyActionSupport.java"&gt;
8585
* &lt;result name="input"&gt;myJspPage.jsp&lt;/result&gt;
@@ -88,7 +88,7 @@
8888
* ....
8989
* &lt;/package&gt;
9090
* ....
91-
* &lt;/xwork&gt;
91+
* &lt;/struts&gt;
9292
*
9393
* <!-- END SNIPPET:exampleXwork -->
9494
* </pre>

‎core/src/test/java/org/apache/struts2/interceptor/ChainingInterceptorWithConfigTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void testTwoExcludesPropertiesChained() throws Exception {
6767
@Override
6868
protected void setUp() throws Exception {
6969
super.setUp();
70-
XmlConfigurationProvider provider = new StrutsXmlConfigurationProvider("xwork-default.xml");
70+
XmlConfigurationProvider provider = new StrutsXmlConfigurationProvider("struts-tests-default.xml");
7171
container.inject(provider);
7272
this.objectFactory = container.getInstance(ObjectFactory.class);
7373
loadConfigurationProviders(provider, new MockConfigurationProvider());

‎core/src/test/java/org/apache/struts2/interceptor/annotations/AnnotationWorkflowInterceptorTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class AnnotationWorkflowInterceptorTest extends XWorkTestCase {
5151
@Override
5252
public void setUp() throws Exception {
5353
super.setUp();
54-
XmlConfigurationProvider provider = new StrutsXmlConfigurationProvider("xwork-default.xml");
54+
XmlConfigurationProvider provider = new StrutsXmlConfigurationProvider("struts-tests-default.xml");
5555
container.inject(provider);
5656
loadConfigurationProviders(provider, new MockConfigurationProvider());
5757
}

‎core/src/test/java/org/apache/struts2/util/ResolverUtilTest.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@
2121
import org.apache.struts2.ObjectFactory;
2222
import junit.framework.TestCase;
2323

24+
import java.net.URI;
2425
import java.net.URL;
2526
import java.util.Set;
2627

2728
public class ResolverUtilTest extends TestCase {
2829

29-
public void testSimpleFind() throws Exception {
30+
public void testSimpleFind() {
3031
ResolverUtil<ObjectFactory> resolver = new ResolverUtil<>();
3132
resolver.findImplementations(ObjectFactory.class, "org");
3233
Set<Class<? extends ObjectFactory>> impls = resolver.getClasses();
@@ -35,7 +36,7 @@ public void testSimpleFind() throws Exception {
3536
assertTrue(impls.contains(DummyObjectFactory.class));
3637
}
3738

38-
public void testMissingSomeFind() throws Exception {
39+
public void testMissingSomeFind() {
3940
ResolverUtil<ObjectFactory> resolver = new ResolverUtil<>();
4041
resolver.findImplementations(ObjectFactory.class, "org.apache.struts2.util");
4142
Set<Class<? extends ObjectFactory>> impls = resolver.getClasses();
@@ -44,15 +45,15 @@ public void testMissingSomeFind() throws Exception {
4445
assertTrue(impls.contains(DummyObjectFactory.class));
4546
}
4647

47-
public void testFindNamedResource() throws Exception {
48-
ResolverUtil resolver = new ResolverUtil();
49-
resolver.findNamedResource("xwork-default.xml", "");
48+
public void testFindNamedResource() {
49+
ResolverUtil resolver = new ResolverUtil<>();
50+
resolver.findNamedResource("struts-tests-default.xml", "");
5051
Set<URL> impls = resolver.getResources();
5152

5253
assertTrue(impls.size() > 0);
5354
}
5455

55-
public void testFindNamedResourceInDir() throws Exception {
56+
public void testFindNamedResourceInDir() {
5657
ResolverUtil resolver = new ResolverUtil();
5758
resolver.findNamedResource("SimpleAction.properties", "org/apache");
5859
Set<URL> impls = resolver.getResources();

‎core/src/test/java/org/apache/struts2/validator/DoubleRangeFieldValidatorTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ public void testCollectionOfDoubles() throws Exception {
303303
@Override
304304
protected void setUp() throws Exception {
305305
super.setUp();
306-
XmlConfigurationProvider provider = new StrutsXmlConfigurationProvider("xwork-default.xml");
306+
XmlConfigurationProvider provider = new StrutsXmlConfigurationProvider("struts-tests-default.xml");
307307
container.inject(provider);
308308
loadConfigurationProviders(provider, new MockConfigurationProvider());
309309
val = new DoubleRangeFieldValidator();

‎core/src/test/java/org/apache/struts2/validator/ValidatorAnnotationTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public void testAnnotatedMethodSuccess3() throws Exception {
120120
protected void setUp() throws Exception {
121121
super.setUp();
122122

123-
XmlConfigurationProvider provider1 = new StrutsXmlConfigurationProvider("xwork-default.xml");
123+
XmlConfigurationProvider provider1 = new StrutsXmlConfigurationProvider("struts-tests-default.xml");
124124
container.inject(provider1);
125125
XmlConfigurationProvider provider2 = new StrutsXmlConfigurationProvider("xwork-test-validation.xml");
126126
container.inject(provider2);

core/src/main/resources/xwork-default.xml renamed to core/src/test/resources/struts-tests-default.xml

File renamed without changes.

‎plugins/spring/src/test/java/org/apache/struts2/spring/interceptor/ActionAutowiringInterceptorTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void testShouldAutowireAction() throws Exception {
5757
}
5858

5959
public void testSetAutowireType() throws Exception {
60-
XmlConfigurationProvider prov = new StrutsXmlConfigurationProvider("xwork-default.xml");
60+
XmlConfigurationProvider prov = new StrutsXmlConfigurationProvider("struts-tests-default.xml");
6161
container.inject(prov);
6262
prov.setThrowExceptionOnDuplicateBeans(false);
6363
XmlConfigurationProvider c = new StrutsXmlConfigurationProvider("org/apache/struts2/spring/xwork-autowire.xml");

‎plugins/spring/src/test/resources/struts-tests-default.xml‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/*
4+
* Licensed to the Apache Software Foundation (ASF) under one
5+
* or more contributor license agreements. See the NOTICE file
6+
* distributed with this work for additional information
7+
* regarding copyright ownership. The ASF licenses this file
8+
* to you under the Apache License, Version 2.0 (the
9+
* "License"); you may not use this file except in compliance
10+
* with the License. You may obtain a copy of the License at
11+
*
12+
* http://www.apache.org/licenses/LICENSE-2.0
13+
*
14+
* Unless required by applicable law or agreed to in writing,
15+
* software distributed under the License is distributed on an
16+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17+
* KIND, either express or implied. See the License for the
18+
* specific language governing permissions and limitations
19+
* under the License.
20+
*/
21+
-->
22+
<!DOCTYPE struts PUBLIC
23+
"-//Apache Software Foundation//DTD Struts Configuration 6.0//EN"
24+
"https://struts.apache.org/dtds/struts-6.0.dtd">
25+
<struts>
26+
<package name="xwork-default" abstract="true">
27+
28+
<result-types>
29+
<result-type name="chain" class="org.apache.struts2.result.ActionChainResult"/>
30+
</result-types>
31+
<interceptors>
32+
<interceptor name="logger" class="org.apache.struts2.interceptor.LoggingInterceptor"/>
33+
<interceptor name="chain" class="org.apache.struts2.interceptor.ChainingInterceptor"/>
34+
<interceptor name="staticParams" class="org.apache.struts2.interceptor.StaticParametersInterceptor"/>
35+
<interceptor name="params" class="org.apache.struts2.interceptor.parameter.ParametersInterceptor"/>
36+
<interceptor name="removeParams" class="org.apache.struts2.interceptor.ParameterRemoverInterceptor"/>
37+
<interceptor name="modelDriven" class="org.apache.struts2.interceptor.ModelDrivenInterceptor"/>
38+
<interceptor name="scopedModelDriven"
39+
class="org.apache.struts2.interceptor.ScopedModelDrivenInterceptor"/>
40+
<interceptor name="validation" class="org.apache.struts2.validator.ValidationInterceptor"/>
41+
<interceptor name="workflow" class="org.apache.struts2.interceptor.DefaultWorkflowInterceptor"/>
42+
<interceptor name="prepare" class="org.apache.struts2.interceptor.PrepareInterceptor"/>
43+
<interceptor name="conversionError" class="org.apache.struts2.interceptor.ConversionErrorInterceptor"/>
44+
<interceptor name="alias" class="org.apache.struts2.interceptor.AliasInterceptor"/>
45+
<interceptor name="exception" class="org.apache.struts2.interceptor.ExceptionMappingInterceptor"/>
46+
<interceptor name="i18n" class="org.apache.struts2.interceptor.I18nInterceptor"/>
47+
48+
<!--interceptor name="static-params" class="org.apache.struts2.interceptor.StaticParametersInterceptor"/>
49+
<interceptor name="remove-params" class="org.apache.struts2.interceptor.ParameterRemoverInterceptor"/>
50+
<interceptor name="model-driven" class="org.apache.struts2.interceptor.ModelDrivenInterceptor"/>
51+
<interceptor name="scoped-model-driven"
52+
class="org.apache.struts2.interceptor.ScopedModelDrivenInterceptor"/-->
53+
54+
<interceptor-stack name="emptyStack"/>
55+
56+
<interceptor-stack name="defaultStack">
57+
<interceptor-ref name="staticParams"/>
58+
<interceptor-ref name="params"/>
59+
<interceptor-ref name="conversionError"/>
60+
</interceptor-stack>
61+
<interceptor-stack name="validationWorkflowStack">
62+
<interceptor-ref name="defaultStack"/>
63+
<interceptor-ref name="validation"/>
64+
<interceptor-ref name="workflow"/>
65+
</interceptor-stack>
66+
67+
</interceptors>
68+
69+
<default-class-ref class="org.apache.struts2.ActionSupport"/>
70+
71+
</package>
72+
</struts>

0 commit comments

Comments
 (0)