Renames TextProviderFactory into StrutsTextProviderFactory
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/9376bb0c Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/9376bb0c Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/9376bb0c Branch: refs/heads/master Commit: 9376bb0ca16595cac0a1d03fb7b4fa55ab66a8f3 Parents: 4f46f15 Author: Lukasz Lenart <[email protected]> Authored: Thu Mar 16 14:43:07 2017 +0100 Committer: Lukasz Lenart <[email protected]> Committed: Thu Mar 16 14:43:07 2017 +0100 ---------------------------------------------------------------------- .../xwork2/StrutsTextProviderFactory.java | 82 ++++++++++++++++++++ .../xwork2/TextProviderFactory.java | 82 -------------------- .../providers/XWorkConfigurationProvider.java | 6 +- .../AnnotationActionValidatorManager.java | 4 +- .../DefaultActionValidatorManager.java | 6 +- .../validator/DelegatingValidatorContext.java | 6 +- .../validator/validators/ValidatorSupport.java | 6 +- .../org/apache/struts2/components/I18n.java | 4 +- .../config/DefaultBeanSelectionProvider.java | 4 +- .../interceptor/FileUploadInterceptor.java | 2 +- core/src/main/resources/struts-default.xml | 2 +- .../xwork2/CompositeTextProviderTest.java | 2 +- .../AnnotationActionValidatorManagerTest.java | 6 +- .../ConversionErrorFieldValidatorTest.java | 4 +- .../validator/DoubleRangeValidatorTest.java | 4 +- .../xwork2/validator/DummyValidatorContext.java | 4 +- .../xwork2/validator/EmailValidatorTest.java | 6 +- .../validator/ExpressionValidatorTest.java | 4 +- .../validator/RegexFieldValidatorTest.java | 6 +- ...onversionErrorFieldValidatorSupportTest.java | 4 +- .../validator/SimpleActionValidationTest.java | 2 +- .../StringLengthFieldValidatorTest.java | 4 +- .../xwork2/validator/StringValidatorTest.java | 6 +- .../xwork2/validator/URLValidatorTest.java | 6 +- .../AppendingValidatorContextTest.java | 4 +- .../validators/DateRangeFieldValidatorTest.java | 6 +- .../validators/IntRangeFieldValidatorTest.java | 6 +- .../validators/LongRangeFieldValidatorTest.java | 6 +- .../validators/RequiredStringValidatorTest.java | 6 +- .../ShortRangeFieldValidatorTest.java | 6 +- .../interceptor/BeanValidationInterceptor.java | 6 +- .../interceptor/OValValidationInterceptor.java | 6 +- .../struts2/tiles/I18NAttributeEvaluator.java | 8 +- 33 files changed, 155 insertions(+), 161 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java b/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java new file mode 100644 index 0000000..c5123af --- /dev/null +++ b/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java @@ -0,0 +1,82 @@ +/* + * Copyright 2002-2007,2009 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.opensymphony.xwork2; + +import com.opensymphony.xwork2.inject.Inject; + +import java.util.ResourceBundle; + +/** + * This factory enables users to provide and correctly initialize a custom TextProvider. + * + * @author Oleg Gorobets + * @author Rene Gielen + */ +public class StrutsTextProviderFactory { + + private TextProvider textProvider; + private LocaleProviderFactory localeProviderFactory; + private LocalizedTextProvider localizedTextProvider; + + @Inject + public void setTextProvider(TextProvider textProvider) { + this.textProvider = textProvider; + } + + @Inject + public void setLocaleProviderFactory(LocaleProviderFactory localeProviderFactory) { + this.localeProviderFactory = localeProviderFactory; + } + + @Inject + public void setLocalizedTextProvider(LocalizedTextProvider localizedTextProvider) { + this.localizedTextProvider = localizedTextProvider; + } + + public TextProvider createInstance(Class clazz) { + TextProvider instance = getTextProvider(clazz); + if (instance instanceof ResourceBundleTextProvider) { + ((ResourceBundleTextProvider) instance).setClazz(clazz); + ((ResourceBundleTextProvider) instance).setLocaleProvider(localeProviderFactory.createLocaleProvider()); + } + return instance; + } + + public TextProvider createInstance(ResourceBundle bundle) { + TextProvider instance = getTextProvider(bundle); + if (instance instanceof ResourceBundleTextProvider) { + ((ResourceBundleTextProvider) instance).setBundle(bundle); + ((ResourceBundleTextProvider) instance).setLocaleProvider(localeProviderFactory.createLocaleProvider()); + } + return instance; + } + + protected TextProvider getTextProvider(Class clazz) { + if (this.textProvider == null) { + return new TextProviderSupport(clazz, localeProviderFactory.createLocaleProvider(), localizedTextProvider); + } else { + return textProvider; + } + } + + private TextProvider getTextProvider(ResourceBundle bundle) { + if (this.textProvider == null) { + return new TextProviderSupport(bundle, localeProviderFactory.createLocaleProvider(), localizedTextProvider); + } + return textProvider; + } + +} http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/main/java/com/opensymphony/xwork2/TextProviderFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/TextProviderFactory.java b/core/src/main/java/com/opensymphony/xwork2/TextProviderFactory.java deleted file mode 100644 index 4d55d6c..0000000 --- a/core/src/main/java/com/opensymphony/xwork2/TextProviderFactory.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright 2002-2007,2009 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.opensymphony.xwork2; - -import com.opensymphony.xwork2.inject.Inject; - -import java.util.ResourceBundle; - -/** - * This factory enables users to provide and correctly initialize a custom TextProvider. - * - * @author Oleg Gorobets - * @author Rene Gielen - */ -public class TextProviderFactory { - - private TextProvider textProvider; - private LocaleProviderFactory localeProviderFactory; - private LocalizedTextProvider localizedTextProvider; - - @Inject - public void setTextProvider(TextProvider textProvider) { - this.textProvider = textProvider; - } - - @Inject - public void setLocaleProviderFactory(LocaleProviderFactory localeProviderFactory) { - this.localeProviderFactory = localeProviderFactory; - } - - @Inject - public void setLocalizedTextProvider(LocalizedTextProvider localizedTextProvider) { - this.localizedTextProvider = localizedTextProvider; - } - - public TextProvider createInstance(Class clazz) { - TextProvider instance = getTextProvider(clazz); - if (instance instanceof ResourceBundleTextProvider) { - ((ResourceBundleTextProvider) instance).setClazz(clazz); - ((ResourceBundleTextProvider) instance).setLocaleProvider(localeProviderFactory.createLocaleProvider()); - } - return instance; - } - - public TextProvider createInstance(ResourceBundle bundle) { - TextProvider instance = getTextProvider(bundle); - if (instance instanceof ResourceBundleTextProvider) { - ((ResourceBundleTextProvider) instance).setBundle(bundle); - ((ResourceBundleTextProvider) instance).setLocaleProvider(localeProviderFactory.createLocaleProvider()); - } - return instance; - } - - protected TextProvider getTextProvider(Class clazz) { - if (this.textProvider == null) { - return new TextProviderSupport(clazz, localeProviderFactory.createLocaleProvider(), localizedTextProvider); - } else { - return textProvider; - } - } - - private TextProvider getTextProvider(ResourceBundle bundle) { - if (this.textProvider == null) { - return new TextProviderSupport(bundle, localeProviderFactory.createLocaleProvider(), localizedTextProvider); - } - return textProvider; - } - -} http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java ---------------------------------------------------------------------- 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 5c912e1..d29cf0e 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 @@ -4,7 +4,7 @@ import com.opensymphony.xwork2.ActionProxyFactory; import com.opensymphony.xwork2.DefaultActionProxyFactory; import com.opensymphony.xwork2.DefaultLocaleProviderFactory; import com.opensymphony.xwork2.LocaleProviderFactory; -import com.opensymphony.xwork2.TextProviderFactory; +import com.opensymphony.xwork2.StrutsTextProviderFactory; import com.opensymphony.xwork2.factory.DefaultUnknownHandlerFactory; import com.opensymphony.xwork2.factory.UnknownHandlerFactory; import com.opensymphony.xwork2.ognl.accessor.HttpParametersPropertyAccessor; @@ -12,13 +12,11 @@ import com.opensymphony.xwork2.ognl.accessor.ParameterPropertyAccessor; import com.opensymphony.xwork2.security.AcceptedPatternsChecker; import com.opensymphony.xwork2.security.DefaultAcceptedPatternsChecker; import com.opensymphony.xwork2.security.DefaultExcludedPatternsChecker; -import com.opensymphony.xwork2.DefaultLocaleProvider; import com.opensymphony.xwork2.DefaultTextProvider; import com.opensymphony.xwork2.DefaultUnknownHandlerManager; import com.opensymphony.xwork2.security.ExcludedPatternsChecker; import com.opensymphony.xwork2.FileManager; import com.opensymphony.xwork2.FileManagerFactory; -import com.opensymphony.xwork2.LocaleProvider; import com.opensymphony.xwork2.ObjectFactory; import com.opensymphony.xwork2.TextProvider; import com.opensymphony.xwork2.TextProviderSupport; @@ -183,7 +181,7 @@ public class XWorkConfigurationProvider implements ConfigurationProvider { .factory(ActionValidatorManager.class, AnnotationActionValidatorManager.class, Scope.SINGLETON) .factory(ActionValidatorManager.class, "no-annotations", DefaultActionValidatorManager.class, Scope.SINGLETON) - .factory(TextProviderFactory.class, Scope.SINGLETON) + .factory(StrutsTextProviderFactory.class, Scope.SINGLETON) .factory(LocalizedTextProvider.class, DefaultLocalizedTextProvider.class, Scope.SINGLETON) .factory(TextProvider.class, "system", DefaultTextProvider.class, Scope.SINGLETON) .factory(TextProvider.class, TextProviderSupport.class, Scope.SINGLETON) http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java b/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java index cd6fa4e..2e0fc30 100644 --- a/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java +++ b/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java @@ -52,7 +52,7 @@ public class AnnotationActionValidatorManager implements ActionValidatorManager private ValidatorFileParser validatorFileParser; private FileManager fileManager; private boolean reloadingConfigs; - private TextProviderFactory textProviderFactory; + private StrutsTextProviderFactory textProviderFactory; @Inject public void setValidatorFactory(ValidatorFactory fac) { @@ -75,7 +75,7 @@ public class AnnotationActionValidatorManager implements ActionValidatorManager } @Inject - public void setTextProviderFactory(TextProviderFactory textProviderFactory) { + public void setTextProviderFactory(StrutsTextProviderFactory textProviderFactory) { this.textProviderFactory = textProviderFactory; } http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java b/core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java index 48d552a..85237c9 100644 --- a/core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java +++ b/core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java @@ -18,7 +18,7 @@ package com.opensymphony.xwork2.validator; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.FileManager; import com.opensymphony.xwork2.FileManagerFactory; -import com.opensymphony.xwork2.TextProviderFactory; +import com.opensymphony.xwork2.StrutsTextProviderFactory; import com.opensymphony.xwork2.XWorkConstants; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.util.ClassLoaderUtil; @@ -63,7 +63,7 @@ public class DefaultActionValidatorManager implements ActionValidatorManager { private ValidatorFileParser validatorFileParser; private FileManager fileManager; private boolean reloadingConfigs; - private TextProviderFactory textProviderFactory; + private StrutsTextProviderFactory textProviderFactory; @Inject public void setValidatorFileParser(ValidatorFileParser parser) { @@ -86,7 +86,7 @@ public class DefaultActionValidatorManager implements ActionValidatorManager { } @Inject - public void setTextProviderFactory(TextProviderFactory textProviderFactory) { + public void setTextProviderFactory(StrutsTextProviderFactory textProviderFactory) { this.textProviderFactory = textProviderFactory; } http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java b/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java index b8921e9..3c75e2b 100644 --- a/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java +++ b/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java @@ -57,7 +57,7 @@ public class DelegatingValidatorContext implements ValidatorContext { * * @param object the object to use for validation (usually an Action). */ - public DelegatingValidatorContext(Object object, TextProviderFactory textProviderFactory) { + public DelegatingValidatorContext(Object object, StrutsTextProviderFactory textProviderFactory) { this.localeProvider = makeLocaleProvider(object); this.validationAware = makeValidationAware(object); this.textProvider = makeTextProvider(object, textProviderFactory); @@ -74,7 +74,7 @@ public class DelegatingValidatorContext implements ValidatorContext { @Deprecated public DelegatingValidatorContext(Class clazz) { localeProvider = new ActionContextLocaleProvider(); - textProvider = new TextProviderFactory().createInstance(clazz); + textProvider = new StrutsTextProviderFactory().createInstance(clazz); validationAware = new LoggingValidationAware(clazz); } @@ -196,7 +196,7 @@ public class DelegatingValidatorContext implements ValidatorContext { return validationAware.hasFieldErrors(); } - public TextProvider makeTextProvider(Object object, TextProviderFactory textProviderFactory) { + public TextProvider makeTextProvider(Object object, StrutsTextProviderFactory textProviderFactory) { // the object argument passed through here will most probably be an ActionSupport descendant which does // implements TextProvider. if (object != null && object instanceof DelegatingValidatorContext) { http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java b/core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java index 3cfdb4b..f99db43 100644 --- a/core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java +++ b/core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java @@ -15,7 +15,7 @@ */ package com.opensymphony.xwork2.validator.validators; -import com.opensymphony.xwork2.TextProviderFactory; +import com.opensymphony.xwork2.StrutsTextProviderFactory; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.util.TextParseUtil; import com.opensymphony.xwork2.util.ValueStack; @@ -47,10 +47,10 @@ public abstract class ValidatorSupport implements Validator, ShortCircuitableVal private String[] messageParameters; protected ValueStack stack; - protected TextProviderFactory textProviderFactory; + protected StrutsTextProviderFactory textProviderFactory; @Inject - public void setTextProviderFactory(TextProviderFactory textProviderFactory) { + public void setTextProviderFactory(StrutsTextProviderFactory textProviderFactory) { this.textProviderFactory = textProviderFactory; } http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/main/java/org/apache/struts2/components/I18n.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/components/I18n.java b/core/src/main/java/org/apache/struts2/components/I18n.java index 89e38bb..6d173ef 100644 --- a/core/src/main/java/org/apache/struts2/components/I18n.java +++ b/core/src/main/java/org/apache/struts2/components/I18n.java @@ -31,7 +31,7 @@ import org.apache.struts2.StrutsException; import com.opensymphony.xwork2.LocaleProvider; import com.opensymphony.xwork2.TextProvider; -import com.opensymphony.xwork2.TextProviderFactory; +import com.opensymphony.xwork2.StrutsTextProviderFactory; import com.opensymphony.xwork2.inject.Container; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.util.DefaultLocalizedTextProvider; @@ -126,7 +126,7 @@ public class I18n extends Component { } if (bundle != null) { - TextProviderFactory tpf = container.inject(TextProviderFactory.class); + StrutsTextProviderFactory tpf = container.inject(StrutsTextProviderFactory.class); textProvider = tpf.createInstance(bundle); getStack().push(textProvider); pushed = true; http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java index f77f8ae..2f1db95 100644 --- a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java +++ b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java @@ -24,7 +24,7 @@ package org.apache.struts2.config; import com.opensymphony.xwork2.ActionProxyFactory; import com.opensymphony.xwork2.LocaleProviderFactory; import com.opensymphony.xwork2.LocalizedTextProvider; -import com.opensymphony.xwork2.TextProviderFactory; +import com.opensymphony.xwork2.StrutsTextProviderFactory; import com.opensymphony.xwork2.factory.UnknownHandlerFactory; import com.opensymphony.xwork2.security.AcceptedPatternsChecker; import com.opensymphony.xwork2.security.ExcludedPatternsChecker; @@ -398,7 +398,7 @@ public class DefaultBeanSelectionProvider extends AbstractBeanSelectionProvider alias(TypeConverterHolder.class, StrutsConstants.STRUTS_CONVERTER_HOLDER, builder, props); alias(TextProvider.class, StrutsConstants.STRUTS_XWORKTEXTPROVIDER, builder, props, Scope.PROTOTYPE); - alias(TextProviderFactory.class, StrutsConstants.STRUTS_TEXT_PROVIDER_FACTORY, builder, props, Scope.PROTOTYPE); + alias(StrutsTextProviderFactory.class, StrutsConstants.STRUTS_TEXT_PROVIDER_FACTORY, builder, props, Scope.PROTOTYPE); alias(LocaleProviderFactory.class, StrutsConstants.STRUTS_LOCALE_PROVIDER_FACTORY, builder, props); alias(LocalizedTextProvider.class, StrutsConstants.STRUTS_LOCALIZED_TEXT_PROVIDER, builder, props); http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java index b00f2e3..138b033 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java @@ -446,7 +446,7 @@ public class FileUploadInterceptor extends AbstractInterceptor { } private TextProvider getTextProvider(Object action) { - TextProviderFactory tpf = container.inject(TextProviderFactory.class); + StrutsTextProviderFactory tpf = container.inject(StrutsTextProviderFactory.class); return tpf.createInstance(action.getClass()); } http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/main/resources/struts-default.xml ---------------------------------------------------------------------- diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml index 3a4f6ee..b0c0769 100644 --- a/core/src/main/resources/struts-default.xml +++ b/core/src/main/resources/struts-default.xml @@ -130,7 +130,7 @@ <bean type="com.opensymphony.xwork2.conversion.impl.NumberConverter" name="struts" class="com.opensymphony.xwork2.conversion.impl.NumberConverter" scope="singleton"/> <bean type="com.opensymphony.xwork2.conversion.impl.StringConverter" name="struts" class="com.opensymphony.xwork2.conversion.impl.StringConverter" scope="singleton"/> - <bean type="com.opensymphony.xwork2.TextProviderFactory" name="struts" class="com.opensymphony.xwork2.TextProviderFactory" scope="prototype" /> + <bean type="com.opensymphony.xwork2.StrutsTextProviderFactory" name="struts" class="com.opensymphony.xwork2.StrutsTextProviderFactory" scope="prototype" /> <bean type="com.opensymphony.xwork2.LocalizedTextProvider" name="struts" class="com.opensymphony.xwork2.util.DefaultLocalizedTextProvider" scope="singleton" /> <bean type="com.opensymphony.xwork2.TextProvider" name="struts" class="com.opensymphony.xwork2.TextProviderSupport" scope="prototype" /> <bean type="com.opensymphony.xwork2.LocaleProviderFactory" name="struts" class="com.opensymphony.xwork2.DefaultLocaleProviderFactory" scope="singleton" /> http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/CompositeTextProviderTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/CompositeTextProviderTest.java b/core/src/test/java/com/opensymphony/xwork2/CompositeTextProviderTest.java index 7290902..ab5c170 100644 --- a/core/src/test/java/com/opensymphony/xwork2/CompositeTextProviderTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/CompositeTextProviderTest.java @@ -77,7 +77,7 @@ public class CompositeTextProviderTest extends XWorkTestCase { protected void setUp() throws Exception { super.setUp(); - TextProviderFactory tpf = container.getInstance(TextProviderFactory.class); + StrutsTextProviderFactory tpf = container.getInstance(StrutsTextProviderFactory.class); tpf.setTextProvider(null); ActionContext.getContext().setLocale(Locale.ENGLISH); http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java index 89c21e3..c2b3ba2 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java @@ -24,7 +24,7 @@ import com.opensymphony.xwork2.FileManager; import com.opensymphony.xwork2.FileManagerFactory; import com.opensymphony.xwork2.SimpleAction; import com.opensymphony.xwork2.SimpleAnnotationAction; -import com.opensymphony.xwork2.TextProviderFactory; +import com.opensymphony.xwork2.StrutsTextProviderFactory; import com.opensymphony.xwork2.XWorkTestCase; import com.opensymphony.xwork2.config.entities.ActionConfig; import com.opensymphony.xwork2.test.AnnotationDataAware2; @@ -59,7 +59,7 @@ public class AnnotationActionValidatorManagerTest extends XWorkTestCase { protected final String alias = "annotationValidationAlias"; AnnotationActionValidatorManager annotationActionValidatorManager; - private TextProviderFactory tpf; + private StrutsTextProviderFactory tpf; @Override protected void setUp() throws Exception { super.setUp(); @@ -81,7 +81,7 @@ public class AnnotationActionValidatorManagerTest extends XWorkTestCase { ActionContext.getContext().setActionInvocation(invocation); - tpf = container.getInstance(TextProviderFactory.class); + tpf = container.getInstance(StrutsTextProviderFactory.class); } @Override protected void tearDown() throws Exception { http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/ConversionErrorFieldValidatorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/ConversionErrorFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/ConversionErrorFieldValidatorTest.java index 8182d77..9cdeac0 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/ConversionErrorFieldValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/ConversionErrorFieldValidatorTest.java @@ -16,7 +16,7 @@ package com.opensymphony.xwork2.validator; import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.TextProviderFactory; +import com.opensymphony.xwork2.StrutsTextProviderFactory; import com.opensymphony.xwork2.interceptor.ValidationAware; import com.opensymphony.xwork2.ValidationAwareSupport; import com.opensymphony.xwork2.XWorkTestCase; @@ -53,7 +53,7 @@ public class ConversionErrorFieldValidatorTest extends XWorkTestCase { validator = new ConversionErrorFieldValidator(); validationAware = new ValidationAwareSupport(); - DelegatingValidatorContext validatorContext = new DelegatingValidatorContext(validationAware, container.inject(TextProviderFactory.class)); + DelegatingValidatorContext validatorContext = new DelegatingValidatorContext(validationAware, container.inject(StrutsTextProviderFactory.class)); stack.push(validatorContext); validator.setValidatorContext(validatorContext); validator.setFieldName("foo"); http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java index 3f75a14..bd3d9da 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java @@ -21,7 +21,7 @@ import java.util.Map; */ public class DoubleRangeValidatorTest extends XWorkTestCase { private DoubleRangeFieldValidator val; - private TextProviderFactory tpf; + private StrutsTextProviderFactory tpf; public void testRangeValidationWithError() throws Exception { //Explicitly set an out-of-range double for DoubleRangeValidatorTest @@ -237,7 +237,7 @@ public class DoubleRangeValidatorTest extends XWorkTestCase { val = new DoubleRangeFieldValidator(); val.setValueStack(ActionContext.getContext().getValueStack()); ActionContext.getContext().setParameters(HttpParameters.create().build()); - tpf = container.inject(TextProviderFactory.class); + tpf = container.inject(StrutsTextProviderFactory.class); } @Override http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/DummyValidatorContext.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/DummyValidatorContext.java b/core/src/test/java/com/opensymphony/xwork2/validator/DummyValidatorContext.java index e0f5f33..d9e138c 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/DummyValidatorContext.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/DummyValidatorContext.java @@ -15,7 +15,7 @@ */ package com.opensymphony.xwork2.validator; -import com.opensymphony.xwork2.TextProviderFactory; +import com.opensymphony.xwork2.StrutsTextProviderFactory; import java.util.*; @@ -33,7 +33,7 @@ public class DummyValidatorContext extends DelegatingValidatorContext { private Map<String, List<String>> fieldErrors; - public DummyValidatorContext(Object object, TextProviderFactory tpf) { + public DummyValidatorContext(Object object, StrutsTextProviderFactory tpf) { super(object, tpf); } http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java index ae8c036..5a66920 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java @@ -17,7 +17,7 @@ package com.opensymphony.xwork2.validator; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionSupport; -import com.opensymphony.xwork2.TextProviderFactory; +import com.opensymphony.xwork2.StrutsTextProviderFactory; import com.opensymphony.xwork2.XWorkTestCase; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.validator.validators.EmailValidator; @@ -30,7 +30,7 @@ import com.opensymphony.xwork2.validator.validators.EmailValidator; */ public class EmailValidatorTest extends XWorkTestCase { - private TextProviderFactory tpf; + private StrutsTextProviderFactory tpf; public void testEmailValidity() throws Exception { assertTrue(verifyEmailValidity("[email protected]")); @@ -162,6 +162,6 @@ public class EmailValidatorTest extends XWorkTestCase { public void setUp() throws Exception { super.setUp(); - tpf = container.inject(TextProviderFactory.class); + tpf = container.inject(StrutsTextProviderFactory.class); } } http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java index 30613a4..7ce38c5 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java @@ -38,7 +38,7 @@ import java.util.Map; */ public class ExpressionValidatorTest extends XWorkTestCase { - private TextProviderFactory tpf; + private StrutsTextProviderFactory tpf; public void testExpressionValidationOfStringLength() throws ValidationException { TestBean bean = new TestBean(); @@ -139,7 +139,7 @@ public class ExpressionValidatorTest extends XWorkTestCase { ActionContext.getContext().setActionInvocation(invocation); - tpf = container.inject(TextProviderFactory.class); + tpf = container.inject(StrutsTextProviderFactory.class); } } http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/RegexFieldValidatorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/RegexFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/RegexFieldValidatorTest.java index 5c7e94b..6dd8e3f 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/RegexFieldValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/RegexFieldValidatorTest.java @@ -16,7 +16,7 @@ package com.opensymphony.xwork2.validator; import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.TextProviderFactory; +import com.opensymphony.xwork2.StrutsTextProviderFactory; import com.opensymphony.xwork2.XWorkTestCase; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.validator.validators.RegexFieldValidator; @@ -37,11 +37,11 @@ import java.util.List; */ public class RegexFieldValidatorTest extends XWorkTestCase { - private TextProviderFactory tpf; + private StrutsTextProviderFactory tpf; public void setUp() throws Exception { super.setUp(); - tpf = container.inject(TextProviderFactory.class); + tpf = container.inject(StrutsTextProviderFactory.class); } public void testMatch() throws Exception { http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java index c4aa178..ad8418b 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java @@ -17,7 +17,7 @@ package com.opensymphony.xwork2.validator; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionSupport; -import com.opensymphony.xwork2.TextProviderFactory; +import com.opensymphony.xwork2.StrutsTextProviderFactory; import com.opensymphony.xwork2.XWorkTestCase; import com.opensymphony.xwork2.mock.MockActionInvocation; import com.opensymphony.xwork2.util.ValueStack; @@ -92,7 +92,7 @@ public class RepopulateConversionErrorFieldValidatorSupportTest extends XWorkTes conversionErrors.put("someFieldName", conversionErrorValue); conversionErrors.put("xxxsomeFieldName", conversionErrorValue); - TextProviderFactory tpf = container.inject(TextProviderFactory.class); + StrutsTextProviderFactory tpf = container.inject(StrutsTextProviderFactory.class); action = container.inject(ActionSupport.class); validator1 = http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java index 991a75e..e737dde 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java @@ -153,7 +153,7 @@ public class SimpleActionValidationTest extends XWorkTestCase { SimpleAction action = new SimpleAction(); container.inject(action); - ValidatorContext validatorContext = new DelegatingValidatorContext(action, container.inject(TextProviderFactory.class)); + ValidatorContext validatorContext = new DelegatingValidatorContext(action, container.inject(StrutsTextProviderFactory.class)); validator.setValidatorContext(validatorContext); validator.validate(this); assertTrue(validatorContext.hasActionErrors()); http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/StringLengthFieldValidatorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/StringLengthFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/StringLengthFieldValidatorTest.java index 884d495..b8f3472 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/StringLengthFieldValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/StringLengthFieldValidatorTest.java @@ -17,7 +17,7 @@ package com.opensymphony.xwork2.validator; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionSupport; -import com.opensymphony.xwork2.TextProviderFactory; +import com.opensymphony.xwork2.StrutsTextProviderFactory; import com.opensymphony.xwork2.XWorkTestCase; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.validator.validators.StringLengthFieldValidator; @@ -163,7 +163,7 @@ public class StringLengthFieldValidatorTest extends XWorkTestCase { validator = new StringLengthFieldValidator(); validator.setFieldName("myField"); validator.setMessageKey("error"); - validator.setValidatorContext(new DelegatingValidatorContext(action, container.inject(TextProviderFactory.class))); + validator.setValidatorContext(new DelegatingValidatorContext(action, container.inject(StrutsTextProviderFactory.class))); validator.setMaxLength(5); validator.setMinLength(2); validator.setValueStack(valueStack); http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/StringValidatorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/StringValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/StringValidatorTest.java index c737d97..0ca581c 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/StringValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/StringValidatorTest.java @@ -19,7 +19,7 @@ import com.opensymphony.xwork2.Action; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.ActionProxy; -import com.opensymphony.xwork2.TextProviderFactory; +import com.opensymphony.xwork2.StrutsTextProviderFactory; import com.opensymphony.xwork2.ValidationAwareSupport; import com.opensymphony.xwork2.XWorkTestCase; import com.opensymphony.xwork2.config.entities.ActionConfig; @@ -37,7 +37,7 @@ import java.util.Map; */ public class StringValidatorTest extends XWorkTestCase { - private TextProviderFactory tpf; + private StrutsTextProviderFactory tpf; public void testRequiredStringWithNullValue() throws Exception { Equidae equidae = new Equidae(); @@ -217,6 +217,6 @@ public class StringValidatorTest extends XWorkTestCase { ActionContext.getContext().setActionInvocation(invocation); - tpf = container.inject(TextProviderFactory.class); + tpf = container.inject(StrutsTextProviderFactory.class); } } http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java index ff9ab50..d377bc9 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java @@ -16,7 +16,7 @@ package com.opensymphony.xwork2.validator; import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.TextProviderFactory; +import com.opensymphony.xwork2.StrutsTextProviderFactory; import com.opensymphony.xwork2.XWorkTestCase; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.validator.validators.URLValidator; @@ -37,7 +37,7 @@ public class URLValidatorTest extends XWorkTestCase { ValueStack stack; ActionContext actionContext; - private TextProviderFactory tpf; + private StrutsTextProviderFactory tpf; public void testAcceptNullValueForMutualExclusionOfValidators() throws Exception { @@ -205,7 +205,7 @@ public class URLValidatorTest extends XWorkTestCase { super.setUp(); stack = ActionContext.getContext().getValueStack(); actionContext = ActionContext.getContext(); - tpf = container.inject(TextProviderFactory.class); + tpf = container.inject(StrutsTextProviderFactory.class); } @Override http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java index 0446e97..5727e45 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java @@ -6,7 +6,7 @@ import java.util.Map; import com.opensymphony.xwork2.CompositeTextProvider; import com.opensymphony.xwork2.TextProvider; -import com.opensymphony.xwork2.TextProviderFactory; +import com.opensymphony.xwork2.StrutsTextProviderFactory; import com.opensymphony.xwork2.XWorkTestCase; import com.opensymphony.xwork2.validator.DelegatingValidatorContext; import com.opensymphony.xwork2.validator.ValidatorContext; @@ -28,7 +28,7 @@ public class AppendingValidatorContextTest extends XWorkTestCase { super.setUp(); action = container.inject(VisitorValidatorTestAction.class); - TextProviderFactory tpf = container.getInstance(TextProviderFactory.class); + StrutsTextProviderFactory tpf = container.getInstance(StrutsTextProviderFactory.class); ValidatorContext vc1 = new DelegatingValidatorContext(action, tpf); VisitorFieldValidator.AppendingValidatorContext vc2 = new AppendingValidatorContext(vc1, createTextProvider(action, vc1), FIRST_NAME, ""); http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java index 6129fc0..789c6a4 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java @@ -1,7 +1,7 @@ package com.opensymphony.xwork2.validator.validators; import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.TextProviderFactory; +import com.opensymphony.xwork2.StrutsTextProviderFactory; import com.opensymphony.xwork2.XWorkTestCase; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStackFactory; @@ -14,7 +14,7 @@ import java.util.Locale; public class DateRangeFieldValidatorTest extends XWorkTestCase { - private TextProviderFactory tpf; + private StrutsTextProviderFactory tpf; public void testPassValidation() throws Exception { // given @@ -91,7 +91,7 @@ public class DateRangeFieldValidatorTest extends XWorkTestCase { public void setUp() throws Exception { super.setUp(); ActionContext.getContext().setLocale(new Locale("DE")); - tpf = container.inject(TextProviderFactory.class); + tpf = container.inject(StrutsTextProviderFactory.class); } } http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidatorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidatorTest.java index 7703732..26dd422 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidatorTest.java @@ -1,6 +1,6 @@ package com.opensymphony.xwork2.validator.validators; -import com.opensymphony.xwork2.TextProviderFactory; +import com.opensymphony.xwork2.StrutsTextProviderFactory; import com.opensymphony.xwork2.XWorkTestCase; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStackFactory; @@ -9,11 +9,11 @@ import com.opensymphony.xwork2.validator.ValidatorContext; public class IntRangeFieldValidatorTest extends XWorkTestCase { - private TextProviderFactory tpf; + private StrutsTextProviderFactory tpf; public void setUp() throws Exception { super.setUp(); - tpf = container.inject(TextProviderFactory.class); + tpf = container.inject(StrutsTextProviderFactory.class); } public void testPassValidation() throws Exception { http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidatorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidatorTest.java index bc14b57..bc26cb4 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidatorTest.java @@ -1,6 +1,6 @@ package com.opensymphony.xwork2.validator.validators; -import com.opensymphony.xwork2.TextProviderFactory; +import com.opensymphony.xwork2.StrutsTextProviderFactory; import com.opensymphony.xwork2.XWorkTestCase; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStackFactory; @@ -9,11 +9,11 @@ import com.opensymphony.xwork2.validator.ValidatorContext; public class LongRangeFieldValidatorTest extends XWorkTestCase { - private TextProviderFactory tpf; + private StrutsTextProviderFactory tpf; public void setUp() throws Exception { super.setUp(); - tpf = container.inject(TextProviderFactory.class); + tpf = container.inject(StrutsTextProviderFactory.class); } public void testPassValidation() throws Exception { http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidatorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidatorTest.java index 1495733..614c406 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidatorTest.java @@ -2,7 +2,7 @@ package com.opensymphony.xwork2.validator.validators; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionSupport; -import com.opensymphony.xwork2.TextProviderFactory; +import com.opensymphony.xwork2.StrutsTextProviderFactory; import com.opensymphony.xwork2.XWorkTestCase; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.validator.DummyValidatorContext; @@ -10,11 +10,11 @@ import com.opensymphony.xwork2.validator.ValidatorContext; public class RequiredStringValidatorTest extends XWorkTestCase { - private TextProviderFactory tpf; + private StrutsTextProviderFactory tpf; public void setUp() throws Exception { super.setUp(); - tpf = container.inject(TextProviderFactory.class); + tpf = container.inject(StrutsTextProviderFactory.class); } public void testRequiredStringPass() throws Exception { http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/core/src/test/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidatorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidatorTest.java index bb27664..e6d3fb2 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidatorTest.java @@ -1,6 +1,6 @@ package com.opensymphony.xwork2.validator.validators; -import com.opensymphony.xwork2.TextProviderFactory; +import com.opensymphony.xwork2.StrutsTextProviderFactory; import com.opensymphony.xwork2.XWorkTestCase; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStackFactory; @@ -9,11 +9,11 @@ import com.opensymphony.xwork2.validator.ValidatorContext; public class ShortRangeFieldValidatorTest extends XWorkTestCase { - private TextProviderFactory tpf; + private StrutsTextProviderFactory tpf; public void setUp() throws Exception { super.setUp(); - tpf = container.inject(TextProviderFactory.class); + tpf = container.inject(StrutsTextProviderFactory.class); } public void testPassValidation() throws Exception { http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java ---------------------------------------------------------------------- diff --git a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java index 3123a4b..27660fb 100644 --- a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java +++ b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java @@ -23,7 +23,7 @@ package org.apache.struts.beanvalidation.validation.interceptor; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.ActionProxy; import com.opensymphony.xwork2.ModelDriven; -import com.opensymphony.xwork2.TextProviderFactory; +import com.opensymphony.xwork2.StrutsTextProviderFactory; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.interceptor.MethodFilterInterceptor; import com.opensymphony.xwork2.util.AnnotationUtils; @@ -58,7 +58,7 @@ public class BeanValidationInterceptor extends MethodFilterInterceptor { private static final Logger LOG = LogManager.getLogger(BeanValidationInterceptor.class); protected BeanValidationManager beanValidationManager; - protected TextProviderFactory textProviderFactory; + protected StrutsTextProviderFactory textProviderFactory; protected boolean convertToUtf8 = false; protected String convertFromEncoding = "ISO-8859-1"; @@ -68,7 +68,7 @@ public class BeanValidationInterceptor extends MethodFilterInterceptor { } @Inject - public void setTextProviderFactory(TextProviderFactory textProviderFactory) { + public void setTextProviderFactory(StrutsTextProviderFactory textProviderFactory) { this.textProviderFactory = textProviderFactory; } http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java ---------------------------------------------------------------------- diff --git a/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java b/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java index 473c9a7..2373b16 100644 --- a/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java +++ b/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java @@ -23,7 +23,7 @@ package org.apache.struts2.oval.interceptor; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.ActionProxy; import com.opensymphony.xwork2.ModelDriven; -import com.opensymphony.xwork2.TextProviderFactory; +import com.opensymphony.xwork2.StrutsTextProviderFactory; import com.opensymphony.xwork2.Validateable; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.interceptor.MethodFilterInterceptor; @@ -59,7 +59,7 @@ public class OValValidationInterceptor extends MethodFilterInterceptor { protected boolean programmatic = true; protected OValValidationManager validationManager; protected boolean validateJPAAnnotations; - protected TextProviderFactory textProviderFactory; + protected StrutsTextProviderFactory textProviderFactory; @Inject public void setValidationManager(OValValidationManager validationManager) { @@ -67,7 +67,7 @@ public class OValValidationInterceptor extends MethodFilterInterceptor { } @Inject - public void setTextProviderFactory(TextProviderFactory textProviderFactory) { + public void setTextProviderFactory(StrutsTextProviderFactory textProviderFactory) { this.textProviderFactory = textProviderFactory; } http://git-wip-us.apache.org/repos/asf/struts/blob/9376bb0c/plugins/tiles/src/main/java/org/apache/struts2/tiles/I18NAttributeEvaluator.java ---------------------------------------------------------------------- diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/I18NAttributeEvaluator.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/I18NAttributeEvaluator.java index 647a289..d1a3442 100644 --- a/plugins/tiles/src/main/java/org/apache/struts2/tiles/I18NAttributeEvaluator.java +++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/I18NAttributeEvaluator.java @@ -20,17 +20,13 @@ package org.apache.struts2.tiles; import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.LocaleProvider; import com.opensymphony.xwork2.TextProvider; -import com.opensymphony.xwork2.TextProviderFactory; +import com.opensymphony.xwork2.StrutsTextProviderFactory; import com.opensymphony.xwork2.config.ConfigurationException; -import com.opensymphony.xwork2.ognl.OgnlUtil; -import ognl.OgnlException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.ServletActionContext; import org.apache.tiles.evaluator.AbstractAttributeEvaluator; -import org.apache.tiles.evaluator.EvaluationException; import org.apache.tiles.request.Request; import org.apache.tiles.request.servlet.ServletUtil; @@ -52,7 +48,7 @@ public class I18NAttributeEvaluator extends AbstractAttributeEvaluator { throw new ConfigurationException("There is no ActionContext for current request!"); } - TextProviderFactory tpf = ctx.getContainer().inject(TextProviderFactory.class); + StrutsTextProviderFactory tpf = ctx.getContainer().inject(StrutsTextProviderFactory.class); TextProvider textProvider = tpf.createInstance(ctx.getActionInvocation().getAction().getClass()); if (textProvider != null) {
