You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2015/06/17 23:09:51 UTC
[51/57] [partial] struts git commit: Merges xwork packages into struts
Merges xwork packages into struts
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/31af5842
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/31af5842
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/31af5842
Branch: refs/heads/master
Commit: 31af5842e022c5cb755fd697e08e655765fae981
Parents: 86da1ea
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Jun 17 23:07:59 2015 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Jun 17 23:08:04 2015 +0200
----------------------------------------------------------------------
core/pom.xml | 128 +-
.../java/com/opensymphony/xwork2/Action.java | 80 ++
.../opensymphony/xwork2/ActionChainResult.java | 288 +++++
.../com/opensymphony/xwork2/ActionContext.java | 353 ++++++
.../xwork2/ActionEventListener.java | 41 +
.../opensymphony/xwork2/ActionInvocation.java | 179 +++
.../com/opensymphony/xwork2/ActionProxy.java | 103 ++
.../opensymphony/xwork2/ActionProxyFactory.java | 107 ++
.../com/opensymphony/xwork2/ActionSupport.java | 302 +++++
.../xwork2/CompositeTextProvider.java | 265 +++++
.../xwork2/DefaultActionInvocation.java | 514 ++++++++
.../opensymphony/xwork2/DefaultActionProxy.java | 216 ++++
.../xwork2/DefaultActionProxyFactory.java | 79 ++
.../xwork2/DefaultLocaleProvider.java | 25 +
.../xwork2/DefaultTextProvider.java | 146 +++
.../xwork2/DefaultUnknownHandlerManager.java | 131 ++
.../com/opensymphony/xwork2/FileManager.java | 75 ++
.../opensymphony/xwork2/FileManagerFactory.java | 12 +
.../xwork2/InvalidMetadataException.java | 34 +
.../com/opensymphony/xwork2/LocaleProvider.java | 40 +
.../xwork2/MockActionInvocation.java | 26 +
.../com/opensymphony/xwork2/ModelDriven.java | 34 +
.../com/opensymphony/xwork2/ObjectFactory.java | 251 ++++
.../com/opensymphony/xwork2/Preparable.java | 35 +
.../xwork2/ResourceBundleTextProvider.java | 48 +
.../java/com/opensymphony/xwork2/Result.java | 45 +
.../xwork2/TestNGXWorkTestCase.java | 62 +
.../com/opensymphony/xwork2/TextProvider.java | 180 +++
.../xwork2/TextProviderFactory.java | 71 ++
.../xwork2/TextProviderSupport.java | 329 +++++
.../com/opensymphony/xwork2/Unchainable.java | 25 +
.../com/opensymphony/xwork2/UnknownHandler.java | 63 +
.../xwork2/UnknownHandlerManager.java | 37 +
.../com/opensymphony/xwork2/Validateable.java | 33 +
.../opensymphony/xwork2/ValidationAware.java | 130 ++
.../xwork2/ValidationAwareSupport.java | 169 +++
.../java/com/opensymphony/xwork2/XWork.java | 79 ++
.../com/opensymphony/xwork2/XWorkConstants.java | 30 +
.../com/opensymphony/xwork2/XWorkException.java | 154 +++
.../xwork2/XWorkJUnit4TestCase.java | 79 ++
.../com/opensymphony/xwork2/XWorkMessages.java | 31 +
.../com/opensymphony/xwork2/XWorkTestCase.java | 90 ++
.../xwork2/config/BeanSelectionProvider.java | 8 +
.../xwork2/config/Configuration.java | 98 ++
.../xwork2/config/ConfigurationException.java | 87 ++
.../xwork2/config/ConfigurationManager.java | 232 ++++
.../xwork2/config/ConfigurationProvider.java | 22 +
.../xwork2/config/ConfigurationUtil.java | 83 ++
.../xwork2/config/ContainerProvider.java | 57 +
.../config/FileManagerFactoryProvider.java | 33 +
.../xwork2/config/FileManagerProvider.java | 35 +
.../xwork2/config/PackageProvider.java | 46 +
.../config/ReferenceResolverException.java | 43 +
.../xwork2/config/RuntimeConfiguration.java | 53 +
.../xwork2/config/entities/ActionConfig.java | 351 ++++++
.../config/entities/ExceptionMappingConfig.java | 181 +++
.../config/entities/InterceptorConfig.java | 158 +++
.../config/entities/InterceptorListHolder.java | 31 +
.../config/entities/InterceptorLocator.java | 14 +
.../config/entities/InterceptorMapping.java | 71 ++
.../config/entities/InterceptorStackConfig.java | 182 +++
.../xwork2/config/entities/PackageConfig.java | 615 ++++++++++
.../xwork2/config/entities/Parameterizable.java | 40 +
.../xwork2/config/entities/ResultConfig.java | 159 +++
.../config/entities/ResultTypeConfig.java | 170 +++
.../config/entities/UnknownHandlerConfig.java | 43 +
.../xwork2/config/entities/package.html | 18 +
.../xwork2/config/impl/AbstractMatcher.java | 267 +++++
.../xwork2/config/impl/ActionConfigMatcher.java | 152 +++
.../config/impl/DefaultConfiguration.java | 514 ++++++++
.../config/impl/LocatableConstantFactory.java | 34 +
.../xwork2/config/impl/LocatableFactory.java | 52 +
.../xwork2/config/impl/MockConfiguration.java | 119 ++
.../xwork2/config/impl/NamespaceMatch.java | 47 +
.../xwork2/config/impl/NamespaceMatcher.java | 51 +
.../xwork2/config/impl/package.html | 1 +
.../com/opensymphony/xwork2/config/package.html | 1 +
.../xwork2/config/providers/CycleDetector.java | 59 +
.../xwork2/config/providers/DirectedGraph.java | 143 +++
.../config/providers/InterceptorBuilder.java | 214 ++++
.../providers/XWorkConfigurationProvider.java | 191 +++
.../providers/XmlConfigurationProvider.java | 1071 +++++++++++++++++
.../xwork2/config/providers/XmlHelper.java | 127 ++
.../xwork2/config/providers/package.html | 1 +
.../ConversionAnnotationProcessor.java | 23 +
.../conversion/ConversionFileProcessor.java | 19 +
.../ConversionPropertiesProcessor.java | 22 +
.../xwork2/conversion/NullHandler.java | 54 +
.../xwork2/conversion/ObjectTypeDeterminer.java | 36 +
.../conversion/TypeConversionException.java | 61 +
.../xwork2/conversion/TypeConverter.java | 64 +
.../xwork2/conversion/TypeConverterCreator.java | 17 +
.../xwork2/conversion/TypeConverterHolder.java | 82 ++
.../conversion/annotations/Conversion.java | 95 ++
.../conversion/annotations/ConversionRule.java | 33 +
.../conversion/annotations/ConversionType.java | 34 +
.../conversion/annotations/TypeConversion.java | 178 +++
.../xwork2/conversion/annotations/package.html | 1 +
.../impl/AnnotationXWorkConverter.java | 91 ++
.../xwork2/conversion/impl/ArrayConverter.java | 36 +
.../conversion/impl/CollectionConverter.java | 93 ++
.../xwork2/conversion/impl/DateConverter.java | 101 ++
.../DefaultConversionAnnotationProcessor.java | 76 ++
.../impl/DefaultConversionFileProcessor.java | 98 ++
.../DefaultConversionPropertiesProcessor.java | 81 ++
.../impl/DefaultObjectTypeDeterminer.java | 294 +++++
.../conversion/impl/DefaultTypeConverter.java | 355 ++++++
.../impl/DefaultTypeConverterCreator.java | 35 +
.../impl/DefaultTypeConverterHolder.java | 97 ++
.../conversion/impl/EnumTypeConverter.java | 124 ++
.../impl/GenericsObjectTypeDeterminer.java | 38 +
.../impl/InstantiatingNullHandler.java | 157 +++
.../xwork2/conversion/impl/NumberConverter.java | 118 ++
.../xwork2/conversion/impl/StringConverter.java | 73 ++
.../conversion/impl/XWorkBasicConverter.java | 212 ++++
.../xwork2/conversion/impl/XWorkConverter.java | 595 +++++++++
.../metadata/ConversionDescription.java | 184 +++
.../xwork2/conversion/metadata/package.html | 1 +
.../xwork2/factory/ActionFactory.java | 18 +
.../xwork2/factory/ConverterFactory.java | 21 +
.../xwork2/factory/DefaultActionFactory.java | 25 +
.../xwork2/factory/DefaultConverterFactory.java | 30 +
.../factory/DefaultInterceptorFactory.java | 67 ++
.../xwork2/factory/DefaultResultFactory.java | 54 +
.../factory/DefaultUnknownHandlerFactory.java | 25 +
.../xwork2/factory/DefaultValidatorFactory.java | 34 +
.../xwork2/factory/InterceptorFactory.java | 28 +
.../xwork2/factory/ResultFactory.java | 15 +
.../xwork2/factory/UnknownHandlerFactory.java | 21 +
.../xwork2/factory/ValidatorFactory.java | 21 +
.../xwork2/inject/ConstructionContext.java | 119 ++
.../opensymphony/xwork2/inject/Container.java | 113 ++
.../xwork2/inject/ContainerBuilder.java | 510 ++++++++
.../xwork2/inject/ContainerImpl.java | 603 ++++++++++
.../com/opensymphony/xwork2/inject/Context.java | 57 +
.../xwork2/inject/DependencyException.java | 37 +
.../xwork2/inject/ExternalContext.java | 73 ++
.../com/opensymphony/xwork2/inject/Factory.java | 34 +
.../com/opensymphony/xwork2/inject/Inject.java | 46 +
.../xwork2/inject/InternalContext.java | 77 ++
.../xwork2/inject/InternalFactory.java | 35 +
.../com/opensymphony/xwork2/inject/Key.java | 77 ++
.../com/opensymphony/xwork2/inject/Scope.java | 214 ++++
.../com/opensymphony/xwork2/inject/Scoped.java | 37 +
.../xwork2/inject/package-info.java | 30 +
.../util/FinalizablePhantomReference.java | 35 +
.../inject/util/FinalizableReference.java | 32 +
.../inject/util/FinalizableReferenceQueue.java | 77 ++
.../inject/util/FinalizableSoftReference.java | 34 +
.../inject/util/FinalizableWeakReference.java | 34 +
.../xwork2/inject/util/Function.java | 44 +
.../xwork2/inject/util/ReferenceCache.java | 177 +++
.../xwork2/inject/util/ReferenceMap.java | 605 ++++++++++
.../xwork2/inject/util/ReferenceType.java | 55 +
.../xwork2/inject/util/Strings.java | 55 +
.../xwork2/inject/util/package.html | 1 +
.../xwork2/interceptor/AbstractInterceptor.java | 42 +
.../xwork2/interceptor/AliasInterceptor.java | 194 +++
.../xwork2/interceptor/ChainingInterceptor.java | 230 ++++
.../interceptor/ConversionErrorInterceptor.java | 144 +++
.../interceptor/DefaultWorkflowInterceptor.java | 214 ++++
.../xwork2/interceptor/ExceptionHolder.java | 77 ++
.../ExceptionMappingInterceptor.java | 323 +++++
.../xwork2/interceptor/I18nInterceptor.java | 288 +++++
.../xwork2/interceptor/Interceptor.java | 213 ++++
.../xwork2/interceptor/LoggingInterceptor.java | 86 ++
.../interceptor/MethodFilterInterceptor.java | 122 ++
.../MethodFilterInterceptorUtil.java | 145 +++
.../interceptor/ModelDrivenInterceptor.java | 144 +++
.../xwork2/interceptor/NoParameters.java | 32 +
.../interceptor/ParameterFilterInterceptor.java | 236 ++++
.../xwork2/interceptor/ParameterNameAware.java | 38 +
.../ParameterRemoverInterceptor.java | 143 +++
.../interceptor/ParametersInterceptor.java | 492 ++++++++
.../xwork2/interceptor/PreResultListener.java | 39 +
.../interceptor/PrefixMethodInvocationUtil.java | 168 +++
.../xwork2/interceptor/PrepareInterceptor.java | 174 +++
.../xwork2/interceptor/ScopedModelDriven.java | 40 +
.../ScopedModelDrivenInterceptor.java | 164 +++
.../StaticParametersInterceptor.java | 240 ++++
.../xwork2/interceptor/TimerInterceptor.java | 244 ++++
.../interceptor/ValidationErrorAware.java | 38 +
.../interceptor/ValidationWorkflowAware.java | 12 +
.../xwork2/interceptor/annotations/After.java | 81 ++
.../xwork2/interceptor/annotations/Allowed.java | 18 +
.../AnnotationParameterFilterIntereptor.java | 95 ++
.../AnnotationWorkflowInterceptor.java | 192 +++
.../xwork2/interceptor/annotations/Before.java | 80 ++
.../interceptor/annotations/BeforeResult.java | 80 ++
.../interceptor/annotations/BlockByDefault.java | 21 +
.../xwork2/interceptor/annotations/Blocked.java | 18 +
.../interceptor/annotations/InputConfig.java | 92 ++
.../xwork2/interceptor/annotations/package.html | 1 +
.../xwork2/interceptor/package.html | 1 +
.../xwork2/mock/MockActionInvocation.java | 133 +++
.../xwork2/mock/MockActionProxy.java | 127 ++
.../opensymphony/xwork2/mock/MockContainer.java | 41 +
.../xwork2/mock/MockInterceptor.java | 122 ++
.../xwork2/mock/MockObjectTypeDeterminer.java | 125 ++
.../opensymphony/xwork2/mock/MockResult.java | 53 +
.../com/opensymphony/xwork2/mock/package.html | 1 +
.../xwork2/ognl/ErrorMessageBuilder.java | 58 +
.../opensymphony/xwork2/ognl/ObjectProxy.java | 55 +
.../xwork2/ognl/OgnlNullHandlerWrapper.java | 24 +
.../ognl/OgnlReflectionContextFactory.java | 14 +
.../xwork2/ognl/OgnlReflectionProvider.java | 125 ++
.../xwork2/ognl/OgnlTypeConverterWrapper.java | 45 +
.../com/opensymphony/xwork2/ognl/OgnlUtil.java | 574 +++++++++
.../xwork2/ognl/OgnlValueStack.java | 479 ++++++++
.../xwork2/ognl/OgnlValueStackFactory.java | 112 ++
.../xwork2/ognl/SecurityMemberAccess.java | 194 +++
.../xwork2/ognl/XWorkTypeConverterWrapper.java | 38 +
.../ognl/accessor/CompoundRootAccessor.java | 327 +++++
.../xwork2/ognl/accessor/ObjectAccessor.java | 29 +
.../accessor/ObjectProxyPropertyAccessor.java | 77 ++
.../XWorkCollectionPropertyAccessor.java | 310 +++++
.../ognl/accessor/XWorkEnumerationAccessor.java | 36 +
.../accessor/XWorkIteratorPropertyAccessor.java | 36 +
.../accessor/XWorkListPropertyAccessor.java | 177 +++
.../ognl/accessor/XWorkMapPropertyAccessor.java | 160 +++
.../accessor/XWorkMapPropertyAccessorTest.java | 54 +
.../ognl/accessor/XWorkMethodAccessor.java | 146 +++
.../accessor/XWorkObjectPropertyAccessor.java | 41 +
.../java/com/opensymphony/xwork2/package.html | 1 +
.../xwork2/result/ParamNameAwareResult.java | 10 +
.../security/AcceptedPatternsChecker.java | 82 ++
.../DefaultAcceptedPatternsChecker.java | 76 ++
.../DefaultExcludedPatternsChecker.java | 77 ++
.../security/ExcludedPatternsChecker.java | 82 ++
.../xwork2/spring/SpringObjectFactory.java | 287 +++++
.../spring/SpringProxyableObjectFactory.java | 87 ++
.../ActionAutowiringInterceptor.java | 136 +++
.../xwork2/spring/interceptor/package.html | 1 +
.../com/opensymphony/xwork2/spring/package.html | 1 +
.../xwork2/test/StubConfigurationProvider.java | 36 +
.../xwork2/util/AnnotationUtils.java | 199 ++++
.../opensymphony/xwork2/util/ArrayUtils.java | 56 +
.../xwork2/util/ClassLoaderUtil.java | 251 ++++
.../xwork2/util/ClassPathFinder.java | 177 +++
.../xwork2/util/ClearableValueStack.java | 29 +
.../opensymphony/xwork2/util/CompoundRoot.java | 53 +
.../opensymphony/xwork2/util/CreateIfNull.java | 77 ++
.../com/opensymphony/xwork2/util/DomHelper.java | 358 ++++++
.../com/opensymphony/xwork2/util/Element.java | 81 ++
.../java/com/opensymphony/xwork2/util/Key.java | 78 ++
.../opensymphony/xwork2/util/KeyProperty.java | 79 ++
.../xwork2/util/LocalizedTextUtil.java | 942 +++++++++++++++
.../xwork2/util/MemberAccessValueStack.java | 16 +
.../util/NamedVariablePatternMatcher.java | 146 +++
.../xwork2/util/OgnlTextParser.java | 83 ++
.../xwork2/util/PatternMatcher.java | 57 +
.../xwork2/util/PropertiesReader.java | 546 +++++++++
.../opensymphony/xwork2/util/ResolverUtil.java | 466 ++++++++
.../opensymphony/xwork2/util/TextParseUtil.java | 298 +++++
.../opensymphony/xwork2/util/TextParser.java | 11 +
.../com/opensymphony/xwork2/util/URLUtil.java | 64 +
.../opensymphony/xwork2/util/ValueStack.java | 158 +++
.../xwork2/util/ValueStackFactory.java | 38 +
.../xwork2/util/WildcardHelper.java | 463 ++++++++
.../opensymphony/xwork2/util/WildcardUtil.java | 68 ++
.../com/opensymphony/xwork2/util/XWorkList.java | 224 ++++
.../xwork2/util/XWorkTestCaseHelper.java | 93 ++
.../util/classloader/AbstractResourceStore.java | 50 +
.../util/classloader/FileResourceStore.java | 57 +
.../util/classloader/JarResourceStore.java | 66 +
.../util/classloader/ReloadingClassLoader.java | 177 +++
.../xwork2/util/classloader/ResourceStore.java | 27 +
.../classloader/ResourceStoreClassLoader.java | 96 ++
.../xwork2/util/finder/ClassFinder.java | 309 +++++
.../xwork2/util/finder/ClassFinderFactory.java | 29 +
.../util/finder/ClassLoaderInterface.java | 41 +
.../finder/ClassLoaderInterfaceDelegate.java | 52 +
.../xwork2/util/finder/DefaultClassFinder.java | 562 +++++++++
.../xwork2/util/finder/ResourceFinder.java | 1124 ++++++++++++++++++
.../opensymphony/xwork2/util/finder/Test.java | 29 +
.../opensymphony/xwork2/util/finder/UrlSet.java | 265 +++++
.../xwork2/util/fs/DefaultFileManager.java | 144 +++
.../util/fs/DefaultFileManagerFactory.java | 80 ++
.../xwork2/util/fs/FileRevision.java | 52 +
.../xwork2/util/fs/JarEntryRevision.java | 82 ++
.../opensymphony/xwork2/util/fs/Revision.java | 21 +
.../xwork2/util/location/Locatable.java | 29 +
.../util/location/LocatableProperties.java | 81 ++
.../xwork2/util/location/Located.java | 42 +
.../xwork2/util/location/Location.java | 69 ++
.../util/location/LocationAttributes.java | 348 ++++++
.../xwork2/util/location/LocationImpl.java | 216 ++++
.../xwork2/util/location/LocationUtils.java | 305 +++++
.../xwork2/util/location/package.html | 3 +
.../xwork2/util/logging/Logger.java | 68 ++
.../xwork2/util/logging/LoggerFactory.java | 137 +++
.../xwork2/util/logging/LoggerUtils.java | 84 ++
.../util/logging/commons/CommonsLogger.java | 125 ++
.../logging/commons/CommonsLoggerFactory.java | 38 +
.../xwork2/util/logging/jdk/JdkLogger.java | 123 ++
.../util/logging/jdk/JdkLoggerFactory.java | 36 +
.../util/logging/log4j2/Log4j2Logger.java | 122 ++
.../logging/log4j2/Log4j2LoggerFactory.java | 42 +
.../xwork2/util/logging/slf4j/Slf4jLogger.java | 123 ++
.../util/logging/slf4j/Slf4jLoggerFactory.java | 42 +
.../com/opensymphony/xwork2/util/package.html | 1 +
.../xwork2/util/profiling/ObjectProfiler.java | 132 ++
.../util/profiling/ProfilingTimerBean.java | 107 ++
.../xwork2/util/profiling/UtilTimerStack.java | 465 ++++++++
.../xwork2/util/profiling/package.html | 1 +
.../reflection/ReflectionContextFactory.java | 15 +
.../util/reflection/ReflectionContextState.java | 173 +++
.../util/reflection/ReflectionException.java | 41 +
.../reflection/ReflectionExceptionHandler.java | 14 +
.../util/reflection/ReflectionProvider.java | 141 +++
.../reflection/ReflectionProviderFactory.java | 10 +
.../validator/ActionValidatorManager.java | 87 ++
.../AnnotationActionValidatorManager.java | 380 ++++++
...nnotationValidationConfigurationBuilder.java | 901 ++++++++++++++
.../DefaultActionValidatorManager.java | 335 ++++++
.../validator/DefaultValidatorFactory.java | 191 +++
.../validator/DefaultValidatorFileParser.java | 246 ++++
.../validator/DelegatingValidatorContext.java | 329 +++++
.../xwork2/validator/FieldValidator.java | 39 +
.../validator/ShortCircuitableValidator.java | 44 +
.../xwork2/validator/ValidationException.java | 44 +
.../xwork2/validator/ValidationInterceptor.java | 281 +++++
.../xwork2/validator/Validator.java | 490 ++++++++
.../xwork2/validator/ValidatorConfig.java | 170 +++
.../xwork2/validator/ValidatorContext.java | 38 +
.../xwork2/validator/ValidatorFactory.java | 239 ++++
.../xwork2/validator/ValidatorFileParser.java | 46 +
.../ConditionalVisitorFieldValidator.java | 156 +++
.../ConversionErrorFieldValidator.java | 139 +++
.../validator/annotations/CustomValidator.java | 124 ++
.../annotations/DateRangeFieldValidator.java | 196 +++
.../annotations/DoubleRangeFieldValidator.java | 225 ++++
.../validator/annotations/EmailValidator.java | 133 +++
.../annotations/ExpressionValidator.java | 123 ++
.../annotations/FieldExpressionValidator.java | 134 +++
.../annotations/IntRangeFieldValidator.java | 190 +++
.../annotations/RegexFieldValidator.java | 182 +++
.../annotations/RequiredFieldValidator.java | 134 +++
.../annotations/RequiredStringValidator.java | 145 +++
.../annotations/ShortRangeFieldValidator.java | 187 +++
.../annotations/StringLengthFieldValidator.java | 197 +++
.../validator/annotations/UrlValidator.java | 77 ++
.../validator/annotations/Validation.java | 137 +++
.../annotations/ValidationParameter.java | 83 ++
.../validator/annotations/Validations.java | 188 +++
.../validator/annotations/ValidatorType.java | 34 +
.../annotations/VisitorFieldValidator.java | 161 +++
.../xwork2/validator/annotations/package.html | 1 +
.../opensymphony/xwork2/validator/package.html | 1 +
.../ConditionalVisitorFieldValidator.java | 84 ++
.../ConversionErrorFieldValidator.java | 84 ++
.../validators/DateRangeFieldValidator.java | 95 ++
.../validators/DoubleRangeFieldValidator.java | 196 +++
.../validator/validators/EmailValidator.java | 90 ++
.../validators/ExpressionValidator.java | 81 ++
.../validators/FieldExpressionValidator.java | 97 ++
.../validators/FieldValidatorSupport.java | 48 +
.../validators/IntRangeFieldValidator.java | 83 ++
.../validators/LongRangeFieldValidator.java | 82 ++
.../validators/RangeValidatorSupport.java | 102 ++
.../validators/RegexFieldValidator.java | 213 ++++
...ateConversionErrorFieldValidatorSupport.java | 203 ++++
.../validators/RequiredFieldValidator.java | 72 ++
.../validators/RequiredStringValidator.java | 108 ++
.../validators/ShortRangeFieldValidator.java | 82 ++
.../validators/StringLengthFieldValidator.java | 169 +++
.../validator/validators/URLValidator.java | 101 ++
.../validator/validators/ValidatorSupport.java | 205 ++++
.../validators/VisitorFieldValidator.java | 219 ++++
.../xwork2/validator/validators/package.html | 1 +
.../xwork2/validator/validators/default.xml | 25 +
.../xwork2/xwork-messages.properties | 10 +
core/src/main/resources/xwork-1.0.dtd | 87 ++
core/src/main/resources/xwork-1.1.1.dtd | 104 ++
core/src/main/resources/xwork-1.1.2.dtd | 112 ++
core/src/main/resources/xwork-1.1.dtd | 96 ++
core/src/main/resources/xwork-2.0.dtd | 118 ++
core/src/main/resources/xwork-2.1.3.dtd | 127 ++
core/src/main/resources/xwork-2.1.dtd | 124 ++
core/src/main/resources/xwork-2.3.dtd | 130 ++
core/src/main/resources/xwork-default.xml | 67 ++
.../main/resources/xwork-validator-1.0.2.dtd | 42 +
.../main/resources/xwork-validator-1.0.3.dtd | 42 +
core/src/main/resources/xwork-validator-1.0.dtd | 40 +
.../resources/xwork-validator-config-1.0.dtd | 17 +
.../xwork-validator-definition-1.0.dtd | 19 +
core/src/test/java/PackagelessAction.java | 45 +
.../opensymphony/xwork2/ActionContextTest.java | 115 ++
.../xwork2/ActionContextThreadLocalTest.java | 42 +
.../xwork2/ActionInvocationTest.java | 103 ++
.../opensymphony/xwork2/ActionNestingTest.java | 143 +++
.../opensymphony/xwork2/ActionSupportTest.java | 361 ++++++
.../opensymphony/xwork2/AnnotatedTestBean.java | 76 ++
.../opensymphony/xwork2/ChainResultTest.java | 146 +++
.../xwork2/CompositeTextProviderTest.java | 102 ++
.../xwork2/DefaultActionInvocationTest.java | 354 ++++++
.../opensymphony/xwork2/DefaultClasstTest.java | 60 +
.../xwork2/DefaultTextProviderTest.java | 147 +++
.../xwork2/ExternalReferenceAction.java | 53 +
.../test/java/com/opensymphony/xwork2/Foo.java | 48 +
.../com/opensymphony/xwork2/GenericsBean.java | 57 +
.../opensymphony/xwork2/LocaleAwareTest.java | 71 ++
.../opensymphony/xwork2/ModelDrivenAction.java | 45 +
.../xwork2/ModelDrivenAnnotationAction.java | 45 +
.../com/opensymphony/xwork2/NestedAction.java | 67 ++
.../xwork2/ProxyInvocationAction.java | 10 +
.../xwork2/ProxyInvocationInterface.java | 8 +
.../xwork2/ProxyInvocationTest.java | 51 +
.../opensymphony/xwork2/ProxyObjectFactory.java | 46 +
.../com/opensymphony/xwork2/SimpleAction.java | 272 +++++
.../xwork2/SimpleAnnotationAction.java | 231 ++++
.../opensymphony/xwork2/SimpleFooAction.java | 41 +
.../com/opensymphony/xwork2/StubValueStack.java | 104 ++
.../java/com/opensymphony/xwork2/TestBean.java | 72 ++
.../com/opensymphony/xwork2/TestChildBean.java | 62 +
.../opensymphony/xwork2/TestInterceptor.java | 86 ++
.../xwork2/TestNGXWorkTestCaseTest.java | 53 +
.../xwork2/TextProviderSupportTest.java | 126 ++
.../xwork2/UnknownHandlerManagerMock.java | 15 +
.../xwork2/UserSpecifiedDefaultAction.java | 10 +
.../xwork2/ValidationOrderAction.java | 189 +++
.../com/opensymphony/xwork2/VoidResult.java | 38 +
.../opensymphony/xwork2/WildCardResultTest.java | 57 +
.../opensymphony/xwork2/XWorkExceptionTest.java | 82 ++
.../xwork2/config/ConfigurationManagerTest.java | 180 +++
.../xwork2/config/ConfigurationTest.java | 329 +++++
.../xwork2/conversion/ConversionTestAction.java | 97 ++
.../xwork2/inject/ContainerImplTest.java | 119 ++
.../interceptor/AliasInterceptorTest.java | 133 +++
.../interceptor/ChainingInterceptorTest.java | 168 +++
.../ConversionErrorInterceptorTest.java | 147 +++
.../DefaultWorkflowInterceptorTest.java | 214 ++++
.../ExceptionMappingInterceptorTest.java | 307 +++++
.../xwork2/interceptor/I18nInterceptorTest.java | 207 ++++
.../MethodFilterInterceptorUtilTest.java | 83 ++
.../interceptor/ModelDrivenInterceptorTest.java | 112 ++
.../ParameterFilterInterceptorTest.java | 125 ++
.../ParameterRemoverInterceptorTest.java | 116 ++
.../interceptor/ParametersInterceptorTest.java | 856 +++++++++++++
.../interceptor/PreResultListenerTest.java | 119 ++
.../PrefixMethodInvocationUtilTest.java | 292 +++++
.../interceptor/PrepareInterceptorTest.java | 221 ++++
.../ScopedModelDrivenInterceptorTest.java | 234 ++++
.../StaticParametersInterceptorTest.java | 209 ++++
.../interceptor/TimerInterceptorTest.java | 169 +++
.../interceptor/ValidationErrorAwareTest.java | 103 ++
...onInterceptorPrefixMethodInvocationTest.java | 107 ++
.../opensymphony/xwork2/ognl/OgnlUtilTest.java | 840 +++++++++++++
.../xwork2/ognl/OgnlValueStackTest.java | 1069 +++++++++++++++++
.../xwork2/ognl/SecurityMemberAccessTest.java | 366 ++++++
.../xwork2/ognl/SetPropertiesTest.java | 334 ++++++
.../DefaultAcceptedPatternsCheckerTest.java | 67 ++
.../DefaultExcludedPatternsCheckerTest.java | 106 ++
.../xwork2/spring/ActionsFromSpringTest.java | 80 ++
.../com/opensymphony/xwork2/spring/Bar.java | 56 +
.../xwork2/spring/ExecuteInterceptor.java | 21 +
.../xwork2/spring/ExternalReferenceAction.java | 49 +
.../com/opensymphony/xwork2/spring/Foo.java | 30 +
.../xwork2/spring/SpringObjectFactoryTest.java | 375 ++++++
.../xwork2/spring/SpringResult.java | 36 +
.../xwork2/test/AnnotationDataAware.java | 48 +
.../xwork2/test/AnnotationDataAware2.java | 33 +
.../xwork2/test/AnnotationTestBean2.java | 65 +
.../xwork2/test/AnnotationUser.java | 107 ++
.../xwork2/test/AnnotationUserMarker.java | 41 +
.../com/opensymphony/xwork2/test/DataAware.java | 35 +
.../opensymphony/xwork2/test/DataAware2.java | 29 +
.../com/opensymphony/xwork2/test/Equidae.java | 52 +
.../xwork2/test/ModelDrivenAction2.java | 38 +
.../test/ModelDrivenAnnotationAction2.java | 39 +
.../opensymphony/xwork2/test/SimpleAction2.java | 39 +
.../opensymphony/xwork2/test/SimpleAction3.java | 48 +
.../xwork2/test/SimpleAnnotationAction2.java | 42 +
.../xwork2/test/SimpleAnnotationAction3.java | 49 +
.../com/opensymphony/xwork2/test/TestBean2.java | 58 +
.../java/com/opensymphony/xwork2/test/User.java | 85 ++
.../opensymphony/xwork2/test/UserMarker.java | 25 +
.../opensymphony/xwork2/util/AnnotatedCat.java | 67 ++
.../xwork2/util/AnnotationUtilsTest.java | 73 ++
.../java/com/opensymphony/xwork2/util/Bar.java | 61 +
.../com/opensymphony/xwork2/util/BarJunior.java | 4 +
.../java/com/opensymphony/xwork2/util/Cat.java | 58 +
.../xwork2/util/ClassLoaderUtilTest.java | 124 ++
.../xwork2/util/ClassPathFinderTest.java | 54 +
.../xwork2/util/DefaultFileManagerTest.java | 62 +
.../java/com/opensymphony/xwork2/util/Dog.java | 123 ++
.../opensymphony/xwork2/util/DomHelperTest.java | 70 ++
.../java/com/opensymphony/xwork2/util/Foo.java | 218 ++++
.../com/opensymphony/xwork2/util/FurColor.java | 20 +
.../xwork2/util/GetPropertiesTest.java | 40 +
.../com/opensymphony/xwork2/util/Indexed.java | 41 +
.../opensymphony/xwork2/util/ListHolder.java | 37 +
.../xwork2/util/LocalizedTextUtilTest.java | 255 ++++
.../com/opensymphony/xwork2/util/MyBean.java | 54 +
.../opensymphony/xwork2/util/MyBeanAction.java | 55 +
.../xwork2/util/MyBeanActionTest.java | 104 ++
.../util/NamedVariablePatternMatcherTest.java | 77 ++
.../com/opensymphony/xwork2/util/Owner.java | 37 +
.../xwork2/util/ResolverUtilTest.java | 61 +
.../xwork2/util/TextParseUtilTest.java | 214 ++++
.../com/opensymphony/xwork2/util/Tiger.java | 39 +
.../opensymphony/xwork2/util/URLUtilTest.java | 177 +++
.../xwork2/util/UnknownHandlerManagerTest.java | 82 ++
.../opensymphony/xwork2/util/UrlUtilTest2.java | 35 +
.../xwork2/util/WildcardHelperTest.java | 56 +
.../xwork2/util/WildcardUtilTest.java | 56 +
.../opensymphony/xwork2/util/XWorkListTest.java | 86 ++
.../validator/ActionValidatorManagerTest.java | 216 ++++
.../AnnotationActionValidatorManagerTest.java | 412 +++++++
.../validator/AnnotationValidationAction.java | 70 ++
...ationValidationConfigurationBuilderTest.java | 309 +++++
.../AnnotationValidationExpAction.java | 139 +++
.../ConversionErrorFieldValidatorTest.java | 84 ++
.../validator/DateRangeValidatorTest.java | 83 ++
.../DefaultActionValidatorManagerTest.java | 379 ++++++
.../validator/DefaultValidatorFactoryTest.java | 38 +
.../DefaultValidatorFileParserTest.java | 219 ++++
.../validator/DoubleRangeValidatorTest.java | 278 +++++
.../xwork2/validator/EmailValidatorTest.java | 154 +++
.../validator/ExpressionValidatorTest.java | 139 +++
.../validator/GenericValidatorContext.java | 143 +++
.../xwork2/validator/IntRangeValidatorTest.java | 70 ++
.../validator/LongRangeValidatorTest.java | 68 ++
.../validator/ModelDrivenValidationTest.java | 53 +
.../xwork2/validator/MyValidator.java | 96 ++
.../validator/RegexFieldValidatorTest.java | 195 +++
...onversionErrorFieldValidatorSupportTest.java | 129 ++
.../validator/ShortRangeValidatorTest.java | 68 ++
.../validator/SimpleActionValidationTest.java | 231 ++++
.../StringLengthFieldValidatorTest.java | 220 ++++
.../xwork2/validator/StringValidatorTest.java | 217 ++++
.../xwork2/validator/URLValidatorTest.java | 192 +++
.../validator/ValidatorAnnotationTest.java | 120 ++
.../VisitorFieldValidatorModelTest.java | 124 ++
.../validator/VisitorFieldValidatorTest.java | 211 ++++
.../validator/VisitorValidatorModelAction.java | 35 +
.../validator/VisitorValidatorTestAction.java | 80 ++
.../test/resources/PackagelessAction.properties | 1 +
core/src/test/resources/includeTest.xml | 10 +
core/src/test/resources/log4j2.xml | 4 +-
core/src/test/resources/my-validators.xml | 7 +
core/src/test/resources/myOther-validators.xml | 7 +
core/src/test/resources/validators.xml | 23 +-
core/src/test/resources/xwork - jar.jar | Bin 0 -> 2448 bytes
core/src/test/resources/xwork - zip.zip | Bin 0 -> 2449 bytes
core/src/test/resources/xwork-1.0.dtd | 1 +
.../test/resources/xwork-class-param-test.xml | 11 +
core/src/test/resources/xwork-jar.jar | Bin 0 -> 2441 bytes
core/src/test/resources/xwork-param-test.xml | 9 +
core/src/test/resources/xwork-proxyinvoke.xml | 48 +
core/src/test/resources/xwork-sample.xml | 238 ++++
core/src/test/resources/xwork-test-beans.xml | 9 +
core/src/test/resources/xwork-test-default.xml | 39 +
.../test/resources/xwork-test-validation.xml | 64 +
core/src/test/resources/xwork-zip.zip | Bin 0 -> 2440 bytes
plugins/java8-support/pom.xml | 4 +-
pom.xml | 6 -
xwork-core/pom.xml | 239 ----
.../java/com/opensymphony/xwork2/Action.java | 80 --
.../opensymphony/xwork2/ActionChainResult.java | 288 -----
.../com/opensymphony/xwork2/ActionContext.java | 353 ------
.../xwork2/ActionEventListener.java | 41 -
.../opensymphony/xwork2/ActionInvocation.java | 179 ---
.../com/opensymphony/xwork2/ActionProxy.java | 103 --
.../opensymphony/xwork2/ActionProxyFactory.java | 107 --
.../com/opensymphony/xwork2/ActionSupport.java | 302 -----
.../xwork2/CompositeTextProvider.java | 265 -----
.../xwork2/DefaultActionInvocation.java | 514 --------
.../opensymphony/xwork2/DefaultActionProxy.java | 216 ----
.../xwork2/DefaultActionProxyFactory.java | 79 --
.../xwork2/DefaultLocaleProvider.java | 25 -
.../xwork2/DefaultTextProvider.java | 146 ---
.../xwork2/DefaultUnknownHandlerManager.java | 131 --
.../com/opensymphony/xwork2/FileManager.java | 75 --
.../opensymphony/xwork2/FileManagerFactory.java | 12 -
.../xwork2/InvalidMetadataException.java | 34 -
.../com/opensymphony/xwork2/LocaleProvider.java | 40 -
.../xwork2/MockActionInvocation.java | 26 -
.../com/opensymphony/xwork2/ModelDriven.java | 34 -
.../com/opensymphony/xwork2/ObjectFactory.java | 251 ----
.../com/opensymphony/xwork2/Preparable.java | 35 -
.../xwork2/ResourceBundleTextProvider.java | 48 -
.../java/com/opensymphony/xwork2/Result.java | 45 -
.../xwork2/TestNGXWorkTestCase.java | 62 -
.../com/opensymphony/xwork2/TextProvider.java | 180 ---
.../xwork2/TextProviderFactory.java | 71 --
.../xwork2/TextProviderSupport.java | 329 -----
.../com/opensymphony/xwork2/Unchainable.java | 25 -
.../com/opensymphony/xwork2/UnknownHandler.java | 63 -
.../xwork2/UnknownHandlerManager.java | 37 -
.../com/opensymphony/xwork2/Validateable.java | 33 -
.../opensymphony/xwork2/ValidationAware.java | 130 --
.../xwork2/ValidationAwareSupport.java | 169 ---
.../java/com/opensymphony/xwork2/XWork.java | 79 --
.../com/opensymphony/xwork2/XWorkConstants.java | 30 -
.../com/opensymphony/xwork2/XWorkException.java | 154 ---
.../xwork2/XWorkJUnit4TestCase.java | 79 --
.../com/opensymphony/xwork2/XWorkMessages.java | 31 -
.../com/opensymphony/xwork2/XWorkTestCase.java | 90 --
.../xwork2/config/BeanSelectionProvider.java | 8 -
.../xwork2/config/Configuration.java | 98 --
.../xwork2/config/ConfigurationException.java | 87 --
.../xwork2/config/ConfigurationManager.java | 232 ----
.../xwork2/config/ConfigurationProvider.java | 22 -
.../xwork2/config/ConfigurationUtil.java | 83 --
.../xwork2/config/ContainerProvider.java | 57 -
.../config/FileManagerFactoryProvider.java | 33 -
.../xwork2/config/FileManagerProvider.java | 35 -
.../xwork2/config/PackageProvider.java | 46 -
.../config/ReferenceResolverException.java | 43 -
.../xwork2/config/RuntimeConfiguration.java | 53 -
.../xwork2/config/entities/ActionConfig.java | 351 ------
.../config/entities/ExceptionMappingConfig.java | 181 ---
.../config/entities/InterceptorConfig.java | 158 ---
.../config/entities/InterceptorListHolder.java | 31 -
.../config/entities/InterceptorLocator.java | 14 -
.../config/entities/InterceptorMapping.java | 71 --
.../config/entities/InterceptorStackConfig.java | 182 ---
.../xwork2/config/entities/PackageConfig.java | 615 ----------
.../xwork2/config/entities/Parameterizable.java | 40 -
.../xwork2/config/entities/ResultConfig.java | 159 ---
.../config/entities/ResultTypeConfig.java | 170 ---
.../config/entities/UnknownHandlerConfig.java | 43 -
.../xwork2/config/entities/package.html | 18 -
.../xwork2/config/impl/AbstractMatcher.java | 267 -----
.../xwork2/config/impl/ActionConfigMatcher.java | 152 ---
.../config/impl/DefaultConfiguration.java | 514 --------
.../config/impl/LocatableConstantFactory.java | 34 -
.../xwork2/config/impl/LocatableFactory.java | 52 -
.../xwork2/config/impl/MockConfiguration.java | 119 --
.../xwork2/config/impl/NamespaceMatch.java | 47 -
.../xwork2/config/impl/NamespaceMatcher.java | 51 -
.../xwork2/config/impl/package.html | 1 -
.../com/opensymphony/xwork2/config/package.html | 1 -
.../xwork2/config/providers/CycleDetector.java | 59 -
.../xwork2/config/providers/DirectedGraph.java | 143 ---
.../config/providers/InterceptorBuilder.java | 214 ----
.../providers/XWorkConfigurationProvider.java | 191 ---
.../providers/XmlConfigurationProvider.java | 1071 -----------------
.../xwork2/config/providers/XmlHelper.java | 127 --
.../xwork2/config/providers/package.html | 1 -
.../ConversionAnnotationProcessor.java | 23 -
.../conversion/ConversionFileProcessor.java | 19 -
.../ConversionPropertiesProcessor.java | 22 -
.../xwork2/conversion/NullHandler.java | 54 -
.../xwork2/conversion/ObjectTypeDeterminer.java | 36 -
.../conversion/TypeConversionException.java | 61 -
.../xwork2/conversion/TypeConverter.java | 64 -
.../xwork2/conversion/TypeConverterCreator.java | 17 -
.../xwork2/conversion/TypeConverterHolder.java | 82 --
.../conversion/annotations/Conversion.java | 95 --
.../conversion/annotations/ConversionRule.java | 33 -
.../conversion/annotations/ConversionType.java | 34 -
.../conversion/annotations/TypeConversion.java | 178 ---
.../xwork2/conversion/annotations/package.html | 1 -
.../impl/AnnotationXWorkConverter.java | 91 --
.../xwork2/conversion/impl/ArrayConverter.java | 36 -
.../conversion/impl/CollectionConverter.java | 93 --
.../xwork2/conversion/impl/DateConverter.java | 101 --
.../DefaultConversionAnnotationProcessor.java | 76 --
.../impl/DefaultConversionFileProcessor.java | 98 --
.../DefaultConversionPropertiesProcessor.java | 81 --
.../impl/DefaultObjectTypeDeterminer.java | 294 -----
.../conversion/impl/DefaultTypeConverter.java | 355 ------
.../impl/DefaultTypeConverterCreator.java | 35 -
.../impl/DefaultTypeConverterHolder.java | 97 --
.../conversion/impl/EnumTypeConverter.java | 124 --
.../impl/GenericsObjectTypeDeterminer.java | 38 -
.../impl/InstantiatingNullHandler.java | 157 ---
.../xwork2/conversion/impl/NumberConverter.java | 118 --
.../xwork2/conversion/impl/StringConverter.java | 73 --
.../conversion/impl/XWorkBasicConverter.java | 212 ----
.../xwork2/conversion/impl/XWorkConverter.java | 595 ---------
.../metadata/ConversionDescription.java | 184 ---
.../xwork2/conversion/metadata/package.html | 1 -
.../xwork2/factory/ActionFactory.java | 18 -
.../xwork2/factory/ConverterFactory.java | 21 -
.../xwork2/factory/DefaultActionFactory.java | 25 -
.../xwork2/factory/DefaultConverterFactory.java | 30 -
.../factory/DefaultInterceptorFactory.java | 67 --
.../xwork2/factory/DefaultResultFactory.java | 54 -
.../factory/DefaultUnknownHandlerFactory.java | 25 -
.../xwork2/factory/DefaultValidatorFactory.java | 34 -
.../xwork2/factory/InterceptorFactory.java | 28 -
.../xwork2/factory/ResultFactory.java | 15 -
.../xwork2/factory/UnknownHandlerFactory.java | 21 -
.../xwork2/factory/ValidatorFactory.java | 21 -
.../xwork2/inject/ConstructionContext.java | 119 --
.../opensymphony/xwork2/inject/Container.java | 113 --
.../xwork2/inject/ContainerBuilder.java | 510 --------
.../xwork2/inject/ContainerImpl.java | 603 ----------
.../com/opensymphony/xwork2/inject/Context.java | 57 -
.../xwork2/inject/DependencyException.java | 37 -
.../xwork2/inject/ExternalContext.java | 73 --
.../com/opensymphony/xwork2/inject/Factory.java | 34 -
.../com/opensymphony/xwork2/inject/Inject.java | 46 -
.../xwork2/inject/InternalContext.java | 77 --
.../xwork2/inject/InternalFactory.java | 35 -
.../com/opensymphony/xwork2/inject/Key.java | 77 --
.../com/opensymphony/xwork2/inject/Scope.java | 214 ----
.../com/opensymphony/xwork2/inject/Scoped.java | 37 -
.../xwork2/inject/package-info.java | 30 -
.../util/FinalizablePhantomReference.java | 35 -
.../inject/util/FinalizableReference.java | 32 -
.../inject/util/FinalizableReferenceQueue.java | 77 --
.../inject/util/FinalizableSoftReference.java | 34 -
.../inject/util/FinalizableWeakReference.java | 34 -
.../xwork2/inject/util/Function.java | 44 -
.../xwork2/inject/util/ReferenceCache.java | 177 ---
.../xwork2/inject/util/ReferenceMap.java | 605 ----------
.../xwork2/inject/util/ReferenceType.java | 55 -
.../xwork2/inject/util/Strings.java | 55 -
.../xwork2/inject/util/package.html | 1 -
.../xwork2/interceptor/AbstractInterceptor.java | 42 -
.../xwork2/interceptor/AliasInterceptor.java | 194 ---
.../xwork2/interceptor/ChainingInterceptor.java | 230 ----
.../interceptor/ConversionErrorInterceptor.java | 144 ---
.../interceptor/DefaultWorkflowInterceptor.java | 214 ----
.../xwork2/interceptor/ExceptionHolder.java | 77 --
.../ExceptionMappingInterceptor.java | 323 -----
.../xwork2/interceptor/I18nInterceptor.java | 288 -----
.../xwork2/interceptor/Interceptor.java | 213 ----
.../xwork2/interceptor/LoggingInterceptor.java | 86 --
.../interceptor/MethodFilterInterceptor.java | 122 --
.../MethodFilterInterceptorUtil.java | 145 ---
.../interceptor/ModelDrivenInterceptor.java | 144 ---
.../xwork2/interceptor/NoParameters.java | 32 -
.../interceptor/ParameterFilterInterceptor.java | 236 ----
.../xwork2/interceptor/ParameterNameAware.java | 38 -
.../ParameterRemoverInterceptor.java | 143 ---
.../interceptor/ParametersInterceptor.java | 492 --------
.../xwork2/interceptor/PreResultListener.java | 39 -
.../interceptor/PrefixMethodInvocationUtil.java | 168 ---
.../xwork2/interceptor/PrepareInterceptor.java | 174 ---
.../xwork2/interceptor/ScopedModelDriven.java | 40 -
.../ScopedModelDrivenInterceptor.java | 164 ---
.../StaticParametersInterceptor.java | 240 ----
.../xwork2/interceptor/TimerInterceptor.java | 244 ----
.../interceptor/ValidationErrorAware.java | 38 -
.../interceptor/ValidationWorkflowAware.java | 12 -
.../xwork2/interceptor/annotations/After.java | 81 --
.../xwork2/interceptor/annotations/Allowed.java | 18 -
.../AnnotationParameterFilterIntereptor.java | 95 --
.../AnnotationWorkflowInterceptor.java | 192 ---
.../xwork2/interceptor/annotations/Before.java | 80 --
.../interceptor/annotations/BeforeResult.java | 80 --
.../interceptor/annotations/BlockByDefault.java | 21 -
.../xwork2/interceptor/annotations/Blocked.java | 18 -
.../interceptor/annotations/InputConfig.java | 92 --
.../xwork2/interceptor/annotations/package.html | 1 -
.../xwork2/interceptor/package.html | 1 -
.../xwork2/mock/MockActionInvocation.java | 133 ---
.../xwork2/mock/MockActionProxy.java | 127 --
.../opensymphony/xwork2/mock/MockContainer.java | 41 -
.../xwork2/mock/MockInterceptor.java | 122 --
.../xwork2/mock/MockObjectTypeDeterminer.java | 125 --
.../opensymphony/xwork2/mock/MockResult.java | 53 -
.../com/opensymphony/xwork2/mock/package.html | 1 -
.../xwork2/ognl/ErrorMessageBuilder.java | 58 -
.../opensymphony/xwork2/ognl/ObjectProxy.java | 55 -
.../xwork2/ognl/OgnlNullHandlerWrapper.java | 24 -
.../ognl/OgnlReflectionContextFactory.java | 14 -
.../xwork2/ognl/OgnlReflectionProvider.java | 125 --
.../xwork2/ognl/OgnlTypeConverterWrapper.java | 45 -
.../com/opensymphony/xwork2/ognl/OgnlUtil.java | 574 ---------
.../xwork2/ognl/OgnlValueStack.java | 479 --------
.../xwork2/ognl/OgnlValueStackFactory.java | 112 --
.../xwork2/ognl/SecurityMemberAccess.java | 194 ---
.../xwork2/ognl/XWorkTypeConverterWrapper.java | 38 -
.../ognl/accessor/CompoundRootAccessor.java | 327 -----
.../xwork2/ognl/accessor/ObjectAccessor.java | 29 -
.../accessor/ObjectProxyPropertyAccessor.java | 77 --
.../XWorkCollectionPropertyAccessor.java | 310 -----
.../ognl/accessor/XWorkEnumerationAccessor.java | 36 -
.../accessor/XWorkIteratorPropertyAccessor.java | 36 -
.../accessor/XWorkListPropertyAccessor.java | 177 ---
.../ognl/accessor/XWorkMapPropertyAccessor.java | 160 ---
.../accessor/XWorkMapPropertyAccessorTest.java | 54 -
.../ognl/accessor/XWorkMethodAccessor.java | 146 ---
.../accessor/XWorkObjectPropertyAccessor.java | 41 -
.../java/com/opensymphony/xwork2/package.html | 1 -
.../xwork2/result/ParamNameAwareResult.java | 10 -
.../security/AcceptedPatternsChecker.java | 82 --
.../DefaultAcceptedPatternsChecker.java | 76 --
.../DefaultExcludedPatternsChecker.java | 77 --
.../security/ExcludedPatternsChecker.java | 82 --
.../xwork2/spring/SpringObjectFactory.java | 287 -----
.../spring/SpringProxyableObjectFactory.java | 87 --
.../ActionAutowiringInterceptor.java | 136 ---
.../xwork2/spring/interceptor/package.html | 1 -
.../com/opensymphony/xwork2/spring/package.html | 1 -
.../xwork2/test/StubConfigurationProvider.java | 36 -
.../xwork2/util/AnnotationUtils.java | 199 ----
.../opensymphony/xwork2/util/ArrayUtils.java | 56 -
.../xwork2/util/ClassLoaderUtil.java | 251 ----
.../xwork2/util/ClassPathFinder.java | 177 ---
.../xwork2/util/ClearableValueStack.java | 29 -
.../opensymphony/xwork2/util/CompoundRoot.java | 53 -
.../opensymphony/xwork2/util/CreateIfNull.java | 77 --
.../com/opensymphony/xwork2/util/DomHelper.java | 358 ------
.../com/opensymphony/xwork2/util/Element.java | 81 --
.../java/com/opensymphony/xwork2/util/Key.java | 78 --
.../opensymphony/xwork2/util/KeyProperty.java | 79 --
.../xwork2/util/LocalizedTextUtil.java | 942 ---------------
.../xwork2/util/MemberAccessValueStack.java | 16 -
.../util/NamedVariablePatternMatcher.java | 146 ---
.../xwork2/util/OgnlTextParser.java | 83 --
.../xwork2/util/PatternMatcher.java | 57 -
.../xwork2/util/PropertiesReader.java | 546 ---------
.../opensymphony/xwork2/util/ResolverUtil.java | 466 --------
.../opensymphony/xwork2/util/TextParseUtil.java | 298 -----
.../opensymphony/xwork2/util/TextParser.java | 11 -
.../com/opensymphony/xwork2/util/URLUtil.java | 64 -
.../opensymphony/xwork2/util/ValueStack.java | 158 ---
.../xwork2/util/ValueStackFactory.java | 38 -
.../xwork2/util/WildcardHelper.java | 463 --------
.../opensymphony/xwork2/util/WildcardUtil.java | 68 --
.../com/opensymphony/xwork2/util/XWorkList.java | 224 ----
.../xwork2/util/XWorkTestCaseHelper.java | 93 --
.../util/classloader/AbstractResourceStore.java | 50 -
.../util/classloader/FileResourceStore.java | 57 -
.../util/classloader/JarResourceStore.java | 66 -
.../util/classloader/ReloadingClassLoader.java | 177 ---
.../xwork2/util/classloader/ResourceStore.java | 27 -
.../classloader/ResourceStoreClassLoader.java | 96 --
.../xwork2/util/finder/ClassFinder.java | 309 -----
.../xwork2/util/finder/ClassFinderFactory.java | 29 -
.../util/finder/ClassLoaderInterface.java | 41 -
.../finder/ClassLoaderInterfaceDelegate.java | 52 -
.../xwork2/util/finder/DefaultClassFinder.java | 562 ---------
.../xwork2/util/finder/ResourceFinder.java | 1124 ------------------
.../opensymphony/xwork2/util/finder/Test.java | 29 -
.../opensymphony/xwork2/util/finder/UrlSet.java | 265 -----
.../xwork2/util/fs/DefaultFileManager.java | 144 ---
.../util/fs/DefaultFileManagerFactory.java | 80 --
.../xwork2/util/fs/FileRevision.java | 52 -
.../xwork2/util/fs/JarEntryRevision.java | 82 --
.../opensymphony/xwork2/util/fs/Revision.java | 21 -
.../xwork2/util/location/Locatable.java | 29 -
.../util/location/LocatableProperties.java | 81 --
.../xwork2/util/location/Located.java | 42 -
.../xwork2/util/location/Location.java | 69 --
.../util/location/LocationAttributes.java | 348 ------
.../xwork2/util/location/LocationImpl.java | 216 ----
.../xwork2/util/location/LocationUtils.java | 305 -----
.../xwork2/util/location/package.html | 3 -
.../xwork2/util/logging/Logger.java | 68 --
.../xwork2/util/logging/LoggerFactory.java | 137 ---
.../xwork2/util/logging/LoggerUtils.java | 84 --
.../util/logging/commons/CommonsLogger.java | 125 --
.../logging/commons/CommonsLoggerFactory.java | 38 -
.../xwork2/util/logging/jdk/JdkLogger.java | 123 --
.../util/logging/jdk/JdkLoggerFactory.java | 36 -
.../util/logging/log4j2/Log4j2Logger.java | 122 --
.../logging/log4j2/Log4j2LoggerFactory.java | 42 -
.../xwork2/util/logging/slf4j/Slf4jLogger.java | 123 --
.../util/logging/slf4j/Slf4jLoggerFactory.java | 42 -
.../com/opensymphony/xwork2/util/package.html | 1 -
.../xwork2/util/profiling/ObjectProfiler.java | 132 --
.../util/profiling/ProfilingTimerBean.java | 107 --
.../xwork2/util/profiling/UtilTimerStack.java | 465 --------
.../xwork2/util/profiling/package.html | 1 -
.../reflection/ReflectionContextFactory.java | 15 -
.../util/reflection/ReflectionContextState.java | 173 ---
.../util/reflection/ReflectionException.java | 41 -
.../reflection/ReflectionExceptionHandler.java | 14 -
.../util/reflection/ReflectionProvider.java | 141 ---
.../reflection/ReflectionProviderFactory.java | 10 -
.../validator/ActionValidatorManager.java | 87 --
.../AnnotationActionValidatorManager.java | 380 ------
...nnotationValidationConfigurationBuilder.java | 901 --------------
.../DefaultActionValidatorManager.java | 335 ------
.../validator/DefaultValidatorFactory.java | 191 ---
.../validator/DefaultValidatorFileParser.java | 246 ----
.../validator/DelegatingValidatorContext.java | 329 -----
.../xwork2/validator/FieldValidator.java | 39 -
.../validator/ShortCircuitableValidator.java | 44 -
.../xwork2/validator/ValidationException.java | 44 -
.../xwork2/validator/ValidationInterceptor.java | 281 -----
.../xwork2/validator/Validator.java | 490 --------
.../xwork2/validator/ValidatorConfig.java | 170 ---
.../xwork2/validator/ValidatorContext.java | 38 -
.../xwork2/validator/ValidatorFactory.java | 239 ----
.../xwork2/validator/ValidatorFileParser.java | 46 -
.../ConditionalVisitorFieldValidator.java | 156 ---
.../ConversionErrorFieldValidator.java | 139 ---
.../validator/annotations/CustomValidator.java | 124 --
.../annotations/DateRangeFieldValidator.java | 196 ---
.../annotations/DoubleRangeFieldValidator.java | 225 ----
.../validator/annotations/EmailValidator.java | 133 ---
.../annotations/ExpressionValidator.java | 123 --
.../annotations/FieldExpressionValidator.java | 134 ---
.../annotations/IntRangeFieldValidator.java | 190 ---
.../annotations/RegexFieldValidator.java | 182 ---
.../annotations/RequiredFieldValidator.java | 134 ---
.../annotations/RequiredStringValidator.java | 145 ---
.../annotations/ShortRangeFieldValidator.java | 187 ---
.../annotations/StringLengthFieldValidator.java | 197 ---
.../validator/annotations/UrlValidator.java | 77 --
.../validator/annotations/Validation.java | 137 ---
.../annotations/ValidationParameter.java | 83 --
.../validator/annotations/Validations.java | 188 ---
.../validator/annotations/ValidatorType.java | 34 -
.../annotations/VisitorFieldValidator.java | 161 ---
.../xwork2/validator/annotations/package.html | 1 -
.../opensymphony/xwork2/validator/package.html | 1 -
.../ConditionalVisitorFieldValidator.java | 84 --
.../ConversionErrorFieldValidator.java | 84 --
.../validators/DateRangeFieldValidator.java | 95 --
.../validators/DoubleRangeFieldValidator.java | 196 ---
.../validator/validators/EmailValidator.java | 90 --
.../validators/ExpressionValidator.java | 81 --
.../validators/FieldExpressionValidator.java | 97 --
.../validators/FieldValidatorSupport.java | 48 -
.../validators/IntRangeFieldValidator.java | 83 --
.../validators/LongRangeFieldValidator.java | 82 --
.../validators/RangeValidatorSupport.java | 102 --
.../validators/RegexFieldValidator.java | 213 ----
...ateConversionErrorFieldValidatorSupport.java | 203 ----
.../validators/RequiredFieldValidator.java | 72 --
.../validators/RequiredStringValidator.java | 108 --
.../validators/ShortRangeFieldValidator.java | 82 --
.../validators/StringLengthFieldValidator.java | 169 ---
.../validator/validators/URLValidator.java | 101 --
.../validator/validators/ValidatorSupport.java | 205 ----
.../validators/VisitorFieldValidator.java | 219 ----
.../xwork2/validator/validators/package.html | 1 -
.../xwork2/validator/validators/default.xml | 25 -
.../xwork2/xwork-messages.properties | 10 -
xwork-core/src/main/resources/overview.html | 3 -
xwork-core/src/main/resources/xwork-1.0.dtd | 87 --
xwork-core/src/main/resources/xwork-1.1.1.dtd | 104 --
xwork-core/src/main/resources/xwork-1.1.2.dtd | 112 --
xwork-core/src/main/resources/xwork-1.1.dtd | 96 --
xwork-core/src/main/resources/xwork-2.0.dtd | 118 --
xwork-core/src/main/resources/xwork-2.1.3.dtd | 127 --
xwork-core/src/main/resources/xwork-2.1.dtd | 124 --
xwork-core/src/main/resources/xwork-2.3.dtd | 130 --
xwork-core/src/main/resources/xwork-default.xml | 67 --
.../main/resources/xwork-validator-1.0.2.dtd | 42 -
.../main/resources/xwork-validator-1.0.3.dtd | 42 -
.../src/main/resources/xwork-validator-1.0.dtd | 40 -
.../resources/xwork-validator-config-1.0.dtd | 17 -
.../xwork-validator-definition-1.0.dtd | 19 -
xwork-core/src/site/site.xml | 57 -
xwork-core/src/test/java/PackagelessAction.java | 45 -
.../opensymphony/xwork2/ActionContextTest.java | 115 --
.../xwork2/ActionContextThreadLocalTest.java | 42 -
.../xwork2/ActionInvocationTest.java | 103 --
.../opensymphony/xwork2/ActionNestingTest.java | 143 ---
.../opensymphony/xwork2/ActionSupportTest.java | 361 ------
.../opensymphony/xwork2/AnnotatedTestBean.java | 76 --
.../opensymphony/xwork2/ChainResultTest.java | 146 ---
.../xwork2/CompositeTextProviderTest.java | 102 --
.../xwork2/DefaultActionInvocationTest.java | 354 ------
.../opensymphony/xwork2/DefaultClasstTest.java | 60 -
.../xwork2/DefaultTextProviderTest.java | 147 ---
.../xwork2/ExternalReferenceAction.java | 53 -
.../test/java/com/opensymphony/xwork2/Foo.java | 48 -
.../com/opensymphony/xwork2/GenericsBean.java | 57 -
.../opensymphony/xwork2/LocaleAwareTest.java | 71 --
.../opensymphony/xwork2/ModelDrivenAction.java | 45 -
.../xwork2/ModelDrivenAnnotationAction.java | 45 -
.../com/opensymphony/xwork2/NestedAction.java | 67 --
.../xwork2/ProxyInvocationAction.java | 10 -
.../xwork2/ProxyInvocationInterface.java | 8 -
.../xwork2/ProxyInvocationTest.java | 51 -
.../opensymphony/xwork2/ProxyObjectFactory.java | 46 -
.../com/opensymphony/xwork2/SimpleAction.java | 272 -----
.../xwork2/SimpleAnnotationAction.java | 231 ----
.../opensymphony/xwork2/SimpleFooAction.java | 41 -
.../com/opensymphony/xwork2/StubValueStack.java | 104 --
.../java/com/opensymphony/xwork2/TestBean.java | 72 --
.../com/opensymphony/xwork2/TestChildBean.java | 62 -
.../opensymphony/xwork2/TestInterceptor.java | 86 --
.../xwork2/TestNGXWorkTestCaseTest.java | 53 -
.../xwork2/TextProviderSupportTest.java | 126 --
.../xwork2/UnknownHandlerManagerMock.java | 15 -
.../xwork2/UserSpecifiedDefaultAction.java | 10 -
.../xwork2/ValidationOrderAction.java | 189 ---
.../com/opensymphony/xwork2/VoidResult.java | 38 -
.../opensymphony/xwork2/WildCardResultTest.java | 57 -
.../opensymphony/xwork2/XWorkExceptionTest.java | 82 --
.../xwork2/config/ConfigurationManagerTest.java | 180 ---
.../xwork2/config/ConfigurationTest.java | 329 -----
.../config/entities/ActionConfigTest.java | 44 -
.../config/entities/PackageConfigTest.java | 34 -
.../config/impl/ActionConfigMatcherTest.java | 164 ---
.../config/impl/NamespaceMatcherTest.java | 41 -
.../config/providers/ConfigurationTestBase.java | 45 -
.../providers/InterceptorBuilderTest.java | 274 -----
.../providers/InterceptorForTestPurpose.java | 47 -
.../providers/MockConfigurationProvider.java | 194 ---
.../providers/NoNoArgsConstructorAction.java | 24 -
.../providers/PrivateConstructorAction.java | 43 -
.../config/providers/SomeUnknownHandler.java | 48 -
.../XmlConfigurationProviderActionsTest.java | 214 ----
...ConfigurationProviderAllowedMethodsTest.java | 125 --
...figurationProviderExceptionMappingsTest.java | 65 -
...tionProviderGlobalResultInheritenceTest.java | 53 -
...nProviderInterceptorParamOverridingTest.java | 101 --
...iderInterceptorStackParamOverridingTest.java | 89 --
...igurationProviderInterceptorsSpringTest.java | 80 --
...mlConfigurationProviderInterceptorsTest.java | 226 ----
...XmlConfigurationProviderInvalidFileTest.java | 40 -
.../XmlConfigurationProviderMultilevelTest.java | 70 --
.../XmlConfigurationProviderPackagesTest.java | 157 ---
...XmlConfigurationProviderResultTypesTest.java | 119 --
.../XmlConfigurationProviderResultsTest.java | 121 --
.../providers/XmlConfigurationProviderTest.java | 201 ----
...gurationProviderUnknownHandlerStackTest.java | 40 -
...onfigurationProviderWildCardIncludeTest.java | 48 -
.../xwork2/config/providers/XmlHelperTest.java | 255 ----
.../xwork2/conversion/ConversionTestAction.java | 97 --
.../impl/AnnotationXWorkConverterTest.java | 469 --------
.../xwork2/conversion/impl/FooBarConverter.java | 72 --
.../conversion/impl/FooNumberConverter.java | 18 -
.../impl/InstantiatingNullHandlerTest.java | 54 -
.../conversion/impl/NumberConverterTest.java | 42 -
.../xwork2/conversion/impl/ParentClass.java | 27 -
.../impl/XWorkBasicConverterTest.java | 260 ----
.../conversion/impl/XWorkConverterTest.java | 715 -----------
.../xwork2/inject/ContainerImplTest.java | 119 --
.../interceptor/AliasInterceptorTest.java | 133 ---
.../interceptor/ChainingInterceptorTest.java | 168 ---
.../ConversionErrorInterceptorTest.java | 147 ---
.../DefaultWorkflowInterceptorTest.java | 214 ----
.../ExceptionMappingInterceptorTest.java | 307 -----
.../xwork2/interceptor/I18nInterceptorTest.java | 207 ----
.../MethodFilterInterceptorUtilTest.java | 83 --
.../interceptor/ModelDrivenInterceptorTest.java | 112 --
.../ParameterFilterInterceptorTest.java | 125 --
.../ParameterRemoverInterceptorTest.java | 116 --
.../interceptor/ParametersInterceptorTest.java | 856 -------------
.../interceptor/PreResultListenerTest.java | 119 --
.../PrefixMethodInvocationUtilTest.java | 292 -----
.../interceptor/PrepareInterceptorTest.java | 221 ----
.../ScopedModelDrivenInterceptorTest.java | 234 ----
.../StaticParametersInterceptorTest.java | 209 ----
.../interceptor/TimerInterceptorTest.java | 169 ---
.../interceptor/ValidationErrorAwareTest.java | 103 --
...onInterceptorPrefixMethodInvocationTest.java | 107 --
.../annotations/AllowingByDefaultAction.java | 23 -
.../annotations/AllowingByDefaultModel.java | 22 -
.../annotations/AnnotatedAction.java | 46 -
.../AnnotationParameterFilterUnitTest.java | 173 ---
.../AnnotationWorkflowInterceptorTest.java | 102 --
.../annotations/BaseAnnotatedAction.java | 32 -
.../annotations/BlockingByDefaultAction.java | 24 -
.../annotations/BlockingByDefaultModel.java | 22 -
.../annotations/ShortcircuitedAction.java | 35 -
.../opensymphony/xwork2/ognl/OgnlUtilTest.java | 840 -------------
.../xwork2/ognl/OgnlValueStackTest.java | 1069 -----------------
.../xwork2/ognl/SecurityMemberAccessTest.java | 366 ------
.../xwork2/ognl/SetPropertiesTest.java | 334 ------
.../accessor/XWorkListPropertyAccessorTest.java | 53 -
.../DefaultAcceptedPatternsCheckerTest.java | 67 --
.../DefaultExcludedPatternsCheckerTest.java | 106 --
.../xwork2/spring/ActionsFromSpringTest.java | 80 --
.../com/opensymphony/xwork2/spring/Bar.java | 56 -
.../xwork2/spring/ExecuteInterceptor.java | 21 -
.../xwork2/spring/ExternalReferenceAction.java | 49 -
.../com/opensymphony/xwork2/spring/Foo.java | 30 -
.../xwork2/spring/SpringObjectFactoryTest.java | 375 ------
.../xwork2/spring/SpringResult.java | 36 -
.../ActionAutowiringInterceptorTest.java | 112 --
.../interceptor/TestActionInvocation.java | 82 --
.../xwork2/test/AnnotationDataAware.java | 48 -
.../xwork2/test/AnnotationDataAware2.java | 33 -
.../xwork2/test/AnnotationTestBean2.java | 65 -
.../xwork2/test/AnnotationUser.java | 107 --
.../xwork2/test/AnnotationUserMarker.java | 41 -
.../com/opensymphony/xwork2/test/DataAware.java | 35 -
.../opensymphony/xwork2/test/DataAware2.java | 29 -
.../com/opensymphony/xwork2/test/Equidae.java | 52 -
.../xwork2/test/ModelDrivenAction2.java | 38 -
.../test/ModelDrivenAnnotationAction2.java | 39 -
.../opensymphony/xwork2/test/SimpleAction2.java | 39 -
.../opensymphony/xwork2/test/SimpleAction3.java | 48 -
.../xwork2/test/SimpleAnnotationAction2.java | 42 -
.../xwork2/test/SimpleAnnotationAction3.java | 49 -
.../com/opensymphony/xwork2/test/TestBean2.java | 58 -
.../java/com/opensymphony/xwork2/test/User.java | 85 --
.../opensymphony/xwork2/test/UserMarker.java | 25 -
.../xwork2/test/annotations/Address.java | 40 -
.../test/annotations/AddressTypeConverter.java | 29 -
.../xwork2/test/annotations/Person.java | 22 -
.../xwork2/test/annotations/PersonAction.java | 47 -
.../test/annotations/PersonActionTest.java | 87 --
.../test/annotations/PersonTypeConverter.java | 27 -
.../ValidateAnnotatedMethodOnlyAction.java | 55 -
.../test/subtest/NullModelDrivenAction.java | 19 -
.../opensymphony/xwork2/util/AnnotatedCat.java | 67 --
.../xwork2/util/AnnotationUtilsTest.java | 73 --
.../java/com/opensymphony/xwork2/util/Bar.java | 61 -
.../com/opensymphony/xwork2/util/BarJunior.java | 4 -
.../java/com/opensymphony/xwork2/util/Cat.java | 58 -
.../xwork2/util/ClassLoaderUtilTest.java | 124 --
.../xwork2/util/ClassPathFinderTest.java | 54 -
.../xwork2/util/DefaultFileManagerTest.java | 62 -
.../java/com/opensymphony/xwork2/util/Dog.java | 123 --
.../opensymphony/xwork2/util/DomHelperTest.java | 70 --
.../java/com/opensymphony/xwork2/util/Foo.java | 218 ----
.../com/opensymphony/xwork2/util/FurColor.java | 20 -
.../xwork2/util/GetPropertiesTest.java | 40 -
.../com/opensymphony/xwork2/util/Indexed.java | 41 -
.../opensymphony/xwork2/util/ListHolder.java | 37 -
.../xwork2/util/LocalizedTextUtilTest.java | 255 ----
.../com/opensymphony/xwork2/util/MyBean.java | 54 -
.../opensymphony/xwork2/util/MyBeanAction.java | 55 -
.../xwork2/util/MyBeanActionTest.java | 104 --
.../util/NamedVariablePatternMatcherTest.java | 77 --
.../com/opensymphony/xwork2/util/Owner.java | 37 -
.../xwork2/util/ResolverUtilTest.java | 61 -
.../xwork2/util/TextParseUtilTest.java | 214 ----
.../com/opensymphony/xwork2/util/Tiger.java | 39 -
.../opensymphony/xwork2/util/URLUtilTest.java | 177 ---
.../xwork2/util/UnknownHandlerManagerTest.java | 82 --
.../opensymphony/xwork2/util/UrlUtilTest2.java | 35 -
.../xwork2/util/WildcardHelperTest.java | 56 -
.../xwork2/util/WildcardUtilTest.java | 56 -
.../opensymphony/xwork2/util/XWorkListTest.java | 86 --
.../xwork2/util/annotation/Dummy2Class.java | 9 -
.../xwork2/util/annotation/DummyClass.java | 13 -
.../xwork2/util/annotation/DummyClassExt.java | 9 -
.../xwork2/util/annotation/MyAnnotation.java | 11 -
.../xwork2/util/annotation/MyAnnotation2.java | 8 -
.../xwork2/util/annotation/package-info.java | 22 -
.../util/fs/DefaultFileManagerFactoryTest.java | 135 ---
.../util/location/LocationAttributesTest.java | 87 --
.../xwork2/util/location/LocationImplTest.java | 87 --
.../xwork2/util/location/LocationUtilsTest.java | 53 -
.../xwork2/util/logging/LoggerUtilsTest.java | 24 -
.../util/profiling/ProfilingTimerBeanTest.java | 124 --
.../util/profiling/UtilTimerStackTest.java | 133 ---
.../validator/ActionValidatorManagerTest.java | 216 ----
.../AnnotationActionValidatorManagerTest.java | 412 -------
.../validator/AnnotationValidationAction.java | 70 --
...ationValidationConfigurationBuilderTest.java | 309 -----
.../AnnotationValidationExpAction.java | 139 ---
.../ConversionErrorFieldValidatorTest.java | 84 --
.../validator/DateRangeValidatorTest.java | 83 --
.../DefaultActionValidatorManagerTest.java | 379 ------
.../validator/DefaultValidatorFactoryTest.java | 38 -
.../DefaultValidatorFileParserTest.java | 219 ----
.../validator/DoubleRangeValidatorTest.java | 278 -----
.../xwork2/validator/EmailValidatorTest.java | 154 ---
.../validator/ExpressionValidatorTest.java | 139 ---
.../validator/GenericValidatorContext.java | 143 ---
.../xwork2/validator/IntRangeValidatorTest.java | 70 --
.../validator/LongRangeValidatorTest.java | 68 --
.../validator/ModelDrivenValidationTest.java | 53 -
.../xwork2/validator/MyValidator.java | 96 --
.../validator/RegexFieldValidatorTest.java | 195 ---
...onversionErrorFieldValidatorSupportTest.java | 129 --
.../validator/ShortRangeValidatorTest.java | 68 --
.../validator/SimpleActionValidationTest.java | 231 ----
.../StringLengthFieldValidatorTest.java | 220 ----
.../xwork2/validator/StringValidatorTest.java | 217 ----
.../xwork2/validator/URLValidatorTest.java | 192 ---
.../validator/ValidatorAnnotationTest.java | 120 --
.../VisitorFieldValidatorModelTest.java | 124 --
.../validator/VisitorFieldValidatorTest.java | 211 ----
.../validator/VisitorValidatorModelAction.java | 35 -
.../validator/VisitorValidatorTestAction.java | 80 --
.../AppendingValidatorContextTest.java | 47 -
.../validators/DateRangeFieldValidatorTest.java | 93 --
.../validators/IntRangeFieldValidatorTest.java | 76 --
.../validators/LongRangeFieldValidatorTest.java | 76 --
.../validators/RequiredStringValidatorTest.java | 79 --
.../ShortRangeFieldValidatorTest.java | 76 --
.../validator/validators/ValidationAction.java | 136 ---
.../validators/ValidatorSupportTest.java | 53 -
.../test/resources/PackagelessAction.properties | 1 -
...ionSupportTest$MyActionSupport_da.properties | 10 -
.../xwork2/AnnotatedTestBean.properties | 1 -
.../DefaultTextProviderTest_en_CA.properties | 8 -
.../xwork2/ModelDrivenAction-validation.xml | 13 -
.../xwork2/ModelDrivenAction.properties | 1 -
.../ModelDrivenAnnotationAction.properties | 6 -
.../SimpleAction-some-alias-validation.xml | 13 -
.../SimpleAction-subproperty-validation.xml | 18 -
.../xwork2/SimpleAction-validation.xml | 58 -
.../SimpleAction-validationAlias-validation.xml | 13 -
.../opensymphony/xwork2/SimpleAction.properties | 3 -
.../xwork2/SimpleAction_de.properties | 1 -
.../xwork2/SimpleAction_en.properties | 0
.../xwork2/SimpleAnnotationAction.properties | 8 -
.../xwork2/SimpleAnnotationAction_de.properties | 6 -
.../xwork2/SimpleAnnotationAction_en.properties | 5 -
.../TestBean-anotherContext-validation.xml | 10 -
.../xwork2/TestBean-badtest-validation.xml | 8 -
.../TestBean-beanMessageBundle-validation.xml | 15 -
...TestBean-expressionValidation-validation.xml | 9 -
.../opensymphony/xwork2/TestBean-validation.xml | 8 -
...stBean-visitorChildValidation-validation.xml | 14 -
.../TestBean-visitorValidation-validation.xml | 9 -
.../com/opensymphony/xwork2/TestBean.properties | 1 -
.../xwork2/TestChildBean-validation.xml | 23 -
.../TextProviderSupportTest_en.properties | 12 -
.../xwork2/ValidationOrderAction-validation.xml | 89 --
.../loadorder1/xwork-test-load-order.xml | 7 -
.../loadorder2/xwork-test-load-order.xml | 7 -
.../loadorder3/xwork-test-load-order.xml | 7 -
.../xwork2/config/providers/xwork- test.xml | 81 --
.../providers/xwork-include-after-package-2.xml | 14 -
.../providers/xwork-include-after-package.xml | 20 -
.../xwork-include-before-package-2.xml | 14 -
.../providers/xwork-include-before-package.xml | 22 -
.../config/providers/xwork-include-parent.xml | 22 -
.../providers/xwork-test-action-invalid.xml | 23 -
...work-test-actions-packagedefaultclassref.xml | 41 -
.../config/providers/xwork-test-actions.xml | 81 --
.../providers/xwork-test-allowed-methods.xml | 48 -
.../providers/xwork-test-bad-inheritance.xml | 17 -
.../providers/xwork-test-basic-packages.xml | 13 -
.../providers/xwork-test-default-package.xml | 9 -
.../xwork-test-defaultclassref-package.xml | 11 -
.../providers/xwork-test-exception-mappings.xml | 33 -
.../xwork-test-global-result-inheritence.xml | 48 -
.../xwork-test-interceptor-defaultref.xml | 30 -
.../xwork-test-interceptor-inheritance.xml | 34 -
.../xwork-test-interceptor-param-overriding.xml | 44 -
.../providers/xwork-test-interceptor-params.xml | 37 -
...-test-interceptor-stack-param-overriding.xml | 51 -
.../providers/xwork-test-interceptors-basic.xml | 27 -
.../xwork-test-interceptors-spring.xml | 13 -
.../providers/xwork-test-invalid-file.xml | 9 -
.../config/providers/xwork-test-multilevel.xml | 45 -
.../xwork-test-package-inheritance.xml | 27 -
.../providers/xwork-test-result-inheritance.xml | 26 -
.../providers/xwork-test-result-types.xml | 54 -
.../config/providers/xwork-test-results.xml | 32 -
.../config/providers/xwork-test-wildcard-1.xml | 8 -
.../config/providers/xwork-test-wildcard-2.xml | 8 -
.../providers/xwork-test-wildcard-include.xml | 10 -
.../xwork-unknownhandler-stack-empty.xml | 12 -
.../providers/xwork-unknownhandler-stack.xml | 14 -
.../impl/test-xwork-conversion.properties | 1 -
.../com/opensymphony/xwork2/somefile.txt | 9 -
.../xwork2/spring/actionContext-spring.xml | 43 -
.../xwork2/spring/actionContext-xwork.xml | 23 -
.../xwork2/spring/autowireContext.xml | 6 -
.../spring/resolverApplicationContext.xml | 11 -
.../xwork2/spring/xwork-autowire.xml | 22 -
.../com/opensymphony/xwork2/test.properties | 1 -
.../xwork2/test/DataAware-conversion.properties | 1 -
.../xwork2/test/DataAware-validation.xml | 8 -
.../DataAware-validationAlias-validation.xml | 8 -
.../xwork2/test/DataAware.properties | 2 -
.../xwork2/test/DataAware2-validation.xml | 8 -
.../xwork2/test/Equidae-validation.xml | 52 -
.../xwork2/test/SimpleAction2-validation.xml | 13 -
...SimpleAction2-validationAlias-validation.xml | 13 -
.../xwork2/test/TestBean2-conversion.properties | 1 -
.../xwork2/test/User-conversion.properties | 2 -
.../xwork2/test/User-validation.xml | 38 -
.../xwork2/test/UserMarker-validation.xml | 17 -
.../opensymphony/xwork2/test/package.properties | 1 -
.../com/opensymphony/xwork2/util/Bar.properties | 2 -
.../xwork2/util/Cat-conversion.properties | 2 -
.../opensymphony/xwork2/util/FindMe.properties | 2 -
.../xwork2/util/Foo-conversion.properties | 11 -
.../util/ListHolder-conversion.properties | 3 -
.../util/LocalizedTextUtilTest.properties | 3 -
.../util/MyBeanAction-conversion.properties | 8 -
.../xwork2/util/Tiger-conversion.properties | 1 -
.../xwork2/util/XW404_de.properties | 3 -
.../xwork2/util/XW404_fr.properties | 3 -
.../xwork2/util/location/xml-with-location.xml | 8 -
...teTextProviderTestResourceBundle1.properties | 10 -
...teTextProviderTestResourceBundle2.properties | 11 -
.../VisitorValidatorModelAction-validation.xml | 9 -
...rTestAction-beanMessageBundle-validation.xml | 8 -
...datorTestAction-validateArray-validation.xml | 8 -
...idatorTestAction-validateList-validation.xml | 8 -
.../VisitorValidatorTestAction-validation.xml | 8 -
...Action-visitorChildValidation-validation.xml | 8 -
...rTestAction-visitorValidation-validation.xml | 8 -
...Action-visitorValidationAlias-validation.xml | 9 -
.../xwork2/validator/validator-parser-test.xml | 33 -
.../xwork2/validator/validator-parser-test2.xml | 17 -
.../xwork2/validator/validator-parser-test3.xml | 11 -
.../xwork2/validator/validator-parser-test4.xml | 12 -
.../xwork2/validator/validator-parser-test5.xml | 4 -
.../xwork2/validator/validator-parser-test6.xml | 27 -
.../xwork2/validator/validators-fail.xml | 21 -
xwork-core/src/test/resources/includeTest.xml | 10 -
xwork-core/src/test/resources/log4j2.xml | 13 -
xwork-core/src/test/resources/my-validators.xml | 7 -
.../src/test/resources/myOther-validators.xml | 7 -
xwork-core/src/test/resources/validators.xml | 20 -
xwork-core/src/test/resources/xwork - jar.jar | Bin 2448 -> 0 bytes
xwork-core/src/test/resources/xwork - zip.zip | Bin 2449 -> 0 bytes
xwork-core/src/test/resources/xwork-1.0.dtd | 1 -
.../test/resources/xwork-class-param-test.xml | 11 -
xwork-core/src/test/resources/xwork-jar.jar | Bin 2441 -> 0 bytes
.../src/test/resources/xwork-param-test.xml | 9 -
.../src/test/resources/xwork-proxyinvoke.xml | 48 -
xwork-core/src/test/resources/xwork-sample.xml | 238 ----
.../src/test/resources/xwork-test-beans.xml | 9 -
.../src/test/resources/xwork-test-default.xml | 39 -
.../test/resources/xwork-test-validation.xml | 64 -
xwork-core/src/test/resources/xwork-zip.zip | Bin 2440 -> 0 bytes
1304 files changed, 69766 insertions(+), 78952 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/31af5842/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index be09a0b..05ecb16 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -73,6 +73,39 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.6</version>
+ <configuration>
+ <argLine>-Duser.language=en -Duser.region=US</argLine>
+ <properties>
+ <property>
+ <name>maven.testng.output.dir</name>
+ <value>${project.basedir}/target/surefire-reports</value>
+ </property>
+ </properties>
+ <useSystemClassLoader>false</useSystemClassLoader>
+ <additionalClasspathElements>
+ <element>${project.build.testOutputDirectory}/xwork-jar.jar</element>
+ <element>${project.build.testOutputDirectory}/xwork-zip.zip</element>
+ <element>${project.build.testOutputDirectory}/xwork - jar.jar</element>
+ <element>${project.build.testOutputDirectory}/xwork - zip.zip</element>
+ </additionalClasspathElements>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/XWorkTestCase.java</exclude>
+ <exclude>**/TestBean.java</exclude>
+ <exclude>**/TestBean2.java</exclude>
+ <exclude>**/TestInterceptor.java</exclude>
+ <exclude>**/AnnotatedTestBean.java</exclude>
+ <exclude>**/ContainerImplTest.java</exclude>
+ <exclude>**/URLUtilTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -152,11 +185,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.struts.xwork</groupId>
- <artifactId>xwork-core</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
</dependency>
@@ -208,30 +236,80 @@
<artifactId>commons-io</artifactId>
</dependency>
- <!-- Mocks for unit testing (by Spring) -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aspects</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
- <!-- Test dependencies -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>compile</scope>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>mockobjects</groupId>
- <artifactId>mockobjects-core</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j2.version}</version>
<scope>test</scope>
</dependency>
@@ -277,6 +355,17 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>mockobjects</groupId>
+ <artifactId>mockobjects-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<!-- These jars have to be in the compile scope in order to work with apt plugin
(struts-annotations) and javadoc (the rest to process xwork sources). Marking
them optional to exclude them from transitive dependency resolution -->
@@ -296,10 +385,15 @@
<classifier>jdk15</classifier>
</dependency>
+ <!-- SLF4J support -->
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <scope>compile</scope>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
<optional>true</optional>
</dependency>
http://git-wip-us.apache.org/repos/asf/struts/blob/31af5842/core/src/main/java/com/opensymphony/xwork2/Action.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/Action.java b/core/src/main/java/com/opensymphony/xwork2/Action.java
new file mode 100644
index 0000000..f10a431
--- /dev/null
+++ b/core/src/main/java/com/opensymphony/xwork2/Action.java
@@ -0,0 +1,80 @@
+/*
+ * 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;
+
+/**
+ * All actions <b>may</b> implement this interface, which exposes the <code>execute()</code> method.
+ * <p/>
+ * However, as of XWork 1.1, this is <b>not</b> required and is only here to assist users. You are free to create POJOs
+ * that honor the same contract defined by this interface without actually implementing the interface.
+ */
+public interface Action {
+
+ /**
+ * The action execution was successful. Show result
+ * view to the end user.
+ */
+ public static final String SUCCESS = "success";
+
+ /**
+ * The action execution was successful but do not
+ * show a view. This is useful for actions that are
+ * handling the view in another fashion like redirect.
+ */
+ public static final String NONE = "none";
+
+ /**
+ * The action execution was a failure.
+ * Show an error view, possibly asking the
+ * user to retry entering data.
+ */
+ public static final String ERROR = "error";
+
+ /**
+ * The action execution require more input
+ * in order to succeed.
+ * This result is typically used if a form
+ * handling action has been executed so as
+ * to provide defaults for a form. The
+ * form associated with the handler should be
+ * shown to the end user.
+ * <p/>
+ * This result is also used if the given input
+ * params are invalid, meaning the user
+ * should try providing input again.
+ */
+ public static final String INPUT = "input";
+
+ /**
+ * The action could not execute, since the
+ * user most was not logged in. The login view
+ * should be shown.
+ */
+ public static final String LOGIN = "login";
+
+
+ /**
+ * Where the logic of the action is executed.
+ *
+ * @return a string representing the logical result of the execution.
+ * See constants in this interface for a list of standard result values.
+ * @throws Exception thrown if a system level exception occurs.
+ * <b>Note:</b> Application level exceptions should be handled by returning
+ * an error value, such as <code>Action.ERROR</code>.
+ */
+ public String execute() throws Exception;
+
+}