From 243a8c832b9fc3b3628ef9302085c9ec128fd0fc Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Tue, 18 Dec 2018 08:33:31 +0100 Subject: [PATCH 1/5] WW-4996 Refactors creator to use ObjectFactory#buildConverter method Moves class to a proper package and renames it to better expose its function as a default Struts implementation --- .../config/impl/DefaultConfiguration.java | 3 +- .../providers/XWorkConfigurationProvider.java | 5 ++-- .../StrutsTypeConverterCreator.java} | 30 +++++++++---------- core/src/main/resources/struts-default.xml | 2 +- 4 files changed, 19 insertions(+), 21 deletions(-) rename core/src/main/java/{com/opensymphony/xwork2/conversion/impl/DefaultTypeConverterCreator.java => org/apache/struts2/conversion/StrutsTypeConverterCreator.java} (63%) diff --git a/core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java b/core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java index 77d63338e..811a7f1bd 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java +++ b/core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java @@ -42,6 +42,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.StrutsConstants; +import org.apache.struts2.conversion.StrutsTypeConverterCreator; import java.util.*; @@ -257,7 +258,7 @@ public class DefaultConfiguration implements Configuration { builder.factory(ConversionPropertiesProcessor.class, DefaultConversionPropertiesProcessor.class, Scope.SINGLETON); builder.factory(ConversionFileProcessor.class, DefaultConversionFileProcessor.class, Scope.SINGLETON); builder.factory(ConversionAnnotationProcessor.class, DefaultConversionAnnotationProcessor.class, Scope.SINGLETON); - builder.factory(TypeConverterCreator.class, DefaultTypeConverterCreator.class, Scope.SINGLETON); + builder.factory(TypeConverterCreator.class, StrutsTypeConverterCreator.class, Scope.SINGLETON); builder.factory(TypeConverterHolder.class, DefaultTypeConverterHolder.class, Scope.SINGLETON); builder.factory(XWorkBasicConverter.class, Scope.SINGLETON); diff --git a/core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java b/core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java index 7adb69e49..6bc5312b4 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java +++ b/core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java @@ -56,7 +56,7 @@ import com.opensymphony.xwork2.conversion.impl.DefaultConversionAnnotationProces import com.opensymphony.xwork2.conversion.impl.DefaultConversionFileProcessor; import com.opensymphony.xwork2.conversion.impl.DefaultConversionPropertiesProcessor; import com.opensymphony.xwork2.conversion.impl.DefaultObjectTypeDeterminer; -import com.opensymphony.xwork2.conversion.impl.DefaultTypeConverterCreator; +import org.apache.struts2.conversion.StrutsTypeConverterCreator; import com.opensymphony.xwork2.conversion.impl.DefaultTypeConverterHolder; import com.opensymphony.xwork2.conversion.impl.InstantiatingNullHandler; import com.opensymphony.xwork2.conversion.impl.NumberConverter; @@ -112,7 +112,6 @@ import ognl.PropertyAccessor; import org.apache.struts2.StrutsConstants; import org.apache.struts2.dispatcher.HttpParameters; import org.apache.struts2.dispatcher.Parameter; -import org.apache.struts2.factory.PrefixBasedActionProxyFactory; import java.util.ArrayList; import java.util.Collection; @@ -159,7 +158,7 @@ public class XWorkConfigurationProvider implements ConfigurationProvider { .factory(ConversionPropertiesProcessor.class, DefaultConversionPropertiesProcessor.class, Scope.SINGLETON) .factory(ConversionFileProcessor.class, DefaultConversionFileProcessor.class, Scope.SINGLETON) .factory(ConversionAnnotationProcessor.class, DefaultConversionAnnotationProcessor.class, Scope.SINGLETON) - .factory(TypeConverterCreator.class, DefaultTypeConverterCreator.class, Scope.SINGLETON) + .factory(TypeConverterCreator.class, StrutsTypeConverterCreator.class, Scope.SINGLETON) .factory(TypeConverterHolder.class, DefaultTypeConverterHolder.class, Scope.SINGLETON) .factory(FileManager.class, "system", DefaultFileManager.class, Scope.SINGLETON) diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverterCreator.java b/core/src/main/java/org/apache/struts2/conversion/StrutsTypeConverterCreator.java similarity index 63% rename from core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverterCreator.java rename to core/src/main/java/org/apache/struts2/conversion/StrutsTypeConverterCreator.java index 6bfb19e3b..d77b07779 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverterCreator.java +++ b/core/src/main/java/org/apache/struts2/conversion/StrutsTypeConverterCreator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.conversion.impl; +package org.apache.struts2.conversion; import com.opensymphony.xwork2.ObjectFactory; import com.opensymphony.xwork2.conversion.TypeConverter; @@ -27,7 +27,7 @@ import com.opensymphony.xwork2.ognl.XWorkTypeConverterWrapper; /** * Default implementation of {@link TypeConverterCreator} */ -public class DefaultTypeConverterCreator implements TypeConverterCreator { +public class StrutsTypeConverterCreator implements TypeConverterCreator { private ObjectFactory objectFactory; @@ -37,24 +37,22 @@ public class DefaultTypeConverterCreator implements TypeConverterCreator { } public TypeConverter createTypeConverter(String className) throws Exception { - Object obj = objectFactory.buildBean(className, null); - return getTypeConverter(obj); + Class classInstance = objectFactory.getClassInstance(className); + + if (classInstance.isAssignableFrom(TypeConverter.class)) { + Class converterClass = (Class) classInstance; + return objectFactory.buildConverter(converterClass, null); + } else { + throw new IllegalArgumentException("Type converter class " + className + " doesn't implement " + TypeConverter.class.getName()); + } } public TypeConverter createTypeConverter(Class clazz) throws Exception { - Object obj = objectFactory.buildBean(clazz, null); - return getTypeConverter(obj); - } - - protected TypeConverter getTypeConverter(Object obj) { - if (obj instanceof TypeConverter) { - return (TypeConverter) obj; - - // For backwards compatibility - } else if (obj instanceof ognl.TypeConverter) { - return new XWorkTypeConverterWrapper((ognl.TypeConverter) obj); + if (clazz.isAssignableFrom(TypeConverter.class)) { + Class converterClass = (Class) clazz; + return objectFactory.buildConverter(converterClass, null); } else { - throw new IllegalArgumentException("Type converter class " + obj.getClass() + " doesn't implement com.opensymphony.xwork2.conversion.TypeConverter"); + throw new IllegalArgumentException("Type converter class " + clazz.getName() + " doesn't implement " + TypeConverter.class.getName()); } } diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml index 61100b6d2..193ceebaf 100644 --- a/core/src/main/resources/struts-default.xml +++ b/core/src/main/resources/struts-default.xml @@ -114,7 +114,7 @@ - + From 6adfbed282d50318290de9414c9fed8bd2cd3775 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Tue, 18 Dec 2018 08:36:25 +0100 Subject: [PATCH 2/5] WW-4996 Renames and moves class to proper package to better expose its meaning --- .../xwork2/config/impl/DefaultConfiguration.java | 3 ++- .../xwork2/config/providers/XWorkConfigurationProvider.java | 4 ++-- .../opensymphony/xwork2/factory/DefaultConverterFactory.java | 2 +- .../struts2/conversion/StrutsTypeConverterCreator.java | 5 ++--- .../struts2/conversion/StrutsTypeConverterHolder.java} | 4 ++-- core/src/main/resources/struts-default.xml | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) rename core/src/main/java/{com/opensymphony/xwork2/conversion/impl/DefaultTypeConverterHolder.java => org/apache/struts2/conversion/StrutsTypeConverterHolder.java} (96%) diff --git a/core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java b/core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java index 811a7f1bd..f58d0e598 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java +++ b/core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java @@ -42,6 +42,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.StrutsConstants; +import org.apache.struts2.conversion.StrutsTypeConverterHolder; import org.apache.struts2.conversion.StrutsTypeConverterCreator; import java.util.*; @@ -259,7 +260,7 @@ public class DefaultConfiguration implements Configuration { builder.factory(ConversionFileProcessor.class, DefaultConversionFileProcessor.class, Scope.SINGLETON); builder.factory(ConversionAnnotationProcessor.class, DefaultConversionAnnotationProcessor.class, Scope.SINGLETON); builder.factory(TypeConverterCreator.class, StrutsTypeConverterCreator.class, Scope.SINGLETON); - builder.factory(TypeConverterHolder.class, DefaultTypeConverterHolder.class, Scope.SINGLETON); + builder.factory(TypeConverterHolder.class, StrutsTypeConverterHolder.class, Scope.SINGLETON); builder.factory(XWorkBasicConverter.class, Scope.SINGLETON); builder.factory(TypeConverter.class, StrutsConstants.STRUTS_CONVERTER_COLLECTION, CollectionConverter.class, Scope.SINGLETON); diff --git a/core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java b/core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java index 6bc5312b4..5c060256a 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java +++ b/core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java @@ -57,7 +57,7 @@ import com.opensymphony.xwork2.conversion.impl.DefaultConversionFileProcessor; import com.opensymphony.xwork2.conversion.impl.DefaultConversionPropertiesProcessor; import com.opensymphony.xwork2.conversion.impl.DefaultObjectTypeDeterminer; import org.apache.struts2.conversion.StrutsTypeConverterCreator; -import com.opensymphony.xwork2.conversion.impl.DefaultTypeConverterHolder; +import org.apache.struts2.conversion.StrutsTypeConverterHolder; import com.opensymphony.xwork2.conversion.impl.InstantiatingNullHandler; import com.opensymphony.xwork2.conversion.impl.NumberConverter; import com.opensymphony.xwork2.conversion.impl.StringConverter; @@ -159,7 +159,7 @@ public class XWorkConfigurationProvider implements ConfigurationProvider { .factory(ConversionFileProcessor.class, DefaultConversionFileProcessor.class, Scope.SINGLETON) .factory(ConversionAnnotationProcessor.class, DefaultConversionAnnotationProcessor.class, Scope.SINGLETON) .factory(TypeConverterCreator.class, StrutsTypeConverterCreator.class, Scope.SINGLETON) - .factory(TypeConverterHolder.class, DefaultTypeConverterHolder.class, Scope.SINGLETON) + .factory(TypeConverterHolder.class, StrutsTypeConverterHolder.class, Scope.SINGLETON) .factory(FileManager.class, "system", DefaultFileManager.class, Scope.SINGLETON) .factory(FileManagerFactory.class, DefaultFileManagerFactory.class, Scope.SINGLETON) diff --git a/core/src/main/java/com/opensymphony/xwork2/factory/DefaultConverterFactory.java b/core/src/main/java/com/opensymphony/xwork2/factory/DefaultConverterFactory.java index 73a45b128..2905fdd93 100644 --- a/core/src/main/java/com/opensymphony/xwork2/factory/DefaultConverterFactory.java +++ b/core/src/main/java/com/opensymphony/xwork2/factory/DefaultConverterFactory.java @@ -42,7 +42,7 @@ public class DefaultConverterFactory implements ConverterFactory { public TypeConverter buildConverter(Class converterClass, Map extraContext) throws Exception { LOG.debug("Creating converter of type [{}]", converterClass.getCanonicalName()); - return container.getInstance(converterClass); + return container.inject(converterClass); } } diff --git a/core/src/main/java/org/apache/struts2/conversion/StrutsTypeConverterCreator.java b/core/src/main/java/org/apache/struts2/conversion/StrutsTypeConverterCreator.java index d77b07779..23e513659 100644 --- a/core/src/main/java/org/apache/struts2/conversion/StrutsTypeConverterCreator.java +++ b/core/src/main/java/org/apache/struts2/conversion/StrutsTypeConverterCreator.java @@ -22,7 +22,6 @@ import com.opensymphony.xwork2.ObjectFactory; import com.opensymphony.xwork2.conversion.TypeConverter; import com.opensymphony.xwork2.conversion.TypeConverterCreator; import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.ognl.XWorkTypeConverterWrapper; /** * Default implementation of {@link TypeConverterCreator} @@ -39,7 +38,7 @@ public class StrutsTypeConverterCreator implements TypeConverterCreator { public TypeConverter createTypeConverter(String className) throws Exception { Class classInstance = objectFactory.getClassInstance(className); - if (classInstance.isAssignableFrom(TypeConverter.class)) { + if (TypeConverter.class.isAssignableFrom(classInstance)) { Class converterClass = (Class) classInstance; return objectFactory.buildConverter(converterClass, null); } else { @@ -48,7 +47,7 @@ public class StrutsTypeConverterCreator implements TypeConverterCreator { } public TypeConverter createTypeConverter(Class clazz) throws Exception { - if (clazz.isAssignableFrom(TypeConverter.class)) { + if (TypeConverter.class.isAssignableFrom(clazz)) { Class converterClass = (Class) clazz; return objectFactory.buildConverter(converterClass, null); } else { diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverterHolder.java b/core/src/main/java/org/apache/struts2/conversion/StrutsTypeConverterHolder.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverterHolder.java rename to core/src/main/java/org/apache/struts2/conversion/StrutsTypeConverterHolder.java index f179251d4..b7e31adae 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverterHolder.java +++ b/core/src/main/java/org/apache/struts2/conversion/StrutsTypeConverterHolder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.conversion.impl; +package org.apache.struts2.conversion; import com.opensymphony.xwork2.conversion.TypeConverter; import com.opensymphony.xwork2.conversion.TypeConverterHolder; @@ -28,7 +28,7 @@ import java.util.Map; /** * Default implementation of {@link TypeConverterHolder} */ -public class DefaultTypeConverterHolder implements TypeConverterHolder { +public class StrutsTypeConverterHolder implements TypeConverterHolder { /** * Record class and its type converter mapping. diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml index 193ceebaf..08b768f61 100644 --- a/core/src/main/resources/struts-default.xml +++ b/core/src/main/resources/struts-default.xml @@ -115,7 +115,7 @@ - + From c941326bf3da458beabcaab81456e51951318bcf Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Thu, 3 Jan 2019 09:52:17 +0100 Subject: [PATCH 3/5] WW-4996 Reduces code duplication --- .../struts2/conversion/StrutsTypeConverterCreator.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/org/apache/struts2/conversion/StrutsTypeConverterCreator.java b/core/src/main/java/org/apache/struts2/conversion/StrutsTypeConverterCreator.java index 23e513659..eee8ff7df 100644 --- a/core/src/main/java/org/apache/struts2/conversion/StrutsTypeConverterCreator.java +++ b/core/src/main/java/org/apache/struts2/conversion/StrutsTypeConverterCreator.java @@ -36,14 +36,8 @@ public class StrutsTypeConverterCreator implements TypeConverterCreator { } public TypeConverter createTypeConverter(String className) throws Exception { - Class classInstance = objectFactory.getClassInstance(className); - - if (TypeConverter.class.isAssignableFrom(classInstance)) { - Class converterClass = (Class) classInstance; - return objectFactory.buildConverter(converterClass, null); - } else { - throw new IllegalArgumentException("Type converter class " + className + " doesn't implement " + TypeConverter.class.getName()); - } + Class clazz = objectFactory.getClassInstance(className); + return createTypeConverter(clazz); } public TypeConverter createTypeConverter(Class clazz) throws Exception { From 19134516d8ef338c28c08dde60a7fb413be0357c Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Thu, 3 Jan 2019 10:04:29 +0100 Subject: [PATCH 4/5] WW-4996 Uses Struts* naming pattern instead of Default* --- .../opensymphony/xwork2/config/impl/DefaultConfiguration.java | 2 +- .../xwork2/config/providers/XWorkConfigurationProvider.java | 4 ++-- ...faultConverterFactory.java => StrutsConverterFactory.java} | 4 ++-- core/src/main/resources/struts-default.xml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename core/src/main/java/com/opensymphony/xwork2/factory/{DefaultConverterFactory.java => StrutsConverterFactory.java} (90%) diff --git a/core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java b/core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java index f58d0e598..e43efaa83 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java +++ b/core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java @@ -245,7 +245,7 @@ public class DefaultConfiguration implements Configuration { builder.factory(ResultFactory.class, DefaultResultFactory.class, Scope.SINGLETON); builder.factory(InterceptorFactory.class, DefaultInterceptorFactory.class, Scope.SINGLETON); builder.factory(com.opensymphony.xwork2.factory.ValidatorFactory.class, com.opensymphony.xwork2.factory.DefaultValidatorFactory.class, Scope.SINGLETON); - builder.factory(ConverterFactory.class, DefaultConverterFactory.class, Scope.SINGLETON); + builder.factory(ConverterFactory.class, StrutsConverterFactory.class, Scope.SINGLETON); builder.factory(UnknownHandlerFactory.class, DefaultUnknownHandlerFactory.class, Scope.SINGLETON); builder.factory(FileManager.class, "system", DefaultFileManager.class, Scope.SINGLETON); diff --git a/core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java b/core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java index 5c060256a..1b0486460 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java +++ b/core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java @@ -66,7 +66,7 @@ import com.opensymphony.xwork2.conversion.impl.XWorkConverter; import com.opensymphony.xwork2.factory.ActionFactory; import com.opensymphony.xwork2.factory.ConverterFactory; import com.opensymphony.xwork2.factory.DefaultActionFactory; -import com.opensymphony.xwork2.factory.DefaultConverterFactory; +import com.opensymphony.xwork2.factory.StrutsConverterFactory; import com.opensymphony.xwork2.factory.DefaultInterceptorFactory; import com.opensymphony.xwork2.factory.DefaultResultFactory; import com.opensymphony.xwork2.factory.InterceptorFactory; @@ -147,7 +147,7 @@ public class XWorkConfigurationProvider implements ConfigurationProvider { .factory(ResultFactory.class, DefaultResultFactory.class) .factory(InterceptorFactory.class, DefaultInterceptorFactory.class) .factory(com.opensymphony.xwork2.factory.ValidatorFactory.class, com.opensymphony.xwork2.factory.DefaultValidatorFactory.class) - .factory(ConverterFactory.class, DefaultConverterFactory.class) + .factory(ConverterFactory.class, StrutsConverterFactory.class) .factory(UnknownHandlerFactory.class, DefaultUnknownHandlerFactory.class) .factory(ActionProxyFactory.class, DefaultActionProxyFactory.class, Scope.SINGLETON) diff --git a/core/src/main/java/com/opensymphony/xwork2/factory/DefaultConverterFactory.java b/core/src/main/java/com/opensymphony/xwork2/factory/StrutsConverterFactory.java similarity index 90% rename from core/src/main/java/com/opensymphony/xwork2/factory/DefaultConverterFactory.java rename to core/src/main/java/com/opensymphony/xwork2/factory/StrutsConverterFactory.java index 2905fdd93..2c873e60b 100644 --- a/core/src/main/java/com/opensymphony/xwork2/factory/DefaultConverterFactory.java +++ b/core/src/main/java/com/opensymphony/xwork2/factory/StrutsConverterFactory.java @@ -29,9 +29,9 @@ import java.util.Map; /** * Default implementation */ -public class DefaultConverterFactory implements ConverterFactory { +public class StrutsConverterFactory implements ConverterFactory { - private static final Logger LOG = LogManager.getLogger(DefaultConverterFactory.class); + private static final Logger LOG = LogManager.getLogger(StrutsConverterFactory.class); private Container container; diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml index 08b768f61..d4e28c386 100644 --- a/core/src/main/resources/struts-default.xml +++ b/core/src/main/resources/struts-default.xml @@ -69,7 +69,7 @@ - + From a4bfb0d0f2108e087dadf96a20a1d1387e8c86a5 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Thu, 3 Jan 2019 11:14:02 +0100 Subject: [PATCH 5/5] WW-4996 Fixes post rebase file name changes --- .../providers/xwork-test-allowstatic-devmode-false.xml | 6 +++--- .../providers/xwork-test-allowstatic-devmode-true.xml | 6 +++--- .../xwork2/config/providers/xwork-test-allowstatic-true.xml | 6 +++--- .../xwork2/config/providers/xwork-test-devmode-true.xml | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowstatic-devmode-false.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowstatic-devmode-false.xml index a6cf3735f..b2779461d 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowstatic-devmode-false.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowstatic-devmode-false.xml @@ -54,11 +54,11 @@ - - + + - + diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowstatic-devmode-true.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowstatic-devmode-true.xml index c694b8937..c04dc9eb9 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowstatic-devmode-true.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowstatic-devmode-true.xml @@ -54,11 +54,11 @@ - - + + - + diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowstatic-true.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowstatic-true.xml index ce5f01633..816d65407 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowstatic-true.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowstatic-true.xml @@ -54,11 +54,11 @@ - - + + - + diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-devmode-true.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-devmode-true.xml index dd6a41c4d..0a2f09d1d 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-devmode-true.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-devmode-true.xml @@ -54,11 +54,11 @@ - - + + - +