From 717ab9fd8d8b07e6b8fe1bb93a4e665d1255bcd9 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Sun, 1 Sep 2024 08:42:42 +0200 Subject: [PATCH] WW-3714 Moves all classes from com.opensymphony.xwork2 into org.apache.struts2 --- .../demo/rest/example/OrdersController.java | 6 +- .../src/main/resources/log4j2.xml | 1 - apps/showcase/pom.xml | 1 - .../apache/struts2/showcase/DateAction.java | 2 +- .../showcase/DynamicTreeSelectAction.java | 2 +- .../LotsOfOptiontransferselectAction.java | 2 +- .../showcase/LotsOfRichtexteditorAction.java | 2 +- .../struts2/showcase/MoreSelectsAction.java | 2 +- .../showcase/ShowAjaxDynamicTreeAction.java | 2 +- .../showcase/ShowDynamicTreeAction.java | 2 +- .../apache/struts2/showcase/UITagExample.java | 6 +- .../showcase/action/AbstractCRUDAction.java | 2 +- .../showcase/action/EmployeeAction.java | 2 +- .../showcase/action/ExampleAction.java | 2 +- .../showcase/action/JSPEvalAction.java | 4 +- .../action/ParamsAnnotationAction.java | 2 +- .../struts2/showcase/action/SkillAction.java | 2 +- .../showcase/actionchaining/ActionChain1.java | 2 +- .../showcase/actionchaining/ActionChain2.java | 2 +- .../showcase/actionchaining/ActionChain3.java | 2 +- .../struts2/showcase/ajax/AjaxTestAction.java | 2 +- .../ajax/AutocompleterExampleAction.java | 2 +- .../ajax/Example4ShowPanelAction.java | 2 +- .../struts2/showcase/ajax/Example5Action.java | 2 +- .../showcase/ajax/tree/GetCategory.java | 2 +- .../showcase/async/ChatRoomAction.java | 2 +- .../chat/ChatAuthenticationInterceptor.java | 8 +- .../showcase/chat/ChatInterceptor.java | 8 +- .../showcase/chat/ChatLoginAction.java | 2 +- .../showcase/chat/ChatLogoutAction.java | 2 +- .../struts2/showcase/chat/CrudRoomAction.java | 2 +- .../struts2/showcase/chat/DateConverter.java | 4 +- .../showcase/chat/EnterRoomAction.java | 2 +- .../struts2/showcase/chat/ExitRoomAction.java | 2 +- .../chat/MessagesAvailableInRoomAction.java | 2 +- .../showcase/chat/RoomsAvailableAction.java | 2 +- .../chat/SendMessageToRoomAction.java | 2 +- .../showcase/chat/UsersAvailableAction.java | 2 +- .../chat/UsersAvailableInRoomAction.java | 2 +- .../showcase/conversion/AddressAction.java | 2 +- .../conversion/OperationsEnumAction.java | 2 +- .../showcase/conversion/PersonAction.java | 2 +- .../filedownload/FileDownloadAction.java | 2 +- .../showcase/fileupload/FileUploadAction.java | 2 +- .../MultipleFileUploadUsingArrayAction.java | 2 +- .../MultipleFileUploadUsingListAction.java | 2 +- .../freemarker/CustomFreemarkerManager.java | 2 +- .../freemarker/StandardTagsAction.java | 4 +- .../hangman/GetUpdatedHangmanAction.java | 2 +- .../hangman/GuessCharacterAction.java | 2 +- .../showcase/hangman/StartHangmanAction.java | 2 +- .../modelDriven/ModelDrivenAction.java | 4 +- .../showcase/person/EditPersonAction.java | 2 +- .../showcase/person/ListPeopleAction.java | 2 +- .../showcase/person/NewPersonAction.java | 2 +- .../showcase/source/ViewSourceAction.java | 4 +- .../tag/nonui/actionPrefix/SubmitAction.java | 2 +- .../tag/nonui/actiontag/ActionTagDemo.java | 2 +- .../tag/nonui/debugtag/DebugTagAction.java | 2 +- .../iteratortag/AppendIteratorTagDemo.java | 4 +- .../iteratortag/IteratorGeneratorTagDemo.java | 2 +- .../iteratortag/MergeIteratorTagDemo.java | 4 +- .../iteratortag/SubsetIteratorTagDemo.java | 4 +- .../tiles/TilesAnnotationsAction.java | 2 +- .../struts2/showcase/token/TokenAction.java | 4 +- .../AbstractValidationActionSupport.java | 2 +- .../validation/AjaxFormSubmitAction.java | 18 +- .../BeanValidationExampleAction.java | 2 +- .../showcase/validation/QuizAction.java | 2 +- .../validation/SubmitApplication.java | 2 +- .../showcase/wait/LongProcessAction.java | 2 +- .../struts2/showcase/xslt/JVMAction.java | 2 +- apps/showcase/src/main/resources/log4j2.xml | 1 - .../WEB-INF/conversion/AddressAction.java.txt | 10 +- .../conversion/OperationsEnumAction.java.txt | 14 +- .../WEB-INF/conversion/PersonAction.java.txt | 16 +- .../main/webapp/WEB-INF/decorators/main.jsp | 6 +- apps/showcase/src/main/webapp/WEB-INF/dwr.xml | 6 +- core/pom.xml | 2 +- .../opensymphony/xwork2/config/package.html | 21 -- .../xwork2 => org/apache/struts2}/Action.java | 2 +- .../apache/struts2}/ActionChainResult.java | 7 +- .../apache/struts2}/ActionContext.java | 14 +- .../apache/struts2}/ActionEventListener.java | 4 +- .../apache/struts2}/ActionInvocation.java | 8 +- .../apache/struts2}/ActionProxy.java | 8 +- .../apache/struts2}/ActionProxyFactory.java | 4 +- .../apache/struts2}/ActionSupport.java | 21 +- .../apache/struts2}/AsyncManager.java | 2 +- .../struts2}/CompositeTextProvider.java | 26 +-- .../struts2}/DefaultActionInvocation.java | 35 ++- .../apache/struts2}/DefaultActionProxy.java | 10 +- .../struts2}/DefaultActionProxyFactory.java | 8 +- .../struts2}/DefaultLocaleProvider.java | 2 +- .../DefaultLocaleProviderFactory.java | 2 +- .../apache/struts2}/DefaultTextProvider.java | 6 +- .../DefaultUnknownHandlerManager.java | 16 +- .../apache/struts2}/FileManager.java | 2 +- .../apache/struts2}/FileManagerFactory.java | 6 +- .../apache/struts2}/LocaleProvider.java | 2 +- .../struts2}/LocaleProviderFactory.java | 2 +- .../struts2}/LocalizedTextProvider.java | 4 +- .../apache/struts2}/ModelDriven.java | 2 +- .../apache/struts2}/ObjectFactory.java | 52 +++-- .../apache/struts2}/Preparable.java | 8 +- .../struts2}/ResourceBundleTextProvider.java | 2 +- .../xwork2 => org/apache/struts2}/Result.java | 2 +- .../apache/struts2/ServletActionContext.java | 4 +- .../org/apache/struts2/StrutsConstants.java | 29 +-- .../org/apache/struts2/StrutsException.java | 6 +- .../org/apache/struts2/StrutsStatics.java | 10 +- .../struts2}/StrutsTextProviderFactory.java | 4 +- .../apache/struts2}/TextProvider.java | 8 +- .../apache/struts2}/TextProviderFactory.java | 2 +- .../apache/struts2}/TextProviderSupport.java | 6 +- .../apache/struts2}/Unchainable.java | 4 +- .../apache/struts2}/UnknownHandler.java | 19 +- .../struts2}/UnknownHandlerManager.java | 6 +- .../apache/struts2}/Validateable.java | 4 +- .../struts2}/ValidationAwareSupport.java | 4 +- .../apache/struts2}/XWorkJUnit4TestCase.java | 26 +-- .../apache/struts2}/XWorkTestCase.java | 28 +-- .../struts2/action/CspReportAction.java | 2 +- .../struts2/components/ActionComponent.java | 14 +- .../struts2/components/ActionError.java | 2 +- .../struts2/components/ActionMessage.java | 2 +- .../org/apache/struts2/components/Anchor.java | 4 +- .../struts2/components/AppendIterator.java | 2 +- .../org/apache/struts2/components/Bean.java | 8 +- .../apache/struts2/components/Checkbox.java | 4 +- .../struts2/components/CheckboxList.java | 2 +- .../struts2/components/ClosingUIBean.java | 2 +- .../apache/struts2/components/ComboBox.java | 2 +- .../apache/struts2/components/Component.java | 12 +- .../components/ComponentUrlProvider.java | 2 +- .../struts2/components/ContextBean.java | 8 +- .../org/apache/struts2/components/Date.java | 6 +- .../struts2/components/DateTextField.java | 2 +- .../org/apache/struts2/components/Debug.java | 6 +- .../struts2/components/DoubleListUIBean.java | 2 +- .../struts2/components/DoubleSelect.java | 2 +- .../org/apache/struts2/components/Else.java | 2 +- .../org/apache/struts2/components/ElseIf.java | 2 +- .../apache/struts2/components/FieldError.java | 2 +- .../org/apache/struts2/components/File.java | 2 +- .../org/apache/struts2/components/Form.java | 30 +-- .../apache/struts2/components/FormButton.java | 2 +- .../struts2/components/GenericUIBean.java | 2 +- .../org/apache/struts2/components/Head.java | 4 +- .../org/apache/struts2/components/Hidden.java | 2 +- .../org/apache/struts2/components/I18n.java | 15 +- .../org/apache/struts2/components/If.java | 2 +- .../apache/struts2/components/Include.java | 4 +- .../components/InputTransferSelect.java | 2 +- .../struts2/components/IteratorComponent.java | 4 +- .../org/apache/struts2/components/Label.java | 2 +- .../org/apache/struts2/components/Link.java | 2 +- .../apache/struts2/components/ListUIBean.java | 2 +- .../struts2/components/MergeIterator.java | 2 +- .../org/apache/struts2/components/Number.java | 4 +- .../apache/struts2/components/OptGroup.java | 6 +- .../components/OptionTransferSelect.java | 2 +- .../org/apache/struts2/components/Param.java | 6 +- .../apache/struts2/components/Password.java | 2 +- .../apache/struts2/components/Property.java | 2 +- .../org/apache/struts2/components/Push.java | 4 +- .../org/apache/struts2/components/Radio.java | 2 +- .../org/apache/struts2/components/Reset.java | 2 +- .../org/apache/struts2/components/Script.java | 4 +- .../org/apache/struts2/components/Select.java | 2 +- .../components/ServletUrlRenderer.java | 10 +- .../org/apache/struts2/components/Set.java | 2 +- .../org/apache/struts2/components/Submit.java | 2 +- .../org/apache/struts2/components/Text.java | 6 +- .../apache/struts2/components/TextArea.java | 2 +- .../apache/struts2/components/TextField.java | 2 +- .../org/apache/struts2/components/Token.java | 2 +- .../org/apache/struts2/components/UIBean.java | 8 +- .../org/apache/struts2/components/URL.java | 4 +- .../struts2/components/UpDownSelect.java | 2 +- .../struts2/components/UrlProvider.java | 2 +- .../date/DateTimeFormatterAdapter.java | 2 +- .../date/SimpleDateFormatAdapter.java | 2 +- .../template/BaseTemplateEngine.java | 2 +- .../template/FreemarkerTemplateEngine.java | 10 +- .../template/JspTemplateEngine.java | 4 +- .../template/TemplateEngineManager.java | 6 +- .../template/TemplateRenderingContext.java | 2 +- .../config/AbstractBeanSelectionProvider.java | 17 +- .../config/BeanSelectionProvider.java | 2 +- .../apache/struts2}/config/Configuration.java | 8 +- .../config/ConfigurationException.java | 2 +- .../struts2}/config/ConfigurationManager.java | 8 +- .../config/ConfigurationProvider.java | 2 +- .../struts2}/config/ConfigurationUtil.java | 4 +- .../struts2}/config/ContainerProvider.java | 6 +- .../config/DefaultPropertiesProvider.java | 6 +- .../struts2/config/DefaultSettings.java | 6 +- .../struts2/config/DelegatingSettings.java | 2 +- .../config/FileManagerFactoryProvider.java | 10 +- .../struts2}/config/FileManagerProvider.java | 10 +- .../org/apache/struts2/config/NullResult.java | 4 +- .../struts2}/config/PackageProvider.java | 12 +- .../PropertiesConfigurationProvider.java | 10 +- .../struts2/config/PropertiesSettings.java | 8 +- .../struts2}/config/RuntimeConfiguration.java | 4 +- ...vletContextAwareConfigurationProvider.java | 2 +- .../org/apache/struts2/config/Settings.java | 4 +- .../config/StrutsBeanSelectionProvider.java | 154 ++++++------ .../StrutsJavaConfigurationProvider.java | 24 +- .../StrutsXmlConfigurationProvider.java | 21 +- .../config/entities/ActionConfig.java | 6 +- .../config/entities/AllowedMethods.java | 2 +- .../struts2/config/entities/BeanConfig.java | 4 +- .../config/entities/BeanSelectionConfig.java | 4 +- .../entities/ExceptionMappingConfig.java | 6 +- .../config/entities/InterceptorConfig.java | 6 +- .../entities/InterceptorListHolder.java | 2 +- .../config/entities/InterceptorLocator.java | 2 +- .../config/entities/InterceptorMapping.java | 4 +- .../entities/InterceptorStackConfig.java | 6 +- .../config/entities/PackageConfig.java | 6 +- .../config/entities/Parameterizable.java | 4 +- .../config/entities/ResultConfig.java | 6 +- .../config/entities/ResultTypeConfig.java | 6 +- .../config/entities/UnknownHandlerConfig.java | 6 +- .../struts2}/config/entities/package.html | 0 .../struts2}/config/impl/AbstractMatcher.java | 6 +- .../config/impl/ActionConfigMatcher.java | 10 +- .../config/impl/DefaultConfiguration.java | 172 +++++++------- .../config/impl/LocatableConstantFactory.java | 10 +- .../config/impl/LocatableFactory.java | 12 +- .../config/impl/MockConfiguration.java | 28 +-- .../struts2}/config/impl/NamespaceMatch.java | 2 +- .../config/impl/NamespaceMatcher.java | 4 +- .../apache/struts2}/config/impl/package.html | 0 .../config/providers/CycleDetector.java | 2 +- .../config/providers/DirectedGraph.java | 2 +- .../providers/EnvsValueSubstitutor.java | 2 +- .../config/providers/InterceptorBuilder.java | 20 +- .../StrutsDefaultConfigurationProvider.java | 98 ++++---- .../config/providers/ValueSubstitutor.java | 2 +- .../providers/XmlConfigurationProvider.java | 24 +- .../XmlDocConfigurationProvider.java | 60 ++--- .../struts2}/config/providers/XmlHelper.java | 2 +- .../struts2}/config/providers/package.html | 0 .../ConversionAnnotationProcessor.java | 6 +- .../conversion/ConversionFileProcessor.java | 2 +- .../ConversionPropertiesProcessor.java | 2 +- .../struts2}/conversion/NullHandler.java | 4 +- .../conversion/ObjectTypeDeterminer.java | 2 +- .../StrutsConversionPropertiesProcessor.java | 10 +- .../StrutsTypeConverterCreator.java | 6 +- .../conversion/StrutsTypeConverterHolder.java | 3 - .../struts2}/conversion/TypeConverter.java | 2 +- .../conversion/TypeConverterCreator.java | 2 +- .../conversion/TypeConverterHolder.java | 2 +- .../conversion/UploadedFileConverter.java | 2 +- .../conversion/annotations/Conversion.java | 2 +- .../annotations/ConversionRule.java | 2 +- .../annotations/ConversionType.java | 2 +- .../annotations/TypeConversion.java | 9 +- .../conversion/annotations/package.html | 0 .../conversion/impl/ArrayConverter.java | 4 +- .../conversion/impl/CollectionConverter.java | 14 +- .../conversion/impl/ConversionData.java | 2 +- .../conversion/impl/DateConverter.java | 8 +- .../DefaultConversionAnnotationProcessor.java | 20 +- .../impl/DefaultConversionFileProcessor.java | 16 +- .../impl/DefaultObjectTypeDeterminer.java | 24 +- .../conversion/impl/DefaultTypeConverter.java | 14 +- .../impl/InstantiatingNullHandler.java | 16 +- .../conversion/impl/NumberConverter.java | 2 +- .../conversion/impl/StringConverter.java | 2 +- .../conversion/impl/XWorkBasicConverter.java | 8 +- .../conversion/impl/XWorkConverter.java | 36 +-- .../struts2}/conversion/impl/XWorkList.java | 8 +- .../struts2/dispatcher/ContainerHolder.java | 2 +- .../dispatcher/DefaultActionSupport.java | 4 +- .../DefaultDispatcherErrorHandler.java | 6 +- .../DefaultStaticContentLoader.java | 4 +- .../apache/struts2/dispatcher/Dispatcher.java | 60 ++--- .../struts2/dispatcher/InitOperations.java | 2 +- .../struts2/dispatcher/MockDispatcher.java | 2 +- .../struts2/dispatcher/PrepareOperations.java | 4 +- .../dispatcher/StrutsRequestWrapper.java | 4 +- .../dispatcher/mapper/ActionMapper.java | 2 +- .../dispatcher/mapper/ActionMapping.java | 6 +- .../mapper/CompositeActionMapper.java | 6 +- .../mapper/DefaultActionMapper.java | 14 +- .../mapper/PrefixBasedActionMapper.java | 6 +- .../mapper/Restful2ActionMapper.java | 4 +- .../mapper/RestfulActionMapper.java | 4 +- .../multipart/AbstractMultiPartRequest.java | 2 +- .../multipart/MultiPartRequestWrapper.java | 2 +- .../struts2}/factory/ActionFactory.java | 6 +- .../struts2}/factory/ConverterFactory.java | 8 +- .../factory/DefaultActionFactory.java | 8 +- .../factory/DefaultInterceptorFactory.java | 18 +- .../factory/DefaultResultFactory.java | 16 +- .../factory/DefaultUnknownHandlerFactory.java | 8 +- .../factory/DefaultValidatorFactory.java | 10 +- .../struts2}/factory/InterceptorFactory.java | 10 +- .../PrefixBasedActionProxyFactory.java | 10 +- .../struts2}/factory/ResultFactory.java | 8 +- .../struts2/factory/StrutsActionProxy.java | 6 +- .../factory/StrutsActionProxyFactory.java | 8 +- .../factory/StrutsConverterFactory.java | 8 +- .../struts2/factory/StrutsResultFactory.java | 19 +- .../factory/UnknownHandlerFactory.java | 8 +- .../struts2}/factory/ValidatorFactory.java | 8 +- .../struts2}/inject/ConstructionContext.java | 2 +- .../apache/struts2}/inject/Container.java | 6 +- .../struts2}/inject/ContainerBuilder.java | 2 +- .../apache/struts2}/inject/ContainerImpl.java | 4 +- .../apache/struts2}/inject/Context.java | 2 +- .../struts2}/inject/DependencyException.java | 2 +- .../struts2}/inject/EarlyInitializable.java | 2 +- .../struts2}/inject/ExternalContext.java | 2 +- .../apache/struts2}/inject/Factory.java | 2 +- .../apache/struts2}/inject/Initializable.java | 2 +- .../struts2}/inject/InitializableFactory.java | 2 +- .../apache/struts2}/inject/Inject.java | 5 +- .../struts2}/inject/InternalContext.java | 2 +- .../struts2}/inject/InternalFactory.java | 2 +- .../apache/struts2}/inject/Key.java | 2 +- .../apache/struts2}/inject/Scope.java | 4 +- .../apache/struts2}/inject/Scoped.java | 2 +- .../apache/struts2}/inject/package-info.java | 2 +- .../util/FinalizablePhantomReference.java | 4 +- .../inject/util/FinalizableReference.java | 2 +- .../util/FinalizableReferenceQueue.java | 2 +- .../inject/util/FinalizableSoftReference.java | 4 +- .../inject/util/FinalizableWeakReference.java | 4 +- .../apache/struts2}/inject/util/Function.java | 2 +- .../struts2}/inject/util/ReferenceCache.java | 4 +- .../struts2}/inject/util/ReferenceMap.java | 4 +- .../struts2}/inject/util/ReferenceType.java | 2 +- .../apache/struts2}/inject/util/package.html | 0 .../AbstractFileUploadInterceptor.java | 18 +- .../interceptor/AbstractInterceptor.java | 4 +- .../ActionFileUploadInterceptor.java | 11 +- .../ActionMappingParametersInterceptor.java | 2 +- .../interceptor/AliasInterceptor.java | 28 +-- .../interceptor/ChainingInterceptor.java | 24 +- .../interceptor/CheckboxInterceptor.java | 4 +- .../interceptor/ClearSessionInterceptor.java | 8 +- .../struts2/interceptor/CoepInterceptor.java | 8 +- .../interceptor/ConditionalInterceptor.java | 4 +- .../ConversionErrorInterceptor.java | 12 +- .../interceptor/CookieInterceptor.java | 16 +- .../CookieProviderInterceptor.java | 8 +- .../struts2/interceptor/CoopInterceptor.java | 8 +- .../interceptor/CreateSessionInterceptor.java | 6 +- .../interceptor/DateTextFieldInterceptor.java | 4 +- .../DefaultWorkflowInterceptor.java | 8 +- .../struts2}/interceptor/ExceptionHolder.java | 2 +- .../ExceptionMappingInterceptor.java | 10 +- .../ExecuteAndWaitInterceptor.java | 18 +- .../interceptor/FetchMetadataInterceptor.java | 10 +- .../struts2/interceptor/I18nInterceptor.java | 12 +- .../struts2}/interceptor/Interceptor.java | 10 +- .../interceptor/LoggingInterceptor.java | 4 +- .../interceptor/MessageStoreInterceptor.java | 8 +- .../MessageStorePreResultListener.java | 8 +- .../interceptor/MethodFilterInterceptor.java | 52 ++--- .../MethodFilterInterceptorUtil.java | 8 +- .../interceptor/ModelDrivenInterceptor.java | 10 +- .../interceptor/MultiselectInterceptor.java | 6 +- .../struts2/interceptor/NoOpInterceptor.java | 4 +- .../ParameterRemoverInterceptor.java | 10 +- .../interceptor/PreResultListener.java | 10 +- .../PrefixMethodInvocationUtil.java | 6 +- .../interceptor/PrepareInterceptor.java | 10 +- .../struts2/interceptor/RolesInterceptor.java | 4 +- .../struts2/interceptor/ScopeInterceptor.java | 16 +- .../interceptor/ScopedModelDriven.java | 8 +- .../ScopedModelDrivenInterceptor.java | 12 +- .../interceptor/ServletConfigInterceptor.java | 6 +- .../StaticParametersInterceptor.java | 26 +-- .../StrutsConversionErrorInterceptor.java | 8 +- .../struts2/interceptor/TokenInterceptor.java | 14 +- .../TokenSessionStoreInterceptor.java | 8 +- .../struts2}/interceptor/ValidationAware.java | 2 +- .../interceptor/ValidationErrorAware.java | 4 +- .../interceptor/ValidationWorkflowAware.java | 2 +- .../struts2}/interceptor/WithLazyParams.java | 16 +- .../interceptor/annotations/After.java | 4 +- .../AnnotationWorkflowInterceptor.java | 12 +- .../interceptor/annotations/Before.java | 4 +- .../interceptor/annotations/BeforeResult.java | 4 +- .../interceptor/annotations/InputConfig.java | 4 +- .../interceptor/annotations/package.html | 0 .../interceptor/csp/CspInterceptor.java | 8 +- .../debugging/DebuggingInterceptor.java | 16 +- .../debugging/ObjectToHTMLWriter.java | 4 +- .../interceptor/exec/BackgroundProcess.java | 2 +- .../exec/StrutsBackgroundProcess.java | 4 +- .../httpmethod/HttpMethodInterceptor.java | 6 +- .../apache/struts2}/interceptor/package.html | 0 .../parameter/ParametersInterceptor.java | 34 +-- .../parameter/StrutsParameter.java | 2 +- .../AnnotationValidationInterceptor.java | 6 +- .../struts2}/mock/MockActionInvocation.java | 10 +- .../apache/struts2}/mock/MockActionProxy.java | 16 +- .../apache/struts2}/mock/MockContainer.java | 6 +- .../apache/struts2}/mock/MockInterceptor.java | 10 +- .../mock/MockObjectTypeDeterminer.java | 4 +- .../apache/struts2}/mock/MockResult.java | 6 +- .../apache/struts2}/mock/package.html | 0 .../struts2}/ognl/BeanInfoCacheFactory.java | 2 +- .../ognl/DefaultOgnlBeanInfoCacheFactory.java | 4 +- .../ognl/DefaultOgnlCacheFactory.java | 2 +- .../DefaultOgnlExpressionCacheFactory.java | 4 +- .../struts2}/ognl/ErrorMessageBuilder.java | 2 +- .../struts2}/ognl/ExpressionCacheFactory.java | 2 +- .../apache/struts2}/ognl/ObjectProxy.java | 2 +- .../apache/struts2}/ognl/OgnlCache.java | 2 +- .../struts2}/ognl/OgnlCacheFactory.java | 4 +- .../struts2}/ognl/OgnlCaffeineCache.java | 2 +- .../struts2}/ognl/OgnlDefaultCache.java | 2 +- .../org/apache/struts2/ognl/OgnlGuard.java | 2 +- .../apache/struts2}/ognl/OgnlLRUCache.java | 2 +- .../struts2}/ognl/OgnlNullHandlerWrapper.java | 4 +- .../ognl/OgnlReflectionContextFactory.java | 4 +- .../struts2}/ognl/OgnlReflectionProvider.java | 8 +- .../ognl/OgnlTypeConverterWrapper.java | 4 +- .../apache/struts2}/ognl/OgnlUtil.java | 22 +- .../apache/struts2}/ognl/OgnlValueStack.java | 62 ++--- .../struts2}/ognl/OgnlValueStackFactory.java | 22 +- .../struts2}/ognl/SecurityMemberAccess.java | 22 +- .../apache/struts2/ognl/StrutsOgnlGuard.java | 6 +- .../ognl/XWorkTypeConverterWrapper.java | 4 +- .../ognl/accessor/CompoundRootAccessor.java | 10 +- .../HttpParametersPropertyAccessor.java | 3 +- .../ognl/accessor/ObjectAccessor.java | 7 +- .../accessor/ObjectProxyPropertyAccessor.java | 6 +- .../accessor/ParameterPropertyAccessor.java | 2 +- .../struts2}/ognl/accessor/RootAccessor.java | 2 +- .../XWorkCollectionPropertyAccessor.java | 16 +- .../accessor/XWorkEnumerationAccessor.java | 2 +- .../XWorkIteratorPropertyAccessor.java | 2 +- .../accessor/XWorkListPropertyAccessor.java | 16 +- .../accessor/XWorkMapPropertyAccessor.java | 12 +- .../ognl/accessor/XWorkMethodAccessor.java | 4 +- .../accessor/XWorkObjectPropertyAccessor.java | 6 +- .../apache/struts2}/package.html | 0 .../struts2/result/HttpHeaderResult.java | 8 +- .../struts2}/result/ParamNameAwareResult.java | 4 +- .../apache/struts2/result/PlainResult.java | 4 +- .../struts2/result/PlainTextResult.java | 5 +- .../apache/struts2/result/PostbackResult.java | 6 +- .../result/ServletActionRedirectResult.java | 6 +- .../result/ServletDispatcherResult.java | 4 +- .../struts2/result/ServletRedirectResult.java | 12 +- .../apache/struts2/result/StreamResult.java | 8 +- .../struts2/result/StrutsResultSupport.java | 24 +- .../security/AcceptedPatternsChecker.java | 2 +- .../DefaultAcceptedPatternsChecker.java | 6 +- .../DefaultExcludedPatternsChecker.java | 6 +- ...ultNotExcludedAcceptedPatternsChecker.java | 4 +- .../security/ExcludedPatternsChecker.java | 2 +- .../NotExcludedAcceptedPatternsChecker.java | 2 +- .../test/StubConfigurationProvider.java | 12 +- .../struts2/url/StrutsQueryStringBuilder.java | 2 +- .../struts2/url/StrutsQueryStringParser.java | 2 +- .../apache/struts2/url/StrutsUrlDecoder.java | 2 +- .../apache/struts2/url/StrutsUrlEncoder.java | 2 +- .../util/AbstractLocalizedTextProvider.java | 12 +- .../apache/struts2}/util/AnnotationUtils.java | 2 +- .../struts2/util/AppendIteratorFilter.java | 2 +- .../apache/struts2}/util/ClassLoaderUtil.java | 2 +- .../apache/struts2}/util/ClassPathFinder.java | 6 +- .../struts2}/util/ClearableValueStack.java | 2 +- .../apache/struts2}/util/CompoundRoot.java | 2 +- .../apache/struts2}/util/ConfigParseUtil.java | 8 +- .../struts2/util/ContentTypeMatcher.java | 2 +- .../apache/struts2}/util/CreateIfNull.java | 2 +- .../apache/struts2}/util/DebugUtils.java | 6 +- .../util/DefaultContentTypeMatcher.java | 4 +- .../apache/struts2}/util/DomHelper.java | 10 +- .../apache/struts2}/util/Element.java | 2 +- .../apache/struts2}/util/Evaluated.java | 2 +- .../util/GlobalLocalizedTextProvider.java | 6 +- .../struts2/util/InvocationSessionStore.java | 4 +- .../struts2/util/IteratorGenerator.java | 2 +- .../apache/struts2}/util/Key.java | 2 +- .../apache/struts2}/util/KeyProperty.java | 2 +- .../struts2}/util/MemberAccessValueStack.java | 2 +- .../struts2/util/MergeIteratorFilter.java | 2 +- .../util/NamedVariablePatternMatcher.java | 2 +- .../apache/struts2}/util/OgnlTextParser.java | 2 +- .../apache/struts2}/util/PatternMatcher.java | 2 +- .../struts2}/util/PropertiesReader.java | 2 +- .../apache/struts2}/util/ProxyUtil.java | 8 +- .../struts2/util/RegexPatternMatcher.java | 2 +- .../apache/struts2}/util/ResolverUtil.java | 4 +- .../struts2/util/SortIteratorFilter.java | 2 +- .../util/StrutsLocalizedTextProvider.java | 16 +- .../struts2/util/StrutsTestCaseHelper.java | 8 +- .../struts2/util/StrutsTypeConverter.java | 2 +- .../org/apache/struts2/util/StrutsUtil.java | 8 +- .../struts2/util/SubsetIteratorFilter.java | 2 +- .../apache/struts2}/util/TextParseUtil.java | 6 +- .../apache/struts2}/util/TextParser.java | 2 +- .../struts2/util/TextProviderHelper.java | 4 +- .../org/apache/struts2/util/TokenHelper.java | 4 +- .../java/org/apache/struts2/util/URLBean.java | 2 +- .../apache/struts2}/util/ValueStack.java | 8 +- .../struts2}/util/ValueStackFactory.java | 14 +- .../struts2/util/ValueStackProvider.java | 2 +- .../apache/struts2}/util/WildcardHelper.java | 2 +- .../apache/struts2}/util/WildcardUtil.java | 2 +- .../struts2}/util/XWorkTestCaseHelper.java | 24 +- .../classloader/AbstractResourceStore.java | 2 +- .../util/classloader/FileResourceStore.java | 2 +- .../util/classloader/JarResourceStore.java | 2 +- .../classloader/ReloadingClassLoader.java | 8 +- .../util/classloader/ResourceStore.java | 2 +- .../classloader/ResourceStoreClassLoader.java | 2 +- .../struts2}/util/finder/ClassFinder.java | 2 +- .../util/finder/ClassFinderFactory.java | 2 +- .../util/finder/ClassLoaderInterface.java | 2 +- .../finder/ClassLoaderInterfaceDelegate.java | 2 +- .../struts2}/util/finder/ResourceFinder.java | 2 +- .../apache/struts2}/util/finder/Test.java | 2 +- .../apache/struts2}/util/finder/UrlSet.java | 2 +- .../struts2}/util/fs/DefaultFileManager.java | 4 +- .../util/fs/DefaultFileManagerFactory.java | 10 +- .../apache/struts2}/util/fs/FileRevision.java | 2 +- .../struts2/util/fs/JBossFileManager.java | 4 - .../struts2}/util/fs/JarEntryRevision.java | 4 +- .../apache/struts2}/util/fs/Revision.java | 2 +- .../util/fs/StrutsJarURLConnection.java | 2 +- .../struts2}/util/location/Locatable.java | 2 +- .../util/location/LocatableProperties.java | 4 +- .../struts2}/util/location/Located.java | 2 +- .../struts2}/util/location/Location.java | 2 +- .../util/location/LocationAttributes.java | 78 +++---- .../struts2}/util/location/LocationImpl.java | 2 +- .../struts2}/util/location/LocationUtils.java | 4 +- .../struts2}/util/location/package.html | 0 .../apache/struts2}/util/package.html | 0 .../reflection/ReflectionContextFactory.java | 2 +- .../reflection/ReflectionContextState.java | 4 +- .../util/reflection/ReflectionException.java | 2 +- .../ReflectionExceptionHandler.java | 4 +- .../util/reflection/ReflectionProvider.java | 32 +-- .../validator/ActionValidatorManager.java | 2 +- .../AnnotationActionValidatorManager.java | 10 +- ...otationValidationConfigurationBuilder.java | 46 ++-- .../DefaultActionValidatorManager.java | 18 +- .../validator/DefaultValidatorFactory.java | 18 +- .../validator/DefaultValidatorFileParser.java | 18 +- .../validator/DelegatingValidatorContext.java | 20 +- .../struts2}/validator/FieldValidator.java | 2 +- .../validator/ShortCircuitableValidator.java | 2 +- .../validator/ValidationException.java | 2 +- .../validator/ValidationInterceptor.java | 68 +++--- .../apache/struts2}/validator/Validator.java | 4 +- .../struts2}/validator/ValidatorConfig.java | 6 +- .../struts2}/validator/ValidatorContext.java | 8 +- .../struts2}/validator/ValidatorFactory.java | 8 +- .../validator/ValidatorFileParser.java | 4 +- .../ConditionalVisitorFieldValidator.java | 2 +- .../ConversionErrorFieldValidator.java | 2 +- .../annotations/CreditCardValidator.java | 2 +- .../annotations/CustomValidator.java | 2 +- .../annotations/DateRangeFieldValidator.java | 2 +- .../DoubleRangeFieldValidator.java | 2 +- .../validator/annotations/EmailValidator.java | 2 +- .../annotations/ExpressionValidator.java | 2 +- .../annotations/FieldExpressionValidator.java | 2 +- .../annotations/IntRangeFieldValidator.java | 2 +- .../annotations/LongRangeFieldValidator.java | 2 +- .../annotations/RegexFieldValidator.java | 2 +- .../annotations/RequiredFieldValidator.java | 2 +- .../annotations/RequiredStringValidator.java | 2 +- .../annotations/ShortRangeFieldValidator.java | 2 +- .../StringLengthFieldValidator.java | 2 +- .../validator/annotations/UrlValidator.java | 2 +- .../annotations/ValidationParameter.java | 2 +- .../validator/annotations/Validations.java | 2 +- .../validator/annotations/ValidatorType.java | 2 +- .../annotations/VisitorFieldValidator.java | 2 +- .../validator/annotations/package.html | 0 .../apache/struts2}/validator/package.html | 0 .../ConditionalVisitorFieldValidator.java | 4 +- .../ConversionErrorFieldValidator.java | 10 +- .../validators/CreditCardValidator.java | 2 +- .../validators/DateRangeFieldValidator.java | 2 +- .../validators/DoubleRangeFieldValidator.java | 4 +- .../validator/validators/EmailValidator.java | 10 +- .../validators/ExpressionValidator.java | 4 +- .../validators/FieldExpressionValidator.java | 4 +- .../validators/FieldValidatorSupport.java | 4 +- .../validators/IntRangeFieldValidator.java | 2 +- .../validators/LongRangeFieldValidator.java | 2 +- .../validators/RangeValidatorSupport.java | 4 +- .../validators/RegexFieldValidator.java | 4 +- ...eConversionErrorFieldValidatorSupport.java | 12 +- .../validators/RequiredFieldValidator.java | 4 +- .../validators/RequiredStringValidator.java | 4 +- .../validators/ShortRangeFieldValidator.java | 2 +- .../StringLengthFieldValidator.java | 4 +- .../validator/validators/URLValidator.java | 4 +- .../validators/ValidatorSupport.java | 22 +- .../validators/VisitorFieldValidator.java | 22 +- .../validator/validators/package.html | 0 .../struts2/views/DefaultTagLibrary.java | 4 +- .../views/TagLibraryModelProvider.java | 2 +- .../views/freemarker/FreemarkerManager.java | 12 +- .../views/freemarker/FreemarkerResult.java | 10 +- .../FreemarkerThemeTemplateLoader.java | 10 +- .../views/freemarker/ScopesHashModel.java | 2 +- .../freemarker/StrutsClassTemplateLoader.java | 2 +- .../freemarker/tags/ActionErrorModel.java | 2 +- .../freemarker/tags/ActionMessageModel.java | 2 +- .../views/freemarker/tags/ActionModel.java | 2 +- .../views/freemarker/tags/AnchorModel.java | 2 +- .../views/freemarker/tags/BeanModel.java | 2 +- .../freemarker/tags/CheckboxListModel.java | 2 +- .../views/freemarker/tags/CheckboxModel.java | 2 +- .../views/freemarker/tags/ComboBoxModel.java | 2 +- .../views/freemarker/tags/ComponentModel.java | 2 +- .../views/freemarker/tags/DateModel.java | 2 +- .../freemarker/tags/DoubleSelectModel.java | 2 +- .../views/freemarker/tags/ElseIfModel.java | 2 +- .../views/freemarker/tags/ElseModel.java | 2 +- .../freemarker/tags/FieldErrorModel.java | 2 +- .../views/freemarker/tags/FileModel.java | 2 +- .../views/freemarker/tags/FormModel.java | 2 +- .../views/freemarker/tags/HeadModel.java | 2 +- .../views/freemarker/tags/HiddenModel.java | 2 +- .../views/freemarker/tags/I18nModel.java | 2 +- .../views/freemarker/tags/IfModel.java | 2 +- .../views/freemarker/tags/IncludeModel.java | 2 +- .../tags/InputTransferSelectModel.java | 2 +- .../views/freemarker/tags/IteratorModel.java | 2 +- .../views/freemarker/tags/LabelModel.java | 2 +- .../views/freemarker/tags/LinkModel.java | 2 +- .../views/freemarker/tags/OptGroupModel.java | 2 +- .../tags/OptionTransferSelectModel.java | 2 +- .../views/freemarker/tags/ParamModel.java | 2 +- .../views/freemarker/tags/PasswordModel.java | 2 +- .../views/freemarker/tags/PropertyModel.java | 2 +- .../views/freemarker/tags/PushModel.java | 2 +- .../views/freemarker/tags/RadioModel.java | 2 +- .../views/freemarker/tags/ResetModel.java | 2 +- .../views/freemarker/tags/ScriptModel.java | 2 +- .../views/freemarker/tags/SelectModel.java | 2 +- .../views/freemarker/tags/SetModel.java | 2 +- .../views/freemarker/tags/StrutsModels.java | 2 +- .../views/freemarker/tags/SubmitModel.java | 2 +- .../views/freemarker/tags/TagModel.java | 4 +- .../views/freemarker/tags/TextAreaModel.java | 2 +- .../views/freemarker/tags/TextFieldModel.java | 2 +- .../views/freemarker/tags/TextModel.java | 2 +- .../views/freemarker/tags/TokenModel.java | 2 +- .../views/freemarker/tags/URLModel.java | 2 +- .../freemarker/tags/UpDownSelectModel.java | 2 +- .../apache/struts2/views/jsp/ActionTag.java | 2 +- .../org/apache/struts2/views/jsp/BeanTag.java | 2 +- .../views/jsp/ComponentTagSupport.java | 4 +- .../org/apache/struts2/views/jsp/DateTag.java | 2 +- .../apache/struts2/views/jsp/ElseIfTag.java | 2 +- .../org/apache/struts2/views/jsp/ElseTag.java | 2 +- .../org/apache/struts2/views/jsp/I18nTag.java | 2 +- .../org/apache/struts2/views/jsp/IfTag.java | 2 +- .../apache/struts2/views/jsp/IncludeTag.java | 2 +- .../apache/struts2/views/jsp/IteratorTag.java | 2 +- .../apache/struts2/views/jsp/NumberTag.java | 2 +- .../apache/struts2/views/jsp/ParamTag.java | 2 +- .../apache/struts2/views/jsp/PropertyTag.java | 6 +- .../org/apache/struts2/views/jsp/PushTag.java | 2 +- .../org/apache/struts2/views/jsp/SetTag.java | 2 +- .../views/jsp/StrutsBodyTagSupport.java | 4 +- .../apache/struts2/views/jsp/TagUtils.java | 6 +- .../org/apache/struts2/views/jsp/TextTag.java | 2 +- .../org/apache/struts2/views/jsp/URLTag.java | 2 +- .../views/jsp/iterator/AppendIteratorTag.java | 2 +- .../views/jsp/iterator/MergeIteratorTag.java | 2 +- .../struts2/views/jsp/ui/ActionErrorTag.java | 2 +- .../views/jsp/ui/ActionMessageTag.java | 2 +- .../struts2/views/jsp/ui/AnchorTag.java | 2 +- .../struts2/views/jsp/ui/CheckboxListTag.java | 2 +- .../struts2/views/jsp/ui/CheckboxTag.java | 2 +- .../struts2/views/jsp/ui/ComboBoxTag.java | 2 +- .../struts2/views/jsp/ui/ComponentTag.java | 2 +- .../views/jsp/ui/DateTextFieldTag.java | 2 +- .../apache/struts2/views/jsp/ui/DebugTag.java | 2 +- .../struts2/views/jsp/ui/DoubleSelectTag.java | 2 +- .../struts2/views/jsp/ui/FieldErrorTag.java | 2 +- .../apache/struts2/views/jsp/ui/FileTag.java | 2 +- .../apache/struts2/views/jsp/ui/FormTag.java | 2 +- .../apache/struts2/views/jsp/ui/HeadTag.java | 2 +- .../struts2/views/jsp/ui/HiddenTag.java | 2 +- .../views/jsp/ui/InputTransferSelectTag.java | 2 +- .../apache/struts2/views/jsp/ui/LabelTag.java | 2 +- .../apache/struts2/views/jsp/ui/LinkTag.java | 2 +- .../struts2/views/jsp/ui/OptGroupTag.java | 2 +- .../views/jsp/ui/OptionTransferSelectTag.java | 2 +- .../struts2/views/jsp/ui/PasswordTag.java | 2 +- .../apache/struts2/views/jsp/ui/RadioTag.java | 2 +- .../apache/struts2/views/jsp/ui/ResetTag.java | 2 +- .../struts2/views/jsp/ui/ScriptTag.java | 2 +- .../struts2/views/jsp/ui/SelectTag.java | 2 +- .../struts2/views/jsp/ui/SubmitTag.java | 2 +- .../struts2/views/jsp/ui/TextFieldTag.java | 2 +- .../struts2/views/jsp/ui/TextareaTag.java | 2 +- .../apache/struts2/views/jsp/ui/TokenTag.java | 2 +- .../struts2/views/jsp/ui/UpDownSelectTag.java | 2 +- .../struts2/views/util/ContextUtil.java | 4 +- .../struts2/views/util/DefaultUrlHelper.java | 2 +- .../xwork2/validator/validators/default.xml | 46 ---- .../org/apache/struts2/default.properties | 8 +- .../struts2/validator/validators/default.xml | 46 ++++ .../apache/struts2}/xwork-messages.properties | 0 core/src/main/resources/struts-beans.xml | 220 +++++++++--------- core/src/main/resources/struts-default.xml | 26 +-- .../resources/struts-excluded-classes.xml | 23 +- core/src/main/resources/xwork-default.xml | 48 ++-- core/src/test/java/PackagelessAction.java | 2 +- ...onfigurationProviderOgnlAllowlistTest.java | 114 --------- .../struts2}/ActionChainResultTest.java | 2 +- .../apache/struts2}/ActionContextTest.java | 8 +- .../ActionContextThreadLocalTest.java | 2 +- .../apache/struts2}/ActionInvocationTest.java | 8 +- .../apache/struts2}/ActionNestingTest.java | 25 +- .../apache/struts2}/ActionSupportTest.java | 6 +- .../apache/struts2}/AnnotatedTestBean.java | 15 +- .../apache/struts2}/ChainResultTest.java | 8 +- .../struts2}/CompositeTextProviderTest.java | 12 +- .../struts2}/DefaultActionInvocationTest.java | 26 +-- .../struts2}/DefaultActionProxyTest.java | 6 +- .../apache/struts2}/DefaultClasstTest.java | 16 +- .../struts2}/DefaultLocaleProviderTest.java | 2 +- .../struts2}/DefaultTextProviderTest.java | 2 +- .../DefaultUnknownHandlerManagerTest.java | 6 +- .../struts2/ExecutionCountTestAction.java | 2 +- .../struts2}/ExternalReferenceAction.java | 2 +- .../xwork2 => org/apache/struts2}/Foo.java | 2 +- .../apache/struts2}/GenericsBean.java | 2 +- .../apache/struts2/HttpMethodsTestAction.java | 2 +- .../apache/struts2}/LocaleAwareTest.java | 10 +- .../apache/struts2}/LocaleProviderTest.java | 2 +- .../apache/struts2}/ModelDrivenAction.java | 2 +- .../struts2}/ModelDrivenAnnotationAction.java | 2 +- .../apache/struts2}/NestedAction.java | 4 +- .../apache/struts2}/ObjectFactoryTest.java | 7 +- .../struts2}/ProxyInvocationAction.java | 2 +- .../struts2}/ProxyInvocationInterface.java | 2 +- .../apache/struts2}/ProxyInvocationTest.java | 4 +- .../apache/struts2}/ProxyObjectFactory.java | 8 +- .../struts2/ServletActionContextTest.java | 2 +- .../apache/struts2}/SimpleAction.java | 8 +- .../struts2}/SimpleAnnotationAction.java | 28 +-- .../apache/struts2}/SimpleFooAction.java | 2 +- .../apache/struts2/StrutsExceptionTest.java | 4 +- .../struts2/StrutsInternalTestCase.java | 4 +- .../struts2/StrutsJUnit4InternalTestCase.java | 4 +- .../apache/struts2}/StubTextProvider.java | 4 +- .../apache/struts2}/StubValueStack.java | 8 +- .../java/org/apache/struts2/TestAction.java | 14 +- .../apache/struts2/TestActionTagResult.java | 4 +- .../apache/struts2}/TestBean.java | 2 +- .../apache/struts2}/TestChildBean.java | 2 +- .../struts2/TestConfigurationProvider.java | 38 +-- .../java/org/apache/struts2/TestResult.java | 8 +- .../struts2}/TextProviderSupportTest.java | 12 +- .../struts2}/UnknownHandlerManagerMock.java | 2 +- .../struts2}/UserSpecifiedDefaultAction.java | 2 +- .../struts2}/ValidationOrderAction.java | 2 +- .../apache/struts2}/VoidResult.java | 2 +- .../apache/struts2}/WildCardResultTest.java | 6 +- .../struts2/action/CspReportActionTest.java | 2 +- .../components/ActionComponentTest.java | 4 +- .../struts2/components/ComponentTest.java | 2 +- .../apache/struts2/components/DateTest.java | 6 +- .../struts2/components/FormButtonTest.java | 6 +- .../apache/struts2/components/FormTest.java | 22 +- .../components/IteratorComponentTest.java | 6 +- .../struts2/components/PropertyTest.java | 6 +- .../apache/struts2/components/UIBeanTest.java | 8 +- .../struts2/components/UIComponentTest.java | 2 +- .../config/ConfigurationManagerTest.java | 19 +- .../struts2}/config/ConfigurationTest.java | 29 ++- .../PropertiesConfigurationProviderTest.java | 6 +- .../apache/struts2/config/SettingsTest.java | 2 +- .../StrutsBeanSelectionProviderTest.java | 14 +- .../StrutsJavaConfigurationProviderTest.java | 14 +- .../config/TestBeanSelectionProvider.java | 10 +- .../apache/struts2/config/TestSettings.java | 2 +- .../config/entities/ActionConfigTest.java | 12 +- .../config/entities/AllowedMethodsTest.java | 2 +- .../config/entities/BeanConfigTest.java | 6 +- .../config/entities/ConstantConfigTest.java | 4 +- .../config/entities/PackageConfigTest.java | 6 +- .../config/impl/AbstractMatcherTest.java | 2 +- .../config/impl/ActionConfigMatcherTest.java | 42 ++-- .../config/impl/NamespaceMatcherTest.java | 4 +- ...onfigurationProviderOgnlAllowlistTest.java | 114 +++++++++ .../providers/ConfigurationTestBase.java | 8 +- .../providers/EnvsValueSubstitutorTest.java | 2 +- .../providers/InterceptorBuilderTest.java | 34 +-- .../providers/InterceptorForTestPurpose.java | 6 +- .../providers/MockConfigurationProvider.java | 44 ++-- .../providers/NoNoArgsConstructorAction.java | 6 +- .../providers/PrivateConstructorAction.java | 4 +- .../config/providers/SomeUnknownHandler.java | 10 +- .../XmlConfigurationProviderActionsTest.java | 53 +++-- ...nfigurationProviderAllowedMethodsTest.java | 14 +- ...igurationProviderEnvsSubstitutionTest.java | 4 +- ...gurationProviderExceptionMappingsTest.java | 24 +- ...onProviderGlobalResultInheritenceTest.java | 16 +- ...roviderInterceptorParamOverridingTest.java | 22 +- ...erInterceptorStackParamOverridingTest.java | 22 +- ...urationProviderInterceptorsSpringTest.java | 14 +- ...ConfigurationProviderInterceptorsTest.java | 36 +-- ...lConfigurationProviderInvalidFileTest.java | 8 +- ...mlConfigurationProviderMultilevelTest.java | 16 +- .../XmlConfigurationProviderPackagesTest.java | 14 +- ...lConfigurationProviderResultTypesTest.java | 54 ++--- .../XmlConfigurationProviderResultsTest.java | 50 ++-- .../XmlConfigurationProviderTest.java | 64 ++--- ...rationProviderUnknownHandlerStackTest.java | 16 +- ...figurationProviderWildCardIncludeTest.java | 14 +- .../config/providers/XmlHelperTest.java | 22 +- .../conversion/ConversionTestAction.java | 14 +- .../impl/AnnotationXWorkConverterTest.java | 34 ++- .../conversion/impl/DateConverterTest.java | 16 +- .../conversion/impl/FooBarConverter.java | 14 +- .../conversion/impl/FooNumberConverter.java | 2 +- .../impl/InstantiatingNullHandlerTest.java | 2 +- .../conversion/impl/NumberConverterTest.java | 6 +- .../struts2}/conversion/impl/ParentClass.java | 2 +- .../conversion/impl/StringConverterTest.java | 2 +- .../impl/XWorkBasicConverterTest.java | 40 ++-- .../conversion/impl/XWorkConverterTest.java | 55 +++-- .../conversion/impl/XWorkListTest.java | 4 +- .../struts2/dispatcher/DispatcherTest.java | 32 +-- .../struts2/dispatcher/NullActionMapper.java | 2 +- .../dispatcher/PrepareOperationsTest.java | 4 +- ...repareAndExecuteFilterIntegrationTest.java | 2 +- .../dispatcher/TwoFilterIntegrationTest.java | 2 +- .../mapper/CompositeActionMapperTest.java | 14 +- .../mapper/DefaultActionMapperTest.java | 74 +++--- .../mapper/Restful2ActionMapperTest.java | 10 +- .../PrefixBasedActionProxyFactoryTest.java | 24 +- .../factory/StrutsResultFactoryTest.java | 11 +- .../struts2}/inject/ContainerImplTest.java | 2 +- .../inject/EarlyInitializableBean.java | 2 +- .../struts2}/inject/InitializableBean.java | 2 +- .../ActionFileUploadInterceptorTest.java | 14 +- ...ctionMappingParametersInterceptorTest.java | 8 +- .../interceptor/AliasInterceptorTest.java | 30 +-- .../interceptor/ChainingInterceptorTest.java | 30 +-- .../ChainingInterceptorWithConfigTest.java | 42 ++-- .../interceptor/CheckboxInterceptorTest.java | 6 +- .../ClearSessionInterceptorTest.java | 4 +- .../interceptor/CoepInterceptorTest.java | 4 +- .../ConversionErrorInterceptorTest.java | 18 +- .../interceptor/CookieInterceptorTest.java | 14 +- .../CookieProviderInterceptorTest.java | 4 +- .../interceptor/CoopInterceptorTest.java | 4 +- .../CreateSessionInterceptorTest.java | 4 +- .../interceptor/CspInterceptorTest.java | 6 +- .../DateTextFieldInterceptorTest.java | 4 +- .../DefaultWorkflowInterceptorTest.java | 56 +++-- .../ExceptionMappingInterceptorTest.java | 31 +-- .../ExecuteAndWaitDelayAction.java | 2 +- .../ExecuteAndWaitInterceptorTest.java | 34 +-- .../FetchMetadataInterceptorTest.java | 19 +- .../interceptor/I18nInterceptorTest.java | 12 +- .../MessageStoreInterceptorTest.java | 8 +- .../MessageStorePreResultListenerTest.java | 16 +- .../MethodFilterInterceptorUtilTest.java | 12 +- .../ModelDrivenInterceptorTest.java | 16 +- .../MultiselectInterceptorTest.java | 4 +- .../ParameterRemoverInterceptorTest.java | 15 +- .../interceptor/PreResultListenerTest.java | 29 ++- .../PrefixMethodInvocationUtilTest.java | 166 ++++++------- .../interceptor/PrepareInterceptorTest.java | 131 ++++++----- .../ScopedModelDrivenInterceptorTest.java | 30 +-- .../ServletConfigInterceptorTest.java | 6 +- .../StaticParametersInterceptorTest.java | 16 +- .../StrutsConversionErrorInterceptorTest.java | 12 +- .../interceptor/TokenInterceptorTest.java | 8 +- .../TokenSessionStoreInterceptorTest.java | 4 +- .../interceptor/ValidationErrorAwareTest.java | 24 +- ...InterceptorPrefixMethodInvocationTest.java | 24 +- .../annotations/AnnotatedAction.java | 10 +- .../AnnotationWorkflowInterceptorTest.java | 36 +-- .../annotations/BaseAnnotatedAction.java | 4 +- .../annotations/InterfaceAnnotatedAction.java | 2 +- .../annotations/ShortcircuitedAction.java | 8 +- .../exec/StrutsBackgroundProcessTest.java | 7 +- .../httpmethod/HttpMethodInterceptorTest.java | 6 +- .../parameter/ParametersInterceptorTest.java | 48 ++-- .../StrutsParameterAnnotationTest.java | 4 +- .../AnnotationValidationInterceptorTest.java | 8 +- .../struts2}/mock/DummyTextProvider.java | 6 +- .../struts2}/mock/InjectableAction.java | 6 +- .../struts2}/mock/MockLazyInterceptor.java | 13 +- .../apache/struts2}/ognl/MyCustomMap.java | 2 +- .../ognl/OgnlSetPossiblePropertyTest.java | 6 +- .../struts2}/ognl/OgnlUtilStrutsTest.java | 4 +- .../apache/struts2}/ognl/OgnlUtilTest.java | 103 ++++---- .../struts2}/ognl/OgnlValueStackTest.java | 110 ++++----- .../ognl/SecurityMemberAccessTest.java | 12 +- .../struts2}/ognl/SetPropertiesTest.java | 40 ++-- .../struts2/ognl/StrutsOgnlGuardTest.java | 2 +- .../XWorkListPropertyAccessorTest.java | 12 +- .../XWorkMapPropertyAccessorTest.java | 12 +- .../struts2/result/HttpHeaderResultTest.java | 16 +- .../struts2/result/PlainResultTest.java | 6 +- .../struts2/result/PlainTextResultTest.java | 10 +- .../struts2/result/PostbackResultTest.java | 10 +- .../ServletActionRedirectResultTest.java | 14 +- .../result/ServletDispatcherResultTest.java | 6 +- .../result/ServletRedirectResultTest.java | 18 +- .../struts2/result/StreamResultTest.java | 16 +- .../result/StrutsResultSupportTest.java | 8 +- .../DefaultAcceptedPatternsCheckerTest.java | 4 +- .../DefaultExcludedPatternsCheckerTest.java | 8 +- ...otExcludedAcceptedPatternsCheckerTest.java | 4 +- .../struts2}/test/AnnotationDataAware.java | 14 +- .../struts2}/test/AnnotationDataAware2.java | 4 +- .../struts2}/test/AnnotationTestBean2.java | 14 +- .../apache/struts2}/test/AnnotationUser.java | 20 +- .../struts2}/test/AnnotationUserMarker.java | 8 +- .../apache/struts2}/test/DataAware.java | 4 +- .../apache/struts2}/test/DataAware2.java | 2 +- .../apache/struts2}/test/Equidae.java | 2 +- .../struts2}/test/ModelDrivenAction2.java | 4 +- .../test/ModelDrivenAnnotationAction2.java | 4 +- .../apache/struts2}/test/SimpleAction2.java | 4 +- .../apache/struts2}/test/SimpleAction3.java | 6 +- .../test/SimpleAnnotationAction2.java | 8 +- .../test/SimpleAnnotationAction3.java | 6 +- .../apache/struts2}/test/TestArrayBean.java | 2 +- .../apache/struts2}/test/TestBean2.java | 8 +- .../apache/struts2}/test/User.java | 2 +- .../apache/struts2}/test/UserMarker.java | 2 +- .../struts2}/test/annotations/Address.java | 2 +- .../annotations/AddressTypeConverter.java | 4 +- .../struts2}/test/annotations/Person.java | 10 +- .../test/annotations/PersonAction.java | 18 +- .../test/annotations/PersonActionTest.java | 22 +- .../test/annotations/PersonTypeConverter.java | 4 +- .../ValidateAnnotatedMethodOnlyAction.java | 6 +- .../test/subtest/NullModelDrivenAction.java | 4 +- .../{ => test}/util/StrutsUtilTest.java | 8 +- .../apache/struts2}/util/Animal.java | 2 +- .../apache/struts2}/util/AnnotatedCat.java | 6 +- .../struts2}/util/AnnotationUtilsTest.java | 14 +- .../apache/struts2}/util/Bar.java | 4 +- .../apache/struts2}/util/BarJunior.java | 2 +- .../apache/struts2}/util/Cat.java | 2 +- .../struts2}/util/ClassLoaderUtilTest.java | 14 +- .../struts2}/util/ClassPathFinderTest.java | 32 +-- .../struts2}/util/DefaultFileManagerTest.java | 8 +- .../apache/struts2}/util/Dog.java | 4 +- .../apache/struts2}/util/DomHelperTest.java | 4 +- .../struts2}/util/DummyObjectFactory.java | 4 +- .../apache/struts2}/util/Foo.java | 19 +- .../apache/struts2}/util/FurColor.java | 2 +- .../struts2}/util/GetPropertiesTest.java | 10 +- .../apache/struts2}/util/Indexed.java | 2 +- .../util/InvocationSessionStoreTest.java | 8 +- .../apache/struts2}/util/ListHolder.java | 2 +- .../apache/struts2}/util/MyBean.java | 2 +- .../apache/struts2}/util/MyBeanAction.java | 11 +- .../struts2}/util/MyBeanActionTest.java | 10 +- .../apache/struts2}/util/MyNumber.java | 2 +- .../util/NamedVariablePatternMatcherTest.java | 4 +- .../apache/struts2}/util/Owner.java | 2 +- .../struts2}/util/ResolverUtilTest.java | 24 +- .../SecurityMemberAccessInServletsTest.java | 2 +- .../util/StrutsLocalizedTextProviderTest.java | 92 ++++---- .../struts2}/util/TextParseUtilTest.java | 6 +- .../apache/struts2}/util/Tiger.java | 2 +- .../apache/struts2/util/TokenHelperTest.java | 2 +- .../util/UnknownHandlerManagerTest.java | 22 +- .../apache/struts2}/util/UrlUtilTest2.java | 6 +- .../struts2}/util/WildcardHelperTest.java | 14 +- .../struts2}/util/WildcardUtilTest.java | 14 +- .../struts2}/util/annotation/Dummy2Class.java | 2 +- .../struts2}/util/annotation/Dummy3Class.java | 6 +- .../struts2}/util/annotation/DummyClass.java | 4 +- .../util/annotation/DummyClassExt.java | 2 +- .../util/annotation/MyAnnotation.java | 2 +- .../util/annotation/MyAnnotation2.java | 2 +- .../util/annotation/package-info.java | 2 +- .../pkg1/AbstractAbstractDummyAction.java | 4 +- .../annotation/pkg1/AbstractDummyAction.java | 2 +- .../pkg2/Package2DummyInterface.java | 4 +- .../util/annotation/pkg2/package-info.java | 4 +- .../fs/DefaultFileManagerFactoryTest.java | 10 +- .../util/fs/JarEntryRevisionTest.java | 22 +- .../util/location/LocationAttributesTest.java | 12 +- .../util/location/LocationImplTest.java | 36 +-- .../util/location/LocationUtilsTest.java | 18 +- .../validator/ActionValidatorManagerTest.java | 18 +- .../AnnotationActionValidatorManagerTest.java | 86 +++---- .../validator/AnnotationValidationAction.java | 42 ++-- ...ionValidationConfigurationBuilderTest.java | 66 +++--- .../AnnotationValidationExpAction.java | 40 ++-- .../ConversionErrorFieldValidatorTest.java | 20 +- .../validator/DateRangeValidatorTest.java | 14 +- .../DefaultActionValidatorManagerTest.java | 55 ++--- .../DefaultValidatorFactoryTest.java | 4 +- .../DefaultValidatorFileParserTest.java | 22 +- .../DoubleRangeFieldValidatorTest.java | 26 +-- .../validator/DummyValidatorContext.java | 4 +- .../validator/EmailValidatorTest.java | 16 +- .../validator/ExpressionValidatorTest.java | 19 +- .../validator/IntRangeValidatorTest.java | 14 +- .../validator/LongRangeValidatorTest.java | 14 +- .../validator/ModelDrivenValidationTest.java | 16 +- .../struts2}/validator/MyValidator.java | 4 +- .../validator/RegexFieldValidatorTest.java | 13 +- ...versionErrorFieldValidatorSupportTest.java | 72 +++--- .../validator/ShortRangeValidatorTest.java | 14 +- .../validator/SimpleActionValidationTest.java | 30 +-- .../StringLengthFieldValidatorTest.java | 16 +- .../validator/StringValidatorTest.java | 26 +-- .../struts2}/validator/URLValidatorTest.java | 12 +- .../validator/ValidatorAnnotationTest.java | 12 +- .../VisitorFieldValidatorModelTest.java | 22 +- .../validator/VisitorFieldValidatorTest.java | 20 +- .../VisitorValidatorModelAction.java | 4 +- .../validator/VisitorValidatorTestAction.java | 6 +- .../AppendingValidatorContextTest.java | 18 +- .../validators/CreditCardValidatorTest.java | 12 +- .../DateRangeFieldValidatorTest.java | 18 +- .../IntRangeFieldValidatorTest.java | 16 +- .../LongRangeFieldValidatorTest.java | 16 +- .../RequiredFieldValidatorTest.java | 10 +- .../RequiredStringValidatorTest.java | 18 +- .../ShortRangeFieldValidatorTest.java | 16 +- .../validators/ValidationAction.java | 2 +- .../validators/ValidatorSupportTest.java | 12 +- .../views/TemplateEngineManagerTest.java | 10 +- .../freemarker/FreeMarkerResultTest.java | 10 +- .../freemarker/FreemarkerManagerTest.java | 8 +- .../FreemarkerResultMockedTest.java | 8 +- .../views/freemarker/FreemarkerTest.java | 2 +- .../struts2/views/freemarker/TestAction.java | 2 +- .../views/freemarker/tags/TagModelTest.java | 6 +- .../struts2/views/jsp/AbstractTagTest.java | 18 +- .../struts2/views/jsp/AbstractUITagTest.java | 2 +- .../struts2/views/jsp/ActionTagTest.java | 10 +- .../views/jsp/AppendIteratorTagTest.java | 4 +- .../apache/struts2/views/jsp/BeanTagTest.java | 6 +- .../struts2/views/jsp/ElseIfTagTest.java | 10 +- .../apache/struts2/views/jsp/ElseTagTest.java | 10 +- .../apache/struts2/views/jsp/I18nTagTest.java | 10 +- .../apache/struts2/views/jsp/IfTagTest.java | 10 +- .../views/jsp/IteratorGeneratorTagTest.java | 4 +- .../views/jsp/MergeIteratorTagTest.java | 4 +- .../struts2/views/jsp/NumberTagTest.java | 2 +- .../struts2/views/jsp/PropertyTagTest.java | 154 ++++++------ .../views/jsp/SortIteratorTagTest.java | 4 +- .../views/jsp/SubsetIteratorTagTest.java | 4 +- .../apache/struts2/views/jsp/TextTagTest.java | 8 +- .../apache/struts2/views/jsp/URLTagTest.java | 10 +- .../views/jsp/ui/ActionErrorTagTest.java | 4 +- .../views/jsp/ui/ActionMessageTagTest.java | 4 +- .../struts2/views/jsp/ui/CheckboxTest.java | 11 +- .../struts2/views/jsp/ui/DateTagTest.java | 2 +- .../struts2/views/jsp/ui/DebugTagTest.java | 6 +- .../views/jsp/ui/DoubleValidationAction.java | 2 +- .../views/jsp/ui/FieldErrorTagTest.java | 4 +- .../struts2/views/jsp/ui/FormTagTest.java | 10 +- .../struts2/views/jsp/ui/HiddenTest.java | 4 +- .../views/jsp/ui/IntValidationAction.java | 2 +- .../views/jsp/ui/LocaleTestAction.java | 2 +- .../struts2/views/jsp/ui/SubmitTest.java | 2 +- .../struts2/views/jsp/ui/TestAction1.java | 2 +- .../views/jsp/ui/UpDownSelectTagTest.java | 4 +- .../views/util/DefaultUrlHelperTest.java | 6 +- .../test/ExternalSecurityMemberAccess.java | 4 +- .../ExternalSecurityMemberAccessTest.java | 6 +- .../xwork2/validator/validators-fail.xml | 41 ---- core/src/test/resources/includeTest.xml | 2 +- core/src/test/resources/my-validators.xml | 2 +- .../src/test/resources/myOther-validators.xml | 2 +- ...nSupportTest$MyActionSupport_da.properties | 0 .../struts2}/AnnotatedTestBean.properties | 0 .../DefaultTextProviderTest_en_CA.properties | 0 .../struts2}/ModelDrivenAction-validation.xml | 0 .../struts2}/ModelDrivenAction.properties | 0 .../ModelDrivenAnnotationAction.properties | 0 .../SimpleAction-some-alias-validation.xml | 0 .../SimpleAction-subproperty-validation.xml | 0 .../struts2}/SimpleAction-validation.xml | 0 ...impleAction-validationAlias-validation.xml | 0 .../apache/struts2}/SimpleAction.properties | 0 .../struts2}/SimpleAction_de.properties | 0 .../struts2}/SimpleAction_en.properties | 0 .../SimpleAnnotationAction.properties | 0 .../SimpleAnnotationAction_de.properties | 0 .../SimpleAnnotationAction_en.properties | 0 .../TestBean-anotherContext-validation.xml | 0 .../struts2}/TestBean-badtest-validation.xml | 0 .../TestBean-beanMessageBundle-validation.xml | 0 ...stBean-expressionValidation-validation.xml | 0 .../apache/struts2}/TestBean-validation.xml | 0 ...Bean-visitorChildValidation-validation.xml | 0 .../TestBean-visitorValidation-validation.xml | 0 .../apache/struts2}/TestBean.properties | 0 .../struts2}/TestChildBean-validation.xml | 0 .../TextProviderSupportTest_en.properties | 0 .../ValidationOrderAction-validation.xml | 0 .../loadorder1/xwork-test-load-order.xml | 0 .../loadorder2/xwork-test-load-order.xml | 0 .../loadorder3/xwork-test-load-order.xml | 0 .../struts2}/config/providers/xwork- test.xml | 20 +- .../xwork-include-after-package-2.xml | 2 +- .../providers/xwork-include-after-package.xml | 6 +- .../xwork-include-before-package-2.xml | 2 +- .../xwork-include-before-package.xml | 6 +- .../config/providers/xwork-include-parent.xml | 6 +- .../providers/xwork-test-action-invalid.xml | 8 +- ...rk-test-actions-packagedefaultclassref.xml | 14 +- .../config/providers/xwork-test-actions.xml | 20 +- .../providers/xwork-test-allowed-methods.xml | 0 .../providers/xwork-test-allowlist-2.xml | 4 +- .../config/providers/xwork-test-allowlist.xml | 6 +- .../providers/xwork-test-bad-inheritance.xml | 0 .../providers/xwork-test-basic-packages.xml | 0 .../providers/xwork-test-default-package.xml | 0 .../xwork-test-defaultclassref-package.xml | 2 +- .../xwork-test-envs-substitution.xml | 0 .../xwork-test-exception-mappings.xml | 10 +- .../xwork-test-global-result-inheritence.xml | 4 +- .../providers/xwork-test-include-wildcard.xml | 2 +- .../xwork-test-interceptor-defaultref.xml | 10 +- .../xwork-test-interceptor-inheritance.xml | 0 ...work-test-interceptor-param-overriding.xml | 8 +- .../xwork-test-interceptor-params.xml | 6 +- ...est-interceptor-stack-param-overriding.xml | 8 +- .../xwork-test-interceptors-basic.xml | 4 +- .../xwork-test-interceptors-spring.xml | 0 .../providers/xwork-test-invalid-file.xml | 2 +- .../providers/xwork-test-multilevel.xml | 10 +- .../xwork-test-package-extends-final.xml | 6 +- .../providers/xwork-test-package-final.xml | 6 +- .../xwork-test-package-inheritance.xml | 10 +- .../config/providers/xwork-test-reload.xml | 0 .../xwork-test-result-inheritance.xml | 8 +- .../providers/xwork-test-result-names.xml | 2 +- .../providers/xwork-test-result-types.xml | 8 +- .../config/providers/xwork-test-results.xml | 6 +- .../providers/xwork-test-wildcard-1.xml | 0 .../providers/xwork-test-wildcard-2.xml | 0 .../providers/xwork-test-wildcard-include.xml | 2 +- .../xwork-unknownhandler-stack-empty.xml | 4 +- .../providers/xwork-unknownhandler-stack.xml | 4 +- .../impl/test-struts-conversion.properties | 2 +- .../apache/struts2}/somefile.txt | 0 .../apache/struts2}/test.properties | 0 .../test/DataAware-conversion.properties | 2 +- .../struts2}/test/DataAware-validation.xml | 0 .../DataAware-validationAlias-validation.xml | 0 .../apache/struts2}/test/DataAware.properties | 0 .../struts2}/test/DataAware2-validation.xml | 0 .../struts2}/test/Equidae-validation.xml | 0 .../test/SimpleAction2-validation.xml | 0 ...mpleAction2-validationAlias-validation.xml | 0 .../test/TestBean2-conversion.properties | 2 +- .../struts2}/test/User-conversion.properties | 0 .../apache/struts2}/test/User-validation.xml | 0 .../struts2}/test/UserMarker-validation.xml | 0 .../apache/struts2}/test/package.properties | 0 .../apache/struts2}/util/Bar.properties | 0 .../struts2}/util/Cat-conversion.properties | 4 +- .../apache/struts2}/util/FindMe.properties | 0 .../struts2}/util/Foo-conversion.properties | 16 +- .../util/ListHolder-conversion.properties | 0 .../util/LocalizedTextUtilTest.properties | 0 .../util/MyBeanAction-conversion.properties | 4 +- .../struts2}/util/Tiger-conversion.properties | 2 +- .../apache/struts2}/util/XW404_de.properties | 0 .../apache/struts2}/util/XW404_fr.properties | 0 .../util/location/xml-with-location.xml | 0 ...TextProviderTestResourceBundle1.properties | 0 ...TextProviderTestResourceBundle2.properties | 0 ...VisitorValidatorModelAction-validation.xml | 0 ...estAction-beanMessageBundle-validation.xml | 0 ...torTestAction-validateArray-validation.xml | 0 ...atorTestAction-validateList-validation.xml | 0 .../VisitorValidatorTestAction-validation.xml | 0 ...tion-visitorChildValidation-validation.xml | 0 ...estAction-visitorValidation-validation.xml | 0 ...tion-visitorValidationAlias-validation.xml | 0 .../VisitorValidatorTestAction.properties | 0 .../validator/validator-parser-test.xml | 0 .../validator/validator-parser-test2.xml | 0 .../validator/validator-parser-test3.xml | 0 .../validator/validator-parser-test4.xml | 0 .../validator/validator-parser-test5.xml | 0 .../validator/validator-parser-test6.xml | 0 .../struts2/validator/validators-fail.xml | 41 ++++ .../struts-object-factory-result-builder.xml | 2 +- core/src/test/resources/struts-testing.xml | 6 +- core/src/test/resources/struts.xml | 24 +- core/src/test/resources/validators.xml | 34 +-- core/src/test/resources/xwork - jar.jar | Bin 2063 -> 2042 bytes core/src/test/resources/xwork - zip.zip | Bin 2572 -> 2653 bytes core/src/test/resources/xwork-jar.jar | Bin 2059 -> 2026 bytes core/src/test/resources/xwork-proxyinvoke.xml | 26 +-- core/src/test/resources/xwork-sample.xml | 68 +++--- core/src/test/resources/xwork-test-beans.xml | 2 +- .../src/test/resources/xwork-test-default.xml | 22 +- .../test/resources/xwork-test-validation.xml | 24 +- core/src/test/resources/xwork-zip.zip | Bin 2564 -> 2645 bytes .../struts2/async/DefaultAsyncManager.java | 2 +- .../src/main/resources/struts-plugin.xml | 2 +- .../async/DefaultAsyncManagerTest.java | 2 +- .../BeanValidationInterceptor.java | 16 +- .../DefaultBeanValidationManager.java | 4 +- .../BeanValidationInterceptorTest.java | 8 +- .../struts/beanvalidation/VoidResult.java | 4 +- .../beanvalidation/actions/FieldAction.java | 2 +- .../actions/FieldActionDoExecute.java | 4 +- .../actions/FieldMatchAction.java | 2 +- .../actions/ModelDrivenAction.java | 4 +- .../actions/ValidateGroupAction.java | 4 +- .../apache/struts2/cdi/CdiObjectFactory.java | 4 +- .../cdi/src/main/resources/struts-plugin.xml | 2 +- .../config_browser/ActionNamesAction.java | 6 +- .../config_browser/ConfigurationHelper.java | 14 +- .../config_browser/ListValidatorsAction.java | 12 +- .../config_browser/ShowBeansAction.java | 12 +- .../config_browser/ShowConfigAction.java | 8 +- .../config_browser/ShowConstantsAction.java | 4 +- .../config_browser/ShowJarsAction.java | 2 +- .../config_browser/ShowValidatorAction.java | 10 +- .../convention/AbstractActionNameBuilder.java | 4 +- .../ClasspathConfigurationProvider.java | 14 +- .../convention/ClasspathPackageProvider.java | 10 +- .../convention/ConventionUnknownHandler.java | 18 +- .../convention/ConventionsService.java | 6 +- .../convention/ConventionsServiceImpl.java | 14 +- .../convention/DefaultActionNameBuilder.java | 2 +- .../convention/DefaultClassFinder.java | 12 +- .../DefaultInterceptorMapBuilder.java | 14 +- .../convention/DefaultResultMapBuilder.java | 24 +- .../convention/InterceptorMapBuilder.java | 4 +- .../PackageBasedActionConfigBuilder.java | 56 ++--- .../struts2/convention/ResultMapBuilder.java | 4 +- .../convention/SEOActionNameBuilder.java | 2 +- .../struts2/convention/StringTools.java | 2 +- .../convention/annotation/AllowedMethods.java | 2 +- .../struts2/convention/annotation/Result.java | 2 +- .../src/main/resources/struts-plugin.xml | 6 +- .../src/test/java/actions/MessageAction.java | 2 +- .../ConventionUnknownHandlerTest.java | 12 +- .../DefaultResultMapBuilderTest.java | 8 +- .../PackageBasedActionConfigBuilderTest.java | 50 ++-- .../struts2/convention/TestInterceptor.java | 4 +- .../struts2/convention/actions/Skip.java | 2 +- .../convention/actions/action/TestBase.java | 2 +- .../SingleActionNameAction2.java | 2 +- .../struts2/convention/actions/idx/Index.java | 2 +- .../convention/actions/idx/idx2/Index.java | 2 +- .../result/InheritedResultTestBase.java | 2 +- .../convention/actions/skip/Index.java | 2 +- .../jasperreports/JasperReportsResult.java | 8 +- .../jasperreports/ValueStackDataSource.java | 2 +- .../jasperreports/ValueStackShadowMap.java | 2 +- .../JasperReportsResultTest.java | 10 +- .../views/java/JavaTemplateEngine.java | 8 +- .../views/java/simple/AbstractTagHandler.java | 4 +- .../java/simple/CheckboxListHandler.java | 8 +- .../views/java/simple/RadioHandler.java | 8 +- .../views/java/simple/SelectHandler.java | 8 +- .../views/java/simple/AbstractTest.java | 12 +- .../struts2/views/java/simple/AnchorTest.java | 2 +- .../views/java/simple/CheckboxTest.java | 2 +- .../struts2/views/java/simple/LinkTest.java | 2 +- .../struts2/views/java/simple/ScriptTest.java | 4 +- .../struts2/views/java/simple/TokenTest.java | 2 +- .../struts2/dispatcher/ChartResult.java | 14 +- .../struts2/dispatcher/ChartResultTest.java | 8 +- .../struts2/json/DefaultJSONWriter.java | 8 +- .../org/apache/struts2/json/JSONCleaner.java | 6 +- .../apache/struts2/json/JSONInterceptor.java | 36 +-- .../org/apache/struts2/json/JSONResult.java | 14 +- .../org/apache/struts2/json/JSONUtil.java | 30 +-- .../json/JSONValidationInterceptor.java | 10 +- .../apache/struts2/json/smd/SMDGenerator.java | 4 +- .../json/JSONActionRedirectResultTest.java | 10 +- .../struts2/json/JSONInterceptorTest.java | 6 +- .../apache/struts2/json/JSONResultTest.java | 8 +- .../json/JSONValidationInterceptorTest.java | 20 +- .../org/apache/struts2/json/TestAction.java | 4 +- .../struts2/junit/StrutsJUnit4TestCase.java | 14 +- .../struts2/junit/StrutsRestTestCase.java | 8 +- .../apache/struts2/junit/StrutsTestCase.java | 12 +- .../struts2/junit/XWorkJUnit4TestCase.java | 2 +- .../apache/struts2/junit/JUnitTestAction.java | 2 +- .../junit/StrutsJUnit4TestCaseTest.java | 2 +- .../junit/StrutsSpringJUnit4TestCaseTest.java | 4 +- .../struts2/junit/StrutsTestCaseTest.java | 4 +- .../junit/session/SessionGetAction.java | 2 +- .../junit/session/SessionSetAction.java | 4 +- .../rest/ContentTypeHandlerManager.java | 2 +- .../struts2/rest/ContentTypeInterceptor.java | 8 +- .../DefaultContentTypeHandlerManager.java | 8 +- .../struts2/rest/RestActionInvocation.java | 14 +- .../apache/struts2/rest/RestActionMapper.java | 44 ++-- .../struts2/rest/RestActionProxyFactory.java | 8 +- .../struts2/rest/RestActionSupport.java | 30 +-- .../struts2/rest/RestWorkflowInterceptor.java | 14 +- .../rest/handler/ContentTypeHandler.java | 2 +- .../rest/handler/FormUrlEncodedHandler.java | 2 +- .../struts2/rest/handler/HtmlHandler.java | 2 +- .../rest/handler/JacksonJsonHandler.java | 4 +- .../rest/handler/JacksonXmlHandler.java | 2 +- .../rest/handler/JuneauXmlHandler.java | 2 +- .../handler/MultipartFormDataHandler.java | 2 +- .../struts2/rest/handler/XStreamHandler.java | 4 +- .../rest/src/main/resources/struts-plugin.xml | 2 +- .../rest/ContentTypeHandlerManagerTest.java | 12 +- .../rest/ContentTypeInterceptorTest.java | 8 +- .../DefaultContentTypeHandlerManagerTest.java | 8 +- .../rest/RestActionInvocationTest.java | 30 +-- .../struts2/rest/RestActionMapperTest.java | 22 +- .../rest/RestWorkflowInterceptorTest.java | 8 +- .../rest/handler/JacksonJsonHandlerTest.java | 2 +- .../rest/handler/JacksonXmlHandlerTest.java | 8 +- .../rest/handler/JuneauXmlHandlerTest.java | 9 +- .../rest/handler/XStreamHandlerTest.java | 10 +- .../sitemesh/FreemarkerDecoratorServlet.java | 2 +- .../sitemesh/FreemarkerPageFilter.java | 2 +- .../OldDecorator2NewStrutsDecorator.java | 18 +- ...ecorator2NewStrutsFreemarkerDecorator.java | 2 +- ...dDecorator2NewStrutsVelocityDecorator.java | 4 +- .../sitemesh/StrutsSiteMeshFactory.java | 2 +- .../sitemesh/VelocityDecoratorServlet.java | 2 +- .../struts2/sitemesh/VelocityPageFilter.java | 2 +- ...lassReloadingXMLWebApplicationContext.java | 6 +- .../struts2}/spring/SpringObjectFactory.java | 9 +- .../spring/SpringProxyableObjectFactory.java | 2 +- .../spring/StrutsSpringObjectFactory.java | 10 +- .../ActionAutowiringInterceptor.java | 10 +- .../src/main/resources/struts-plugin.xml | 21 +- .../test/SecurityMemberAccessProxyTest.java | 22 -- .../apache/struts2}/ModelDrivenAction.java | 2 +- .../apache/struts2}/SimpleAction.java | 29 ++- .../apache/struts2}/TestBean.java | 4 +- .../apache/struts2}/TestChildBean.java | 2 +- .../apache/struts2}/TestSubBean.java | 2 +- .../struts2}/mock/DummyTextProvider.java | 6 +- .../ognl/SecurityMemberAccessProxyTest.java | 10 +- .../spring/ActionsFromSpringTest.java | 22 +- .../struts2}/spring/ExecuteInterceptor.java | 6 +- .../spring/SpringObjectFactoryTest.java | 56 ++--- .../struts2}/spring/SpringProxyUtilTest.java | 20 +- .../apache/struts2}/spring/SpringResult.java | 6 +- .../spring/StrutsSpringObjectFactoryTest.java | 6 +- .../apache/struts2}/spring/TestAspect.java | 2 +- .../ActionAutowiringInterceptorTest.java | 18 +- .../interceptor/TestActionInvocation.java | 8 +- .../xwork2/spring/actionContext-spring.xml | 95 -------- .../xwork2/spring/emptyContext-spring.xml | 25 -- .../struts2/spring/actionContext-spring.xml | 111 +++++++++ .../struts2}/spring/actionContext-xwork.xml | 32 +-- ...ionContext.xml => emptyContext-spring.xml} | 0 .../struts2/testng/TestNGStrutsTestCase.java | 2 +- .../struts2/testng/TestNGXWorkTestCase.java | 14 +- .../testng/TestNGStrutsTestCaseTest.java | 2 +- .../testng/TestNGXWorkTestCaseTest.java | 2 +- .../struts2/tiles/I18NAttributeEvaluator.java | 8 +- .../tiles/StrutsAttributeEvaluator.java | 6 +- .../StrutsFreeMarkerAttributeRenderer.java | 8 +- .../struts2/tiles/StrutsPreparerFactory.java | 4 +- .../tiles/StrutsTilesContainerFactory.java | 2 +- .../tiles/StrutsTilesLocaleResolver.java | 6 +- ...rutsWildcardServletApplicationContext.java | 6 +- .../struts2/views/tiles/TilesResult.java | 2 +- .../java/org/apache/tiles/api/Attribute.java | 2 +- .../views/velocity/StrutsResourceLoader.java | 2 +- .../views/velocity/StrutsVelocityContext.java | 2 +- .../views/velocity/StrutsVelocityManager.java | 8 +- .../VelocityBeanSelectionProvider.java | 6 +- .../views/velocity/VelocityManager.java | 2 +- .../views/velocity/VelocityStrutsUtil.java | 2 +- .../struts2/views/velocity/VelocityTools.java | 2 +- .../components/AbstractDirective.java | 5 +- .../velocity/components/ActionDirective.java | 2 +- .../components/ActionErrorDirective.java | 2 +- .../components/ActionMessageDirective.java | 2 +- .../velocity/components/AnchorDirective.java | 2 +- .../velocity/components/BeanDirective.java | 2 +- .../components/CheckBoxDirective.java | 2 +- .../components/CheckBoxListDirective.java | 2 +- .../components/ComboBoxDirective.java | 2 +- .../components/ComponentDirective.java | 2 +- .../velocity/components/DateDirective.java | 2 +- .../components/DoubleSelectDirective.java | 2 +- .../components/FieldErrorDirective.java | 2 +- .../velocity/components/FileDirective.java | 2 +- .../velocity/components/FormDirective.java | 2 +- .../velocity/components/HeadDirective.java | 2 +- .../velocity/components/HiddenDirective.java | 2 +- .../velocity/components/I18nDirective.java | 2 +- .../velocity/components/IncludeDirective.java | 2 +- .../InputTransferSelectDirective.java | 2 +- .../velocity/components/LabelDirective.java | 2 +- .../components/OptGroupDirective.java | 2 +- .../OptionTransferSelectDirective.java | 2 +- .../velocity/components/ParamDirective.java | 2 +- .../components/PasswordDirective.java | 2 +- .../components/PropertyDirective.java | 2 +- .../velocity/components/PushDirective.java | 2 +- .../velocity/components/RadioDirective.java | 2 +- .../velocity/components/ResetDirective.java | 2 +- .../velocity/components/SelectDirective.java | 2 +- .../velocity/components/SetDirective.java | 2 +- .../velocity/components/SubmitDirective.java | 2 +- .../components/TextAreaDirective.java | 2 +- .../velocity/components/TextDirective.java | 2 +- .../components/TextFieldDirective.java | 2 +- .../velocity/components/TokenDirective.java | 2 +- .../velocity/components/URLDirective.java | 2 +- .../components/UpDownSelectDirective.java | 2 +- .../views/velocity/result/VelocityResult.java | 8 +- .../template/VelocityTemplateEngine.java | 2 +- .../velocity/StrutsVelocityContextTest.java | 2 +- .../velocity/StrutsVelocityManagerTest.java | 4 +- .../velocity/result/VelocityResultTest.java | 8 +- .../template/VelocityTemplateEngineTest.java | 4 +- .../struts2/result/xslt/StringAdapter.java | 2 +- .../struts2/result/xslt/XSLTResult.java | 10 +- .../struts2/result/xslt/XSLTResultTest.java | 14 +- .../src/test/resources/XSLTResultTest-val.xml | 26 +-- 1440 files changed, 6197 insertions(+), 6284 deletions(-) delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/package.html rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/Action.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ActionChainResult.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ActionContext.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ActionEventListener.java (94%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ActionInvocation.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ActionProxy.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ActionProxyFactory.java (99%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ActionSupport.java (94%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/AsyncManager.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/CompositeTextProvider.java (90%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/DefaultActionInvocation.java (94%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/DefaultActionProxy.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/DefaultActionProxyFactory.java (94%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/DefaultLocaleProvider.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/DefaultLocaleProviderFactory.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/DefaultTextProvider.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/DefaultUnknownHandlerManager.java (92%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/FileManager.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/FileManagerFactory.java (85%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/LocaleProvider.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/LocaleProviderFactory.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/LocalizedTextProvider.java (95%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ModelDriven.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ObjectFactory.java (87%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/Preparable.java (86%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ResourceBundleTextProvider.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/Result.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/StrutsTextProviderFactory.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/TextProvider.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/TextProviderFactory.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/TextProviderSupport.java (99%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/Unchainable.java (90%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/UnknownHandler.java (92%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/UnknownHandlerManager.java (91%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/Validateable.java (90%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ValidationAwareSupport.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/XWorkJUnit4TestCase.java (80%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/XWorkTestCase.java (87%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/BeanSelectionProvider.java (95%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/Configuration.java (92%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/ConfigurationException.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/ConfigurationManager.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/ConfigurationProvider.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/ConfigurationUtil.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/ContainerProvider.java (92%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/FileManagerFactoryProvider.java (86%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/FileManagerProvider.java (86%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/PackageProvider.java (94%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/RuntimeConfiguration.java (95%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/ServletContextAwareConfigurationProvider.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/entities/ActionConfig.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/entities/AllowedMethods.java (99%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/entities/ExceptionMappingConfig.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/entities/InterceptorConfig.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/entities/InterceptorListHolder.java (95%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/entities/InterceptorLocator.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/entities/InterceptorMapping.java (95%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/entities/InterceptorStackConfig.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/entities/PackageConfig.java (99%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/entities/Parameterizable.java (88%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/entities/ResultConfig.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/entities/ResultTypeConfig.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/entities/UnknownHandlerConfig.java (88%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/entities/package.html (100%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/impl/AbstractMatcher.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/impl/ActionConfigMatcher.java (95%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/impl/DefaultConfiguration.java (83%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/impl/LocatableConstantFactory.java (84%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/impl/LocatableFactory.java (86%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/impl/MockConfiguration.java (82%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/impl/NamespaceMatch.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/impl/NamespaceMatcher.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/impl/package.html (100%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/CycleDetector.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/DirectedGraph.java (99%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/EnvsValueSubstitutor.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/InterceptorBuilder.java (94%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/StrutsDefaultConfigurationProvider.java (67%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/ValueSubstitutor.java (94%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/XmlConfigurationProvider.java (93%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/XmlDocConfigurationProvider.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/XmlHelper.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/package.html (100%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/ConversionAnnotationProcessor.java (86%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/ConversionFileProcessor.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/ConversionPropertiesProcessor.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/NullHandler.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/ObjectTypeDeterminer.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/TypeConverter.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/TypeConverterCreator.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/TypeConverterHolder.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/annotations/Conversion.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/annotations/ConversionRule.java (95%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/annotations/ConversionType.java (95%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/annotations/TypeConversion.java (95%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/annotations/package.html (100%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/impl/ArrayConverter.java (94%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/impl/CollectionConverter.java (89%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/impl/ConversionData.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/impl/DateConverter.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/impl/DefaultConversionAnnotationProcessor.java (88%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/impl/DefaultConversionFileProcessor.java (92%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/impl/DefaultObjectTypeDeterminer.java (94%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/impl/DefaultTypeConverter.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/impl/InstantiatingNullHandler.java (93%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/impl/NumberConverter.java (99%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/impl/StringConverter.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/impl/XWorkBasicConverter.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/impl/XWorkConverter.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/impl/XWorkList.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/factory/ActionFactory.java (88%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/factory/ConverterFactory.java (82%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/factory/DefaultActionFactory.java (87%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/factory/DefaultInterceptorFactory.java (88%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/factory/DefaultResultFactory.java (83%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/factory/DefaultUnknownHandlerFactory.java (87%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/factory/DefaultValidatorFactory.java (86%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/factory/InterceptorFactory.java (83%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/factory/ResultFactory.java (79%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/factory/StrutsConverterFactory.java (88%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/factory/UnknownHandlerFactory.java (79%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/factory/ValidatorFactory.java (84%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/inject/ConstructionContext.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/inject/Container.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/inject/ContainerBuilder.java (99%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/inject/ContainerImpl.java (99%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/inject/Context.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/inject/DependencyException.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/inject/EarlyInitializable.java (95%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/inject/ExternalContext.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/inject/Factory.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/inject/Initializable.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/inject/InitializableFactory.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/inject/Inject.java (90%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/inject/InternalContext.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/inject/InternalFactory.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/inject/Key.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/inject/Scope.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/inject/Scoped.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/inject/package-info.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/inject/util/FinalizablePhantomReference.java (85%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/inject/util/FinalizableReference.java (95%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/inject/util/FinalizableReferenceQueue.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/inject/util/FinalizableSoftReference.java (84%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/inject/util/FinalizableWeakReference.java (84%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/inject/util/Function.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/inject/util/ReferenceCache.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/inject/util/ReferenceMap.java (99%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/inject/util/ReferenceType.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/inject/util/package.html (100%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/AbstractInterceptor.java (95%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/AliasInterceptor.java (93%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/ChainingInterceptor.java (94%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/ConditionalInterceptor.java (93%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/ConversionErrorInterceptor.java (94%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/DefaultWorkflowInterceptor.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/ExceptionHolder.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/ExceptionMappingInterceptor.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/Interceptor.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/LoggingInterceptor.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/MethodFilterInterceptor.java (89%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/MethodFilterInterceptorUtil.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/ModelDrivenInterceptor.java (95%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/ParameterRemoverInterceptor.java (94%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/PreResultListener.java (76%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/PrefixMethodInvocationUtil.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/PrepareInterceptor.java (95%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/ScopedModelDriven.java (92%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/ScopedModelDrivenInterceptor.java (94%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/StaticParametersInterceptor.java (93%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/ValidationAware.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/ValidationErrorAware.java (89%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/ValidationWorkflowAware.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/WithLazyParams.java (86%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/annotations/After.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/annotations/AnnotationWorkflowInterceptor.java (93%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/annotations/Before.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/annotations/BeforeResult.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/annotations/InputConfig.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/annotations/package.html (100%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/package.html (100%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/mock/MockActionInvocation.java (94%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/mock/MockActionProxy.java (92%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/mock/MockContainer.java (91%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/mock/MockInterceptor.java (93%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/mock/MockObjectTypeDeterminer.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/mock/MockResult.java (92%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/mock/package.html (100%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/BeanInfoCacheFactory.java (95%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/DefaultOgnlBeanInfoCacheFactory.java (94%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/DefaultOgnlCacheFactory.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/DefaultOgnlExpressionCacheFactory.java (94%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/ErrorMessageBuilder.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/ExpressionCacheFactory.java (95%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/ObjectProxy.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/OgnlCache.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/OgnlCacheFactory.java (92%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/OgnlCaffeineCache.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/OgnlDefaultCache.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/OgnlLRUCache.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/OgnlNullHandlerWrapper.java (93%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/OgnlReflectionContextFactory.java (90%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/OgnlReflectionProvider.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/OgnlTypeConverterWrapper.java (94%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/OgnlUtil.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/OgnlValueStack.java (88%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/OgnlValueStackFactory.java (92%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/SecurityMemberAccess.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/XWorkTypeConverterWrapper.java (93%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/accessor/CompoundRootAccessor.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/accessor/HttpParametersPropertyAccessor.java (94%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/accessor/ObjectAccessor.java (86%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/accessor/ObjectProxyPropertyAccessor.java (94%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/accessor/ParameterPropertyAccessor.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/accessor/RootAccessor.java (95%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/accessor/XWorkCollectionPropertyAccessor.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/accessor/XWorkEnumerationAccessor.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/accessor/XWorkIteratorPropertyAccessor.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/accessor/XWorkListPropertyAccessor.java (94%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/accessor/XWorkMapPropertyAccessor.java (94%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/accessor/XWorkMethodAccessor.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/accessor/XWorkObjectPropertyAccessor.java (89%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/package.html (100%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/result/ParamNameAwareResult.java (88%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/security/AcceptedPatternsChecker.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/security/DefaultAcceptedPatternsChecker.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/security/DefaultExcludedPatternsChecker.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/security/DefaultNotExcludedAcceptedPatternsChecker.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/security/ExcludedPatternsChecker.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/security/NotExcludedAcceptedPatternsChecker.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/test/StubConfigurationProvider.java (82%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/AbstractLocalizedTextProvider.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/AnnotationUtils.java (99%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/ClassLoaderUtil.java (99%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/ClassPathFinder.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/ClearableValueStack.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/CompoundRoot.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/ConfigParseUtil.java (95%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/CreateIfNull.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/DebugUtils.java (92%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/DomHelper.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/Element.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/Evaluated.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/GlobalLocalizedTextProvider.java (99%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/Key.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/KeyProperty.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/MemberAccessValueStack.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/NamedVariablePatternMatcher.java (99%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/OgnlTextParser.java (99%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/PatternMatcher.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/PropertiesReader.java (99%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/ProxyUtil.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/ResolverUtil.java (99%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/StrutsLocalizedTextProvider.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/TextParseUtil.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/TextParser.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/ValueStack.java (95%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/ValueStackFactory.java (76%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/WildcardHelper.java (99%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/WildcardUtil.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/XWorkTestCaseHelper.java (87%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/classloader/AbstractResourceStore.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/classloader/FileResourceStore.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/classloader/JarResourceStore.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/classloader/ReloadingClassLoader.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/classloader/ResourceStore.java (95%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/classloader/ResourceStoreClassLoader.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/finder/ClassFinder.java (99%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/finder/ClassFinderFactory.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/finder/ClassLoaderInterface.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/finder/ClassLoaderInterfaceDelegate.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/finder/ResourceFinder.java (99%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/finder/Test.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/finder/UrlSet.java (99%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/fs/DefaultFileManager.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/fs/DefaultFileManagerFactory.java (94%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/fs/FileRevision.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/fs/JarEntryRevision.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/fs/Revision.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/fs/StrutsJarURLConnection.java (99%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/location/Locatable.java (95%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/location/LocatableProperties.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/location/Located.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/location/Location.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/location/LocationAttributes.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/location/LocationImpl.java (99%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/location/LocationUtils.java (99%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/location/package.html (100%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/package.html (100%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/reflection/ReflectionContextFactory.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/reflection/ReflectionContextState.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/reflection/ReflectionException.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/reflection/ReflectionExceptionHandler.java (94%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/reflection/ReflectionProvider.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/ActionValidatorManager.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/AnnotationActionValidatorManager.java (93%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/AnnotationValidationConfigurationBuilder.java (95%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/DefaultActionValidatorManager.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/DefaultValidatorFactory.java (94%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/DefaultValidatorFileParser.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/DelegatingValidatorContext.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/FieldValidator.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/ShortCircuitableValidator.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/ValidationException.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/ValidationInterceptor.java (92%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/Validator.java (99%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/ValidatorConfig.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/ValidatorContext.java (87%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/ValidatorFactory.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/ValidatorFileParser.java (95%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/annotations/ConditionalVisitorFieldValidator.java (99%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/annotations/ConversionErrorFieldValidator.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/annotations/CreditCardValidator.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/annotations/CustomValidator.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/annotations/DateRangeFieldValidator.java (99%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/annotations/DoubleRangeFieldValidator.java (99%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/annotations/EmailValidator.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/annotations/ExpressionValidator.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/annotations/FieldExpressionValidator.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/annotations/IntRangeFieldValidator.java (99%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/annotations/LongRangeFieldValidator.java (99%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/annotations/RegexFieldValidator.java (99%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/annotations/RequiredFieldValidator.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/annotations/RequiredStringValidator.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/annotations/ShortRangeFieldValidator.java (99%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/annotations/StringLengthFieldValidator.java (99%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/annotations/UrlValidator.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/annotations/ValidationParameter.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/annotations/Validations.java (99%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/annotations/ValidatorType.java (95%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/annotations/VisitorFieldValidator.java (99%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/annotations/package.html (100%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/package.html (100%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validators/ConditionalVisitorFieldValidator.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validators/ConversionErrorFieldValidator.java (91%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validators/CreditCardValidator.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validators/DateRangeFieldValidator.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validators/DoubleRangeFieldValidator.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validators/EmailValidator.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validators/ExpressionValidator.java (95%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validators/FieldExpressionValidator.java (96%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validators/FieldValidatorSupport.java (93%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validators/IntRangeFieldValidator.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validators/LongRangeFieldValidator.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validators/RangeValidatorSupport.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validators/RegexFieldValidator.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validators/RepopulateConversionErrorFieldValidatorSupport.java (95%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validators/RequiredFieldValidator.java (95%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validators/RequiredStringValidator.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validators/ShortRangeFieldValidator.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validators/StringLengthFieldValidator.java (98%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validators/URLValidator.java (97%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validators/ValidatorSupport.java (91%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validators/VisitorFieldValidator.java (93%) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validators/package.html (100%) delete mode 100644 core/src/main/resources/com/opensymphony/xwork2/validator/validators/default.xml create mode 100644 core/src/main/resources/org/apache/struts2/validator/validators/default.xml rename core/src/main/resources/{com/opensymphony/xwork2 => org/apache/struts2}/xwork-messages.properties (100%) delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/providers/ConfigurationProviderOgnlAllowlistTest.java rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/ActionChainResultTest.java (97%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/ActionContextTest.java (95%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/ActionContextThreadLocalTest.java (97%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/ActionInvocationTest.java (95%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/ActionNestingTest.java (90%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/ActionSupportTest.java (98%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/AnnotatedTestBean.java (81%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/ChainResultTest.java (97%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/CompositeTextProviderTest.java (87%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/DefaultActionInvocationTest.java (96%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/DefaultActionProxyTest.java (88%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/DefaultClasstTest.java (76%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/DefaultLocaleProviderTest.java (99%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/DefaultTextProviderTest.java (99%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/DefaultUnknownHandlerManagerTest.java (94%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/ExternalReferenceAction.java (97%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/Foo.java (96%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/GenericsBean.java (98%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/LocaleAwareTest.java (90%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/LocaleProviderTest.java (98%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/ModelDrivenAction.java (97%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/ModelDrivenAnnotationAction.java (97%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/NestedAction.java (96%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/ObjectFactoryTest.java (88%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/ProxyInvocationAction.java (96%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/ProxyInvocationInterface.java (96%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/ProxyInvocationTest.java (95%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/ProxyObjectFactory.java (96%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/SimpleAction.java (96%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/SimpleAnnotationAction.java (88%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/SimpleFooAction.java (97%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/StubTextProvider.java (97%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/StubValueStack.java (95%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/TestBean.java (98%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/TestChildBean.java (97%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/TextProviderSupportTest.java (97%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/UnknownHandlerManagerMock.java (97%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/UserSpecifiedDefaultAction.java (96%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/ValidationOrderAction.java (99%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/VoidResult.java (97%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/WildCardResultTest.java (93%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/ConfigurationManagerTest.java (92%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/ConfigurationTest.java (94%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/entities/ActionConfigTest.java (88%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/entities/AllowedMethodsTest.java (98%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/entities/PackageConfigTest.java (96%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/impl/AbstractMatcherTest.java (98%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/impl/ActionConfigMatcherTest.java (95%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/impl/NamespaceMatcherTest.java (94%) create mode 100644 core/src/test/java/org/apache/struts2/config/providers/ConfigurationProviderOgnlAllowlistTest.java rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/ConfigurationTestBase.java (87%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/EnvsValueSubstitutorTest.java (97%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/InterceptorBuilderTest.java (90%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/InterceptorForTestPurpose.java (89%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/MockConfigurationProvider.java (88%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/NoNoArgsConstructorAction.java (85%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/PrivateConstructorAction.java (93%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/SomeUnknownHandler.java (87%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/XmlConfigurationProviderActionsTest.java (82%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/XmlConfigurationProviderAllowedMethodsTest.java (93%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/XmlConfigurationProviderEnvsSubstitutionTest.java (94%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/XmlConfigurationProviderExceptionMappingsTest.java (78%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/XmlConfigurationProviderGlobalResultInheritenceTest.java (86%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/XmlConfigurationProviderInterceptorParamOverridingTest.java (88%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/XmlConfigurationProviderInterceptorStackParamOverridingTest.java (88%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/XmlConfigurationProviderInterceptorsSpringTest.java (85%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/XmlConfigurationProviderInterceptorsTest.java (90%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/XmlConfigurationProviderInvalidFileTest.java (82%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/XmlConfigurationProviderMultilevelTest.java (84%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/XmlConfigurationProviderPackagesTest.java (95%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/XmlConfigurationProviderResultTypesTest.java (85%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/XmlConfigurationProviderResultsTest.java (86%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/XmlConfigurationProviderTest.java (94%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/XmlConfigurationProviderUnknownHandlerStackTest.java (78%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/XmlConfigurationProviderWildCardIncludeTest.java (84%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/XmlHelperTest.java (96%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/ConversionTestAction.java (85%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/impl/AnnotationXWorkConverterTest.java (96%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/impl/DateConverterTest.java (97%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/impl/FooBarConverter.java (88%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/impl/FooNumberConverter.java (96%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/impl/InstantiatingNullHandlerTest.java (97%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/impl/NumberConverterTest.java (98%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/impl/ParentClass.java (96%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/impl/StringConverterTest.java (99%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/impl/XWorkBasicConverterTest.java (97%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/impl/XWorkConverterTest.java (96%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/impl/XWorkListTest.java (96%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/inject/ContainerImplTest.java (99%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/inject/EarlyInitializableBean.java (96%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/inject/InitializableBean.java (96%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/AliasInterceptorTest.java (91%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/ChainingInterceptorTest.java (89%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/ChainingInterceptorWithConfigTest.java (81%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/ConversionErrorInterceptorTest.java (92%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/DefaultWorkflowInterceptorTest.java (93%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/ExceptionMappingInterceptorTest.java (94%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/MethodFilterInterceptorUtilTest.java (95%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/ModelDrivenInterceptorTest.java (94%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/ParameterRemoverInterceptorTest.java (94%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/PreResultListenerTest.java (84%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/PrefixMethodInvocationUtilTest.java (92%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/PrepareInterceptorTest.java (67%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/ScopedModelDrivenInterceptorTest.java (91%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/StaticParametersInterceptorTest.java (95%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/ValidationErrorAwareTest.java (86%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/ValidationInterceptorPrefixMethodInvocationTest.java (85%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/annotations/AnnotatedAction.java (92%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/annotations/AnnotationWorkflowInterceptorTest.java (82%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/annotations/BaseAnnotatedAction.java (96%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/annotations/InterfaceAnnotatedAction.java (94%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/annotations/ShortcircuitedAction.java (86%) rename {plugins/spring/src/test/java/com/opensymphony/xwork2 => core/src/test/java/org/apache/struts2}/mock/DummyTextProvider.java (94%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/mock/InjectableAction.java (89%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/mock/MockLazyInterceptor.java (78%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/MyCustomMap.java (96%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/OgnlUtilStrutsTest.java (94%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/OgnlUtilTest.java (94%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/OgnlValueStackTest.java (90%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/SecurityMemberAccessTest.java (99%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/SetPropertiesTest.java (93%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/accessor/XWorkListPropertyAccessorTest.java (90%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/accessor/XWorkMapPropertyAccessorTest.java (88%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/security/DefaultAcceptedPatternsCheckerTest.java (99%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/security/DefaultExcludedPatternsCheckerTest.java (97%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/security/DefaultNotExcludedAcceptedPatternsCheckerTest.java (96%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/test/AnnotationDataAware.java (75%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/test/AnnotationDataAware2.java (90%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/test/AnnotationTestBean2.java (80%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/test/AnnotationUser.java (83%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/test/AnnotationUserMarker.java (84%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/test/DataAware.java (93%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/test/DataAware2.java (96%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/test/Equidae.java (97%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/test/ModelDrivenAction2.java (93%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/test/ModelDrivenAnnotationAction2.java (93%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/test/SimpleAction2.java (93%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/test/SimpleAction3.java (92%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/test/SimpleAnnotationAction2.java (85%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/test/SimpleAnnotationAction3.java (91%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/test/TestArrayBean.java (96%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/test/TestBean2.java (89%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/test/User.java (98%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/test/UserMarker.java (96%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/test/annotations/Address.java (96%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/test/annotations/AddressTypeConverter.java (93%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/test/annotations/Person.java (95%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/test/annotations/PersonAction.java (74%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/test/annotations/PersonActionTest.java (92%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/test/annotations/PersonTypeConverter.java (92%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/test/annotations/ValidateAnnotatedMethodOnlyAction.java (91%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/test/subtest/NullModelDrivenAction.java (92%) rename core/src/test/java/org/apache/struts2/{ => test}/util/StrutsUtilTest.java (98%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/Animal.java (95%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/AnnotatedCat.java (90%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/AnnotationUtilsTest.java (84%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/Bar.java (95%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/BarJunior.java (95%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/Cat.java (97%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/ClassLoaderUtilTest.java (98%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/ClassPathFinderTest.java (75%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/DefaultFileManagerTest.java (97%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/Dog.java (98%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/DomHelperTest.java (96%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/DummyObjectFactory.java (91%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/Foo.java (94%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/FurColor.java (95%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/GetPropertiesTest.java (92%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/Indexed.java (97%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/ListHolder.java (97%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/MyBean.java (97%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/MyBeanAction.java (88%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/MyBeanActionTest.java (96%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/MyNumber.java (95%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/NamedVariablePatternMatcherTest.java (97%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/Owner.java (96%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/ResolverUtilTest.java (84%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/StrutsLocalizedTextProviderTest.java (93%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/TextParseUtilTest.java (98%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/Tiger.java (96%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/UnknownHandlerManagerTest.java (82%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/UrlUtilTest2.java (92%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/WildcardHelperTest.java (96%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/WildcardUtilTest.java (95%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/annotation/Dummy2Class.java (94%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/annotation/Dummy3Class.java (82%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/annotation/DummyClass.java (89%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/annotation/DummyClassExt.java (95%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/annotation/MyAnnotation.java (95%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/annotation/MyAnnotation2.java (95%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/annotation/package-info.java (94%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/annotation/pkg1/AbstractAbstractDummyAction.java (88%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/annotation/pkg1/AbstractDummyAction.java (94%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/annotation/pkg2/Package2DummyInterface.java (88%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/annotation/pkg2/package-info.java (88%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/fs/DefaultFileManagerFactoryTest.java (94%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/fs/JarEntryRevisionTest.java (86%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/location/LocationAttributesTest.java (97%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/location/LocationImplTest.java (87%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/location/LocationUtilsTest.java (93%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/ActionValidatorManagerTest.java (95%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/AnnotationActionValidatorManagerTest.java (90%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/AnnotationValidationAction.java (76%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/AnnotationValidationConfigurationBuilderTest.java (89%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/AnnotationValidationExpAction.java (81%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/ConversionErrorFieldValidatorTest.java (85%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/DateRangeValidatorTest.java (88%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/DefaultActionValidatorManagerTest.java (88%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/DefaultValidatorFactoryTest.java (92%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/DefaultValidatorFileParserTest.java (91%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/DoubleRangeFieldValidatorTest.java (95%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/DummyValidatorContext.java (97%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/EmailValidatorTest.java (94%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/ExpressionValidatorTest.java (90%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/IntRangeValidatorTest.java (85%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/LongRangeValidatorTest.java (85%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/ModelDrivenValidationTest.java (86%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/MyValidator.java (96%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/RegexFieldValidatorTest.java (96%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/RepopulateConversionErrorFieldValidatorSupportTest.java (87%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/ShortRangeValidatorTest.java (85%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/SimpleActionValidationTest.java (92%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/StringLengthFieldValidatorTest.java (95%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/StringValidatorTest.java (92%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/URLValidatorTest.java (98%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/ValidatorAnnotationTest.java (94%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/VisitorFieldValidatorModelTest.java (90%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/VisitorFieldValidatorTest.java (95%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/VisitorValidatorModelAction.java (93%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/VisitorValidatorTestAction.java (95%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validators/AppendingValidatorContextTest.java (83%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validators/CreditCardValidatorTest.java (95%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validators/DateRangeFieldValidatorTest.java (90%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validators/IntRangeFieldValidatorTest.java (92%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validators/LongRangeFieldValidatorTest.java (90%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validators/RequiredFieldValidatorTest.java (94%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validators/RequiredStringValidatorTest.java (92%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validators/ShortRangeFieldValidatorTest.java (90%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validators/ValidationAction.java (98%) rename core/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validators/ValidatorSupportTest.java (83%) rename core/src/test/java/{com => org}/test/ExternalSecurityMemberAccess.java (94%) rename core/src/test/java/{com => org}/test/ExternalSecurityMemberAccessTest.java (90%) delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/validator/validators-fail.xml rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/ActionSupportTest$MyActionSupport_da.properties (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/AnnotatedTestBean.properties (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/DefaultTextProviderTest_en_CA.properties (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/ModelDrivenAction-validation.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/ModelDrivenAction.properties (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/ModelDrivenAnnotationAction.properties (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/SimpleAction-some-alias-validation.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/SimpleAction-subproperty-validation.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/SimpleAction-validation.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/SimpleAction-validationAlias-validation.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/SimpleAction.properties (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/SimpleAction_de.properties (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/SimpleAction_en.properties (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/SimpleAnnotationAction.properties (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/SimpleAnnotationAction_de.properties (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/SimpleAnnotationAction_en.properties (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/TestBean-anotherContext-validation.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/TestBean-badtest-validation.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/TestBean-beanMessageBundle-validation.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/TestBean-expressionValidation-validation.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/TestBean-validation.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/TestBean-visitorChildValidation-validation.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/TestBean-visitorValidation-validation.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/TestBean.properties (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/TestChildBean-validation.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/TextProviderSupportTest_en.properties (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/ValidationOrderAction-validation.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/loadorder1/xwork-test-load-order.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/loadorder2/xwork-test-load-order.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/loadorder3/xwork-test-load-order.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork- test.xml (78%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-include-after-package-2.xml (94%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-include-after-package.xml (81%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-include-before-package-2.xml (94%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-include-before-package.xml (81%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-include-parent.xml (81%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-action-invalid.xml (78%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-actions-packagedefaultclassref.xml (73%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-actions.xml (78%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-allowed-methods.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-allowlist-2.xml (88%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-allowlist.xml (86%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-bad-inheritance.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-basic-packages.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-default-package.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-defaultclassref-package.xml (93%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-envs-substitution.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-exception-mappings.xml (77%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-global-result-inheritence.xml (92%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-include-wildcard.xml (92%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-interceptor-defaultref.xml (79%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-interceptor-inheritance.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-interceptor-param-overriding.xml (82%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-interceptor-params.xml (87%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-interceptor-stack-param-overriding.xml (87%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-interceptors-basic.xml (89%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-interceptors-spring.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-invalid-file.xml (94%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-multilevel.xml (81%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-package-extends-final.xml (83%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-package-final.xml (84%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-package-inheritance.xml (79%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-reload.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-result-inheritance.xml (80%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-result-names.xml (94%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-result-types.xml (87%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-results.xml (87%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-wildcard-1.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-wildcard-2.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-wildcard-include.xml (93%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-unknownhandler-stack-empty.xml (79%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-unknownhandler-stack.xml (81%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/impl/test-struts-conversion.properties (89%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/somefile.txt (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/test.properties (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/test/DataAware-conversion.properties (92%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/test/DataAware-validation.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/test/DataAware-validationAlias-validation.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/test/DataAware.properties (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/test/DataAware2-validation.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/test/Equidae-validation.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/test/SimpleAction2-validation.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/test/SimpleAction2-validationAlias-validation.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/test/TestBean2-conversion.properties (92%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/test/User-conversion.properties (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/test/User-validation.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/test/UserMarker-validation.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/test/package.properties (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/util/Bar.properties (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/util/Cat-conversion.properties (86%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/util/FindMe.properties (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/util/Foo-conversion.properties (68%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/util/ListHolder-conversion.properties (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/util/LocalizedTextUtilTest.properties (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/util/MyBeanAction-conversion.properties (89%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/util/Tiger-conversion.properties (93%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/util/XW404_de.properties (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/util/XW404_fr.properties (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/util/location/xml-with-location.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/validator/CompositeTextProviderTestResourceBundle1.properties (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/validator/CompositeTextProviderTestResourceBundle2.properties (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/validator/VisitorValidatorModelAction-validation.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/validator/VisitorValidatorTestAction-beanMessageBundle-validation.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/validator/VisitorValidatorTestAction-validateArray-validation.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/validator/VisitorValidatorTestAction-validateList-validation.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/validator/VisitorValidatorTestAction-validation.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/validator/VisitorValidatorTestAction-visitorChildValidation-validation.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/validator/VisitorValidatorTestAction-visitorValidation-validation.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/validator/VisitorValidatorTestAction-visitorValidationAlias-validation.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/validator/VisitorValidatorTestAction.properties (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validator-parser-test.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validator-parser-test2.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validator-parser-test3.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validator-parser-test4.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validator-parser-test5.xml (100%) rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validator-parser-test6.xml (100%) create mode 100644 core/src/test/resources/org/apache/struts2/validator/validators-fail.xml rename plugins/spring/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/spring/SpringObjectFactory.java (98%) rename plugins/spring/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/spring/SpringProxyableObjectFactory.java (99%) rename plugins/spring/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/spring/interceptor/ActionAutowiringInterceptor.java (95%) delete mode 100644 plugins/spring/src/test/java/com/test/SecurityMemberAccessProxyTest.java rename plugins/spring/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/ModelDrivenAction.java (97%) rename plugins/spring/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/SimpleAction.java (93%) rename plugins/spring/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/TestBean.java (97%) rename plugins/spring/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/TestChildBean.java (97%) rename plugins/spring/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/TestSubBean.java (96%) rename {core/src/test/java/com/opensymphony/xwork2 => plugins/spring/src/test/java/org/apache/struts2}/mock/DummyTextProvider.java (94%) rename plugins/spring/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/ognl/SecurityMemberAccessProxyTest.java (92%) rename plugins/spring/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/spring/ActionsFromSpringTest.java (92%) rename plugins/spring/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/spring/ExecuteInterceptor.java (93%) rename plugins/spring/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/spring/SpringObjectFactoryTest.java (91%) rename plugins/spring/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/spring/SpringProxyUtilTest.java (92%) rename plugins/spring/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/spring/SpringResult.java (92%) rename plugins/spring/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/spring/TestAspect.java (97%) rename plugins/spring/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/spring/interceptor/ActionAutowiringInterceptorTest.java (91%) rename plugins/spring/src/test/java/{com/opensymphony/xwork2 => org/apache/struts2}/spring/interceptor/TestActionInvocation.java (91%) delete mode 100644 plugins/spring/src/test/resources/com/opensymphony/xwork2/spring/actionContext-spring.xml delete mode 100644 plugins/spring/src/test/resources/com/opensymphony/xwork2/spring/emptyContext-spring.xml create mode 100644 plugins/spring/src/test/resources/org/apache/struts2/spring/actionContext-spring.xml rename plugins/spring/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/spring/actionContext-xwork.xml (70%) rename plugins/spring/src/test/resources/org/apache/struts2/spring/{StrutsSpringObjectFactoryTest-applicationContext.xml => emptyContext-spring.xml} (100%) diff --git a/apps/rest-showcase/src/main/java/org/demo/rest/example/OrdersController.java b/apps/rest-showcase/src/main/java/org/demo/rest/example/OrdersController.java index 50d9c8fa65..64ef99dfa5 100644 --- a/apps/rest-showcase/src/main/java/org/demo/rest/example/OrdersController.java +++ b/apps/rest-showcase/src/main/java/org/demo/rest/example/OrdersController.java @@ -18,9 +18,9 @@ */ package org.demo.rest.example; -import com.opensymphony.xwork2.ModelDriven; -import com.opensymphony.xwork2.Validateable; -import com.opensymphony.xwork2.ValidationAwareSupport; +import org.apache.struts2.ModelDriven; +import org.apache.struts2.Validateable; +import org.apache.struts2.ValidationAwareSupport; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.convention.annotation.Result; diff --git a/apps/rest-showcase/src/main/resources/log4j2.xml b/apps/rest-showcase/src/main/resources/log4j2.xml index c884157426..f6836e06ae 100644 --- a/apps/rest-showcase/src/main/resources/log4j2.xml +++ b/apps/rest-showcase/src/main/resources/log4j2.xml @@ -26,7 +26,6 @@ - diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 799d9b2588..95066fb00c 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -241,7 +241,6 @@ 8090 10 - ${basedir}/src/main/webapp/ ${project.build.directory}/extraclasspath/struts2-sitemesh2-jakarta.jar, diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.java index 21aa14840e..df1fbe5116 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import java.text.DateFormat; import java.util.Calendar; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/DynamicTreeSelectAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/DynamicTreeSelectAction.java index c194ca386c..67bdba155d 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/DynamicTreeSelectAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/DynamicTreeSelectAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.interceptor.parameter.StrutsParameter; import org.apache.struts2.showcase.ajax.tree.Category; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfOptiontransferselectAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfOptiontransferselectAction.java index 9d861c9205..e82d72187b 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfOptiontransferselectAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfOptiontransferselectAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.interceptor.parameter.StrutsParameter; import java.util.ArrayList; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfRichtexteditorAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfRichtexteditorAction.java index ac18342a53..e4a0667a32 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfRichtexteditorAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfRichtexteditorAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.interceptor.parameter.StrutsParameter; /** diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/MoreSelectsAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/MoreSelectsAction.java index 72f554bed3..7f0d683940 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/MoreSelectsAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/MoreSelectsAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.interceptor.parameter.StrutsParameter; import java.util.ArrayList; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/ShowAjaxDynamicTreeAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/ShowAjaxDynamicTreeAction.java index 242790c9f8..c2bab811d0 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/ShowAjaxDynamicTreeAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/ShowAjaxDynamicTreeAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.interceptor.parameter.StrutsParameter; import org.apache.struts2.showcase.ajax.tree.Category; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/ShowDynamicTreeAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/ShowDynamicTreeAction.java index cec9974658..22561463e5 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/ShowDynamicTreeAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/ShowDynamicTreeAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.showcase.ajax.tree.Category; // START SNIPPET: treeExampleDynamicJavaShow diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java index c04114c2ed..da7373de8d 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java @@ -20,9 +20,9 @@ */ package org.apache.struts2.showcase; -import com.opensymphony.xwork2.ActionSupport; -import com.opensymphony.xwork2.Validateable; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.ActionSupport; +import org.apache.struts2.Validateable; +import org.apache.struts2.util.ValueStack; import org.apache.struts2.ServletActionContext; import org.apache.struts2.interceptor.parameter.StrutsParameter; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/AbstractCRUDAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/action/AbstractCRUDAction.java index e5204a1fad..871136c64c 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/AbstractCRUDAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/action/AbstractCRUDAction.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.showcase.action; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.interceptor.parameter.StrutsParameter; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.java index e8a411fe3d..634b549efe 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.showcase.action; -import com.opensymphony.xwork2.Preparable; +import org.apache.struts2.Preparable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.interceptor.parameter.StrutsParameter; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/ExampleAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/action/ExampleAction.java index 771d49cbca..b8ef9bdb62 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/ExampleAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/action/ExampleAction.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.showcase.action; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import java.util.Arrays; import java.util.Date; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/JSPEvalAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/action/JSPEvalAction.java index 7683a97019..8e0e71a9ae 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/JSPEvalAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/action/JSPEvalAction.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.showcase.action; -import com.opensymphony.xwork2.Action; -import com.opensymphony.xwork2.interceptor.annotations.After; +import org.apache.struts2.Action; +import org.apache.struts2.interceptor.annotations.After; import org.apache.struts2.ServletActionContext; import org.apache.struts2.interceptor.parameter.StrutsParameter; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/ParamsAnnotationAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/action/ParamsAnnotationAction.java index 0c3ff4f7c4..351a6a24e7 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/ParamsAnnotationAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/action/ParamsAnnotationAction.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.showcase.action; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.interceptor.parameter.StrutsParameter; import org.apache.struts2.showcase.model.MyDto; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.java index ce462095b5..651c3c86d6 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.showcase.action; -import com.opensymphony.xwork2.Preparable; +import org.apache.struts2.Preparable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.interceptor.parameter.StrutsParameter; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain1.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain1.java index e57006f2bd..34989dad6f 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain1.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain1.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.showcase.actionchaining; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.interceptor.parameter.StrutsParameter; public class ActionChain1 extends ActionSupport { diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain2.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain2.java index 32e7f67676..14196c0a74 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain2.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain2.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.showcase.actionchaining; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.interceptor.parameter.StrutsParameter; public class ActionChain2 extends ActionSupport { diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain3.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain3.java index 402a1b578c..d00d87f479 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain3.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain3.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.showcase.actionchaining; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.interceptor.parameter.StrutsParameter; public class ActionChain3 extends ActionSupport { diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AjaxTestAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AjaxTestAction.java index ec146c05d9..02cd9f1f82 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AjaxTestAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AjaxTestAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.ajax; -import com.opensymphony.xwork2.Action; +import org.apache.struts2.Action; import org.apache.struts2.interceptor.parameter.StrutsParameter; import java.io.Serializable; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AutocompleterExampleAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AutocompleterExampleAction.java index 9193ec918a..44b7938db8 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AutocompleterExampleAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AutocompleterExampleAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.ajax; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.interceptor.parameter.StrutsParameter; import java.util.ArrayList; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/Example4ShowPanelAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/Example4ShowPanelAction.java index c698da86df..f3c9c6420e 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/Example4ShowPanelAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/Example4ShowPanelAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.ajax; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.interceptor.parameter.StrutsParameter; import java.text.SimpleDateFormat; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/Example5Action.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/Example5Action.java index d5f7b1c3dc..2873c55924 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/Example5Action.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/Example5Action.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.ajax; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.interceptor.parameter.StrutsParameter; public class Example5Action extends ActionSupport { diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/GetCategory.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/GetCategory.java index cbb7ec1e49..54b5fded9f 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/GetCategory.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/GetCategory.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.ajax.tree; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.interceptor.parameter.StrutsParameter; /** diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/async/ChatRoomAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/async/ChatRoomAction.java index be05ce1a9a..bdf7bd4e64 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/async/ChatRoomAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/async/ChatRoomAction.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.showcase.async; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.interceptor.parameter.StrutsParameter; import java.util.ArrayList; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatAuthenticationInterceptor.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatAuthenticationInterceptor.java index e820f552c7..ad352ff522 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatAuthenticationInterceptor.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatAuthenticationInterceptor.java @@ -21,10 +21,10 @@ package org.apache.struts2.showcase.chat; -import com.opensymphony.xwork2.Action; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.interceptor.AbstractInterceptor; +import org.apache.struts2.Action; +import org.apache.struts2.ActionContext; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.interceptor.AbstractInterceptor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatInterceptor.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatInterceptor.java index 324226b2d0..52678d2889 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatInterceptor.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatInterceptor.java @@ -20,10 +20,10 @@ */ package org.apache.struts2.showcase.chat; -import com.opensymphony.xwork2.Action; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.interceptor.AbstractInterceptor; +import org.apache.struts2.Action; +import org.apache.struts2.ActionContext; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.interceptor.AbstractInterceptor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLoginAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLoginAction.java index d40232e0ba..34ff5788a5 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLoginAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLoginAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.chat; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.action.SessionAware; import org.apache.struts2.interceptor.parameter.StrutsParameter; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLogoutAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLogoutAction.java index 452ce0d089..03c48087e5 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLogoutAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLogoutAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.chat; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import java.util.Map; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/CrudRoomAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/CrudRoomAction.java index ca546792ab..64af60e912 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/CrudRoomAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/CrudRoomAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.chat; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.interceptor.parameter.StrutsParameter; public class CrudRoomAction extends ActionSupport { diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/DateConverter.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/DateConverter.java index eb784b62db..0689f3af04 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/DateConverter.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/DateConverter.java @@ -20,8 +20,8 @@ */ package org.apache.struts2.showcase.chat; -import com.opensymphony.xwork2.conversion.impl.XWorkConverter; -import com.opensymphony.xwork2.inject.Inject; +import org.apache.struts2.conversion.impl.XWorkConverter; +import org.apache.struts2.inject.Inject; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; import org.apache.struts2.util.StrutsTypeConverter; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/EnterRoomAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/EnterRoomAction.java index bf5c6df9ad..b25ac7ee8d 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/EnterRoomAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/EnterRoomAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.chat; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.action.SessionAware; import org.apache.struts2.interceptor.parameter.StrutsParameter; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ExitRoomAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ExitRoomAction.java index e87dfdc950..38009ace37 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ExitRoomAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ExitRoomAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.chat; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.action.SessionAware; import org.apache.struts2.interceptor.parameter.StrutsParameter; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/MessagesAvailableInRoomAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/MessagesAvailableInRoomAction.java index 3489bac713..1dad05aa37 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/MessagesAvailableInRoomAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/MessagesAvailableInRoomAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.chat; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.interceptor.parameter.StrutsParameter; import java.util.ArrayList; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/RoomsAvailableAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/RoomsAvailableAction.java index 8ed8b4e825..f511c0bf4e 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/RoomsAvailableAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/RoomsAvailableAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.chat; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import java.util.ArrayList; import java.util.List; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/SendMessageToRoomAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/SendMessageToRoomAction.java index 51843179db..b179f94940 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/SendMessageToRoomAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/SendMessageToRoomAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.chat; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.action.SessionAware; import org.apache.struts2.interceptor.parameter.StrutsParameter; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/UsersAvailableAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/UsersAvailableAction.java index c2a15c1072..e0d61b4363 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/UsersAvailableAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/UsersAvailableAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.chat; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import java.util.ArrayList; import java.util.List; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/UsersAvailableInRoomAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/UsersAvailableInRoomAction.java index 0f97a34010..4cf1acaec9 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/UsersAvailableInRoomAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/UsersAvailableInRoomAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.chat; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.interceptor.parameter.StrutsParameter; import java.util.ArrayList; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/AddressAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/AddressAction.java index 0f764b787b..d0eb196b4e 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/AddressAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/AddressAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.conversion; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.interceptor.parameter.StrutsParameter; import java.util.LinkedHashSet; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/OperationsEnumAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/OperationsEnumAction.java index a3fb3b8277..17d7cbe28c 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/OperationsEnumAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/OperationsEnumAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.conversion; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.interceptor.parameter.StrutsParameter; import java.util.Arrays; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/PersonAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/PersonAction.java index 27df30a974..1f7cd4d29f 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/PersonAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/PersonAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.conversion; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.interceptor.parameter.StrutsParameter; import java.util.List; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java index 5f23c19d7e..da35e7bb82 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.filedownload; -import com.opensymphony.xwork2.Action; +import org.apache.struts2.Action; import org.apache.struts2.ServletActionContext; import org.apache.struts2.interceptor.parameter.StrutsParameter; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java index bdcc2e5bb3..1fa4eab527 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.fileupload; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.action.UploadedFilesAware; import org.apache.struts2.dispatcher.multipart.UploadedFile; import org.apache.struts2.interceptor.parameter.StrutsParameter; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingArrayAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingArrayAction.java index ff26356131..8b7c630be6 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingArrayAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingArrayAction.java @@ -21,7 +21,7 @@ // START SNIPPET: entire-file package org.apache.struts2.showcase.fileupload; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.action.UploadedFilesAware; import org.apache.struts2.dispatcher.multipart.UploadedFile; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingListAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingListAction.java index e60b0df3e0..f32e643dec 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingListAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingListAction.java @@ -21,7 +21,7 @@ // START SNIPPET: entire-file package org.apache.struts2.showcase.fileupload; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.action.UploadedFilesAware; import org.apache.struts2.dispatcher.multipart.UploadedFile; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/CustomFreemarkerManager.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/CustomFreemarkerManager.java index 207a090047..45c58ab055 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/CustomFreemarkerManager.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/CustomFreemarkerManager.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.freemarker; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import org.apache.struts2.views.freemarker.FreemarkerManager; import org.apache.struts2.views.freemarker.ScopesHashModel; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/StandardTagsAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/StandardTagsAction.java index c79480ff06..36831c7800 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/StandardTagsAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/StandardTagsAction.java @@ -20,8 +20,8 @@ */ package org.apache.struts2.showcase.freemarker; -import com.opensymphony.xwork2.ActionSupport; -import com.opensymphony.xwork2.Preparable; +import org.apache.struts2.ActionSupport; +import org.apache.struts2.Preparable; import org.apache.struts2.interceptor.parameter.StrutsParameter; import java.text.DateFormatSymbols; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/GetUpdatedHangmanAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/GetUpdatedHangmanAction.java index 660c5e9e8b..83946bdff2 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/GetUpdatedHangmanAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/GetUpdatedHangmanAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.hangman; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import java.util.Map; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/GuessCharacterAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/GuessCharacterAction.java index 3df913d585..c823eabbc4 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/GuessCharacterAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/GuessCharacterAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.hangman; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.action.SessionAware; import org.apache.struts2.interceptor.parameter.StrutsParameter; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/StartHangmanAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/StartHangmanAction.java index bc4138a238..fe9f2333df 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/StartHangmanAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/StartHangmanAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.hangman; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import java.util.Map; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java index 60692b0e69..2ca9492a45 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java @@ -20,8 +20,8 @@ */ package org.apache.struts2.showcase.modelDriven; -import com.opensymphony.xwork2.ActionSupport; -import com.opensymphony.xwork2.ModelDriven; +import org.apache.struts2.ActionSupport; +import org.apache.struts2.ModelDriven; import org.apache.struts2.showcase.modelDriven.model.Gangster; /** diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPersonAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPersonAction.java index 8fbdee0b21..3e52dbf028 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPersonAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPersonAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.person; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.convention.annotation.Result; import org.apache.struts2.convention.annotation.Results; import org.apache.struts2.interceptor.parameter.StrutsParameter; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeopleAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeopleAction.java index 2d21587874..34e5d2f3cd 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeopleAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeopleAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.person; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.convention.annotation.Result; import org.springframework.beans.factory.annotation.Autowired; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/person/NewPersonAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/person/NewPersonAction.java index d5888af857..71054aa109 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/person/NewPersonAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/person/NewPersonAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.person; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.convention.annotation.Result; import org.apache.struts2.convention.annotation.Results; import org.apache.struts2.interceptor.parameter.StrutsParameter; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java index d1ba0a412b..2cd4b5a1b2 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java @@ -20,8 +20,8 @@ */ package org.apache.struts2.showcase.source; -import com.opensymphony.xwork2.ActionSupport; -import com.opensymphony.xwork2.util.ClassLoaderUtil; +import org.apache.struts2.ActionSupport; +import org.apache.struts2.util.ClassLoaderUtil; import org.apache.struts2.action.ServletContextAware; import org.apache.struts2.interceptor.parameter.StrutsParameter; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actionPrefix/SubmitAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actionPrefix/SubmitAction.java index 6e5afa8069..176e9449bb 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actionPrefix/SubmitAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actionPrefix/SubmitAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.tag.nonui.actionPrefix; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.interceptor.parameter.StrutsParameter; public class SubmitAction extends ActionSupport { diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actiontag/ActionTagDemo.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actiontag/ActionTagDemo.java index d39f877a2b..e105449edf 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actiontag/ActionTagDemo.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actiontag/ActionTagDemo.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.tag.nonui.actiontag; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; /** */ diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/debugtag/DebugTagAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/debugtag/DebugTagAction.java index 4d732fecdc..be740d506a 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/debugtag/DebugTagAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/debugtag/DebugTagAction.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.showcase.tag.nonui.debugtag; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.dispatcher.PrepareOperations; public class DebugTagAction extends ActionSupport { diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java index deca54ab07..ada4ccb686 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java @@ -20,8 +20,8 @@ */ package org.apache.struts2.showcase.tag.nonui.iteratortag; -import com.opensymphony.xwork2.ActionSupport; -import com.opensymphony.xwork2.Validateable; +import org.apache.struts2.ActionSupport; +import org.apache.struts2.Validateable; import org.apache.struts2.interceptor.parameter.StrutsParameter; /** diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java index ca66f63de6..735c38fd6f 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.tag.nonui.iteratortag; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.interceptor.parameter.StrutsParameter; /** diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java index 6bb4c9b1cb..33c5cdd59f 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java @@ -20,8 +20,8 @@ */ package org.apache.struts2.showcase.tag.nonui.iteratortag; -import com.opensymphony.xwork2.ActionSupport; -import com.opensymphony.xwork2.Validateable; +import org.apache.struts2.ActionSupport; +import org.apache.struts2.Validateable; import org.apache.struts2.interceptor.parameter.StrutsParameter; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java index ccbd310133..3d5567abe1 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java @@ -20,8 +20,8 @@ */ package org.apache.struts2.showcase.tag.nonui.iteratortag; -import com.opensymphony.xwork2.ActionSupport; -import com.opensymphony.xwork2.Validateable; +import org.apache.struts2.ActionSupport; +import org.apache.struts2.Validateable; import org.apache.struts2.interceptor.parameter.StrutsParameter; /** diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/tiles/TilesAnnotationsAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/tiles/TilesAnnotationsAction.java index 2b789c2d8c..f60a673e51 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/tiles/TilesAnnotationsAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/tiles/TilesAnnotationsAction.java @@ -24,7 +24,7 @@ import org.apache.struts2.tiles.annotation.TilesDefinition; import org.apache.struts2.tiles.annotation.TilesPutAttribute; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; @Namespace("/tiles") @ParentPackage("tiles") diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java index 297c19c754..0b731e325c 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java @@ -20,8 +20,8 @@ */ package org.apache.struts2.showcase.token; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionContext; +import org.apache.struts2.ActionSupport; import org.apache.struts2.interceptor.parameter.StrutsParameter; import java.util.Date; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AbstractValidationActionSupport.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AbstractValidationActionSupport.java index 53228a952f..775de00442 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AbstractValidationActionSupport.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AbstractValidationActionSupport.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.validation; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; /** */ diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AjaxFormSubmitAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AjaxFormSubmitAction.java index 4c831c754a..6fdafed611 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AjaxFormSubmitAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AjaxFormSubmitAction.java @@ -18,15 +18,15 @@ */ package org.apache.struts2.showcase.validation; -import com.opensymphony.xwork2.validator.annotations.DateRangeFieldValidator; -import com.opensymphony.xwork2.validator.annotations.EmailValidator; -import com.opensymphony.xwork2.validator.annotations.FieldExpressionValidator; -import com.opensymphony.xwork2.validator.annotations.IntRangeFieldValidator; -import com.opensymphony.xwork2.validator.annotations.RegexFieldValidator; -import com.opensymphony.xwork2.validator.annotations.RequiredFieldValidator; -import com.opensymphony.xwork2.validator.annotations.RequiredStringValidator; -import com.opensymphony.xwork2.validator.annotations.StringLengthFieldValidator; -import com.opensymphony.xwork2.validator.annotations.UrlValidator; +import org.apache.struts2.validator.annotations.DateRangeFieldValidator; +import org.apache.struts2.validator.annotations.EmailValidator; +import org.apache.struts2.validator.annotations.FieldExpressionValidator; +import org.apache.struts2.validator.annotations.IntRangeFieldValidator; +import org.apache.struts2.validator.annotations.RegexFieldValidator; +import org.apache.struts2.validator.annotations.RequiredFieldValidator; +import org.apache.struts2.validator.annotations.RequiredStringValidator; +import org.apache.struts2.validator.annotations.StringLengthFieldValidator; +import org.apache.struts2.validator.annotations.UrlValidator; import org.apache.struts2.interceptor.parameter.StrutsParameter; import java.sql.Date; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/BeanValidationExampleAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/BeanValidationExampleAction.java index 2383aa3ade..96a53942ea 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/BeanValidationExampleAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/BeanValidationExampleAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.validation; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts.beanvalidation.constraints.FieldMatch; import org.apache.struts2.convention.annotation.Action; import org.apache.struts2.convention.annotation.Namespace; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/QuizAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/QuizAction.java index 35fc1c3ca3..7ac1f15f74 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/QuizAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/QuizAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.validation; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.interceptor.parameter.StrutsParameter; /** diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/SubmitApplication.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/SubmitApplication.java index ca01f89939..bdaa8aa2c6 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/SubmitApplication.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/SubmitApplication.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.validation; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.interceptor.parameter.StrutsParameter; /** diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/wait/LongProcessAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/wait/LongProcessAction.java index cd14a36746..1814c0fa5d 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/wait/LongProcessAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/wait/LongProcessAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.wait; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import org.apache.struts2.interceptor.parameter.StrutsParameter; /** diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/xslt/JVMAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/xslt/JVMAction.java index 76f412e48d..0075e451e1 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/xslt/JVMAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/xslt/JVMAction.java @@ -20,7 +20,7 @@ */ package org.apache.struts2.showcase.xslt; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import jakarta.servlet.http.HttpServletRequest; diff --git a/apps/showcase/src/main/resources/log4j2.xml b/apps/showcase/src/main/resources/log4j2.xml index 33dafdd7ef..d7836c7179 100644 --- a/apps/showcase/src/main/resources/log4j2.xml +++ b/apps/showcase/src/main/resources/log4j2.xml @@ -30,6 +30,5 @@ - diff --git a/apps/showcase/src/main/webapp/WEB-INF/conversion/AddressAction.java.txt b/apps/showcase/src/main/webapp/WEB-INF/conversion/AddressAction.java.txt index 4342f8b219..c3e913b20d 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/conversion/AddressAction.java.txt +++ b/apps/showcase/src/main/webapp/WEB-INF/conversion/AddressAction.java.txt @@ -20,7 +20,7 @@ package org.apache.struts2.showcase.conversion; import java.util.LinkedHashSet; import java.util.Set; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; /** * @version $Date$ $Id$ @@ -28,15 +28,15 @@ import com.opensymphony.xwork2.ActionSupport; public class AddressAction extends ActionSupport { private Set addresses = new LinkedHashSet(); - + public Set getAddresses() { return addresses; } public void setAddresses(Set addresses) { this.addresses = addresses; } - - + + public String input() throws Exception { return SUCCESS; } - + public String submit() throws Exception { System.out.println(addresses); return SUCCESS; diff --git a/apps/showcase/src/main/webapp/WEB-INF/conversion/OperationsEnumAction.java.txt b/apps/showcase/src/main/webapp/WEB-INF/conversion/OperationsEnumAction.java.txt index 35e1175721..e2ad8d76cb 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/conversion/OperationsEnumAction.java.txt +++ b/apps/showcase/src/main/webapp/WEB-INF/conversion/OperationsEnumAction.java.txt @@ -21,28 +21,28 @@ import java.util.Arrays; import java.util.LinkedList; import java.util.List; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; /** - * + * * @version $Date$ $Id$ */ public class OperationsEnumAction extends ActionSupport { private static final long serialVersionUID = -2229489704988870318L; - + private List selectedOperations = new LinkedList(); - + public List getSelectedOperations() { return this.selectedOperations; } public void setSelectedOperations(List selectedOperations) { this.selectedOperations = selectedOperations; } - - + + public List getAvailableOperations() { return Arrays.asList(OperationsEnum.values()); } - + public String input() throws Exception { return SUCCESS; } diff --git a/apps/showcase/src/main/webapp/WEB-INF/conversion/PersonAction.java.txt b/apps/showcase/src/main/webapp/WEB-INF/conversion/PersonAction.java.txt index 1e0bd55e3a..fbbcf2dc4c 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/conversion/PersonAction.java.txt +++ b/apps/showcase/src/main/webapp/WEB-INF/conversion/PersonAction.java.txt @@ -19,24 +19,24 @@ package org.apache.struts2.showcase.conversion; import java.util.List; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; /** - * + * */ public class PersonAction extends ActionSupport { - + private List persons; - + public List getPersons() { return persons; } public void setPersons(List persons) { this.persons = persons; } - - - + + + public String input() throws Exception { return SUCCESS; } - + public String submit() throws Exception { return SUCCESS; } diff --git a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp index 9003e52ed2..27601a2e8d 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp @@ -31,11 +31,11 @@ // Calculate the view sources url String sourceUrl = request.getContextPath() + "/viewSource.action"; - com.opensymphony.xwork2.ActionInvocation inv = com.opensymphony.xwork2.ActionContext.getContext().getActionInvocation(); + org.apache.struts2.ActionInvocation inv = org.apache.struts2.ActionContext.getContext().getActionInvocation(); org.apache.struts2.dispatcher.mapper.ActionMapping mapping = org.apache.struts2.ServletActionContext.getActionMapping(); if (inv != null) { try { - com.opensymphony.xwork2.util.location.Location loc = inv.getProxy().getConfig().getLocation(); + org.apache.struts2.util.location.Location loc = inv.getProxy().getConfig().getLocation(); sourceUrl += "?config=" + (loc != null ? loc.getURI() + ":" + loc.getLineNumber() : ""); } catch (Exception e) { sourceUrl += "?config="; @@ -88,7 +88,7 @@ diff --git a/apps/showcase/src/main/webapp/WEB-INF/dwr.xml b/apps/showcase/src/main/webapp/WEB-INF/dwr.xml index e2ce2bef3c..2837fed6dc 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/dwr.xml +++ b/apps/showcase/src/main/webapp/WEB-INF/dwr.xml @@ -20,8 +20,8 @@ */ --> - @@ -29,7 +29,7 @@ - + diff --git a/core/pom.xml b/core/pom.xml index 49ffa39c9b..965351898c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -186,7 +186,7 @@ commons-text - + org.hibernate hibernate-core diff --git a/core/src/main/java/com/opensymphony/xwork2/config/package.html b/core/src/main/java/com/opensymphony/xwork2/config/package.html deleted file mode 100644 index eacf1c8f65..0000000000 --- a/core/src/main/java/com/opensymphony/xwork2/config/package.html +++ /dev/null @@ -1,21 +0,0 @@ - -Configuration core classes. diff --git a/core/src/main/java/com/opensymphony/xwork2/Action.java b/core/src/main/java/org/apache/struts2/Action.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/Action.java rename to core/src/main/java/org/apache/struts2/Action.java index 768ca26787..cc3fb83ac1 100644 --- a/core/src/main/java/com/opensymphony/xwork2/Action.java +++ b/core/src/main/java/org/apache/struts2/Action.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; /** * All actions may implement this interface, which exposes the execute() method. diff --git a/core/src/main/java/com/opensymphony/xwork2/ActionChainResult.java b/core/src/main/java/org/apache/struts2/ActionChainResult.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/ActionChainResult.java rename to core/src/main/java/org/apache/struts2/ActionChainResult.java index 6b6c2813e8..447601b42a 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ActionChainResult.java +++ b/core/src/main/java/org/apache/struts2/ActionChainResult.java @@ -16,13 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.TextParseUtil; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.TextParseUtil; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.struts2.StrutsException; import java.util.HashSet; import java.util.LinkedList; diff --git a/core/src/main/java/com/opensymphony/xwork2/ActionContext.java b/core/src/main/java/org/apache/struts2/ActionContext.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/ActionContext.java rename to core/src/main/java/org/apache/struts2/ActionContext.java index 629c65c80c..5bab85cac1 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ActionContext.java +++ b/core/src/main/java/org/apache/struts2/ActionContext.java @@ -16,13 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; -import com.opensymphony.xwork2.conversion.impl.ConversionData; -import com.opensymphony.xwork2.inject.Container; -import com.opensymphony.xwork2.util.ValueStack; -import org.apache.struts2.StrutsException; -import org.apache.struts2.StrutsStatics; +import org.apache.struts2.conversion.impl.ConversionData; +import org.apache.struts2.inject.Container; +import org.apache.struts2.util.ValueStack; import org.apache.struts2.dispatcher.HttpParameters; import org.apache.struts2.dispatcher.mapper.ActionMapping; @@ -66,7 +64,7 @@ public class ActionContext implements Serializable { private static final String ACTION_NAME = "org.apache.struts2.ActionContext.name"; /** - * Constant for the {@link com.opensymphony.xwork2.util.ValueStack OGNL value stack}. + * Constant for the {@link org.apache.struts2.util.ValueStack OGNL value stack}. */ private static final String VALUE_STACK = ValueStack.VALUE_STACK; @@ -91,7 +89,7 @@ public class ActionContext implements Serializable { private static final String LOCALE = "org.apache.struts2.ActionContext.locale"; /** - * Constant for the action's {@link com.opensymphony.xwork2.ActionInvocation invocation} context. + * Constant for the action's {@link ActionInvocation invocation} context. */ private static final String ACTION_INVOCATION = "org.apache.struts2.ActionContext.actionInvocation"; diff --git a/core/src/main/java/com/opensymphony/xwork2/ActionEventListener.java b/core/src/main/java/org/apache/struts2/ActionEventListener.java similarity index 94% rename from core/src/main/java/com/opensymphony/xwork2/ActionEventListener.java rename to core/src/main/java/org/apache/struts2/ActionEventListener.java index d125a683b6..ebecba3523 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ActionEventListener.java +++ b/core/src/main/java/org/apache/struts2/ActionEventListener.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; /** * Provides hooks for handling key action events diff --git a/core/src/main/java/com/opensymphony/xwork2/ActionInvocation.java b/core/src/main/java/org/apache/struts2/ActionInvocation.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/ActionInvocation.java rename to core/src/main/java/org/apache/struts2/ActionInvocation.java index 472f23ea7b..7ebdf62dc0 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ActionInvocation.java +++ b/core/src/main/java/org/apache/struts2/ActionInvocation.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; -import com.opensymphony.xwork2.interceptor.PreResultListener; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.interceptor.PreResultListener; +import org.apache.struts2.util.ValueStack; /** * An {@link ActionInvocation} represents the execution state of an {@link Action}. It holds the Interceptors and the Action instance. @@ -27,7 +27,7 @@ * Interceptors are all executed, and then the {@link Action} and the {@link Result}. * * @author Jason Carreira - * @see com.opensymphony.xwork2.ActionProxy + * @see ActionProxy */ public interface ActionInvocation { diff --git a/core/src/main/java/com/opensymphony/xwork2/ActionProxy.java b/core/src/main/java/org/apache/struts2/ActionProxy.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/ActionProxy.java rename to core/src/main/java/org/apache/struts2/ActionProxy.java index 5956714622..312870f6ac 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ActionProxy.java +++ b/core/src/main/java/org/apache/struts2/ActionProxy.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; -import com.opensymphony.xwork2.config.entities.ActionConfig; +import org.apache.struts2.config.entities.ActionConfig; /** * ActionProxy is an extra layer between XWork and the action so that different proxies are possible. @@ -26,7 +26,7 @@ *

* An example of this would be a remote proxy, where the layer between XWork and the action might be RMI or SOAP. *

- * + * * @author Jason Carreira */ public interface ActionProxy { @@ -103,5 +103,5 @@ public interface ActionProxy { * @return true if the method returned by getMethod() is not a default initializer value. */ boolean isMethodSpecified(); - + } diff --git a/core/src/main/java/com/opensymphony/xwork2/ActionProxyFactory.java b/core/src/main/java/org/apache/struts2/ActionProxyFactory.java similarity index 99% rename from core/src/main/java/com/opensymphony/xwork2/ActionProxyFactory.java rename to core/src/main/java/org/apache/struts2/ActionProxyFactory.java index 565afd12cf..5cd4eab66e 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ActionProxyFactory.java +++ b/core/src/main/java/org/apache/struts2/ActionProxyFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; import java.util.Map; @@ -81,5 +81,5 @@ public interface ActionProxyFactory { */ ActionProxy createActionProxy(ActionInvocation actionInvocation, String namespace, String actionName, String methodName, boolean executeResult, boolean cleanupContext); - + } diff --git a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java b/core/src/main/java/org/apache/struts2/ActionSupport.java similarity index 94% rename from core/src/main/java/com/opensymphony/xwork2/ActionSupport.java rename to core/src/main/java/org/apache/struts2/ActionSupport.java index 33a88be368..ef27b5669c 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java +++ b/core/src/main/java/org/apache/struts2/ActionSupport.java @@ -16,16 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; -import com.opensymphony.xwork2.conversion.impl.ConversionData; -import com.opensymphony.xwork2.inject.Container; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.interceptor.ValidationAware; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.conversion.impl.ConversionData; +import org.apache.struts2.inject.Container; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.interceptor.ValidationAware; +import org.apache.struts2.util.ValueStack; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.struts2.StrutsConstants; import java.io.Serializable; import java.util.Collection; @@ -205,7 +204,7 @@ public String input() throws Exception { *

* *

- * See also {@link com.opensymphony.xwork2.Action#execute()}. + * See also {@link org.apache.struts2.Action#execute()}. *

* * @return returns {@link #SUCCESS} @@ -312,9 +311,9 @@ public void pause(String result) { } /** - * If called first time it will create {@link com.opensymphony.xwork2.TextProviderFactory}, - * inject dependency (if {@link com.opensymphony.xwork2.inject.Container} is accesible) into in, - * then will create new {@link com.opensymphony.xwork2.TextProvider} and store it in a field + * If called first time it will create {@link TextProviderFactory}, + * inject dependency (if {@link Container} is accesible) into in, + * then will create new {@link TextProvider} and store it in a field * for future references and at the returns reference to that field * * @return reference to field with TextProvider diff --git a/core/src/main/java/com/opensymphony/xwork2/AsyncManager.java b/core/src/main/java/org/apache/struts2/AsyncManager.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/AsyncManager.java rename to core/src/main/java/org/apache/struts2/AsyncManager.java index a4dd071611..aa433919a2 100644 --- a/core/src/main/java/com/opensymphony/xwork2/AsyncManager.java +++ b/core/src/main/java/org/apache/struts2/AsyncManager.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; import java.util.concurrent.Callable; diff --git a/core/src/main/java/com/opensymphony/xwork2/CompositeTextProvider.java b/core/src/main/java/org/apache/struts2/CompositeTextProvider.java similarity index 90% rename from core/src/main/java/com/opensymphony/xwork2/CompositeTextProvider.java rename to core/src/main/java/org/apache/struts2/CompositeTextProvider.java index 4ab017c111..9790b5a606 100644 --- a/core/src/main/java/com/opensymphony/xwork2/CompositeTextProvider.java +++ b/core/src/main/java/org/apache/struts2/CompositeTextProvider.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -65,7 +65,7 @@ public CompositeTextProvider(TextProvider[] textProviders) { * @param key The key to lookup in resource bundles. * @return true, if the requested key is found in one of the resource bundles. * - * @see com.opensymphony.xwork2.TextProvider#hasKey(String) + * @see TextProvider#hasKey(String) * */ @Override @@ -85,7 +85,7 @@ public boolean hasKey(String key) { * * @param key The key to lookup in resource bundles. * @return The i18n text for the requested key. - * @see com.opensymphony.xwork2.TextProvider#getText(String) + * @see TextProvider#getText(String) */ @Override public String getText(String key) { @@ -99,7 +99,7 @@ public String getText(String key) { * @param key the message key * @param defaultValue the default value * @return the first valid message for the key or default value - * @see com.opensymphony.xwork2.TextProvider#getText(String, String) + * @see TextProvider#getText(String, String) */ @Override public String getText(String key, String defaultValue) { @@ -115,7 +115,7 @@ public String getText(String key, String defaultValue) { * @param defaultValue the default value * @param obj object * @return the first valid message for the key or default value - * @see com.opensymphony.xwork2.TextProvider#getText(String, String, String) + * @see TextProvider#getText(String, String, String) */ @Override public String getText(String key, String defaultValue, final String obj) { @@ -129,7 +129,7 @@ public String getText(String key, String defaultValue, final String obj) { * @param key the message key * @param args additional arguments * @return the first valid message for the key - * @see com.opensymphony.xwork2.TextProvider#getText(String, java.util.List) + * @see TextProvider#getText(String, java.util.List) */ @Override public String getText(String key, List args) { @@ -143,7 +143,7 @@ public String getText(String key, List args) { * @param key the message key * @param args additional arguments * @return the first valid message for the key or default value - * @see com.opensymphony.xwork2.TextProvider#getText(String, String[]) + * @see TextProvider#getText(String, String[]) */ @Override public String getText(String key, String[] args) { @@ -159,7 +159,7 @@ public String getText(String key, String[] args) { * @param defaultValue the default value * @param args additional arguments * @return the first valid message for the key or default value - * @see com.opensymphony.xwork2.TextProvider#getText(String, String, java.util.List) + * @see TextProvider#getText(String, String, java.util.List) */ @Override public String getText(String key, String defaultValue, List args) { @@ -184,7 +184,7 @@ public String getText(String key, String defaultValue, List args) { * @param defaultValue the default value * @param args additional arguments * @return the first valid message for the key or default value - * @see com.opensymphony.xwork2.TextProvider#getText(String, String, String[]) + * @see TextProvider#getText(String, String, String[]) */ @Override public String getText(String key, String defaultValue, String[] args) { @@ -210,7 +210,7 @@ public String getText(String key, String defaultValue, String[] args) { * @param args additional arguments * @param stack the value stack * @return the first valid message for the key or default value - * @see com.opensymphony.xwork2.TextProvider#getText(String, String, java.util.List, com.opensymphony.xwork2.util.ValueStack) + * @see TextProvider#getText(String, String, java.util.List, org.apache.struts2.util.ValueStack) */ @Override public String getText(String key, String defaultValue, List args, ValueStack stack) { @@ -235,7 +235,7 @@ public String getText(String key, String defaultValue, List args, ValueStack * @param args additional arguments * @param stack the value stack * @return the first valid message for the key or default value - * @see com.opensymphony.xwork2.TextProvider#getText(String, String, String[], com.opensymphony.xwork2.util.ValueStack) + * @see TextProvider#getText(String, String, String[], org.apache.struts2.util.ValueStack) */ @Override public String getText(String key, String defaultValue, String[] args, ValueStack stack) { @@ -273,7 +273,7 @@ public ResourceBundle getTexts(String bundleName) { } /** - * It will consult each {@link com.opensymphony.xwork2.TextProvider}s and return the first non-null {@link ResourceBundle}. + * It will consult each {@link TextProvider}s and return the first non-null {@link ResourceBundle}. * * @return the resource bundle * @see TextProvider#getTexts() diff --git a/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java b/core/src/main/java/org/apache/struts2/DefaultActionInvocation.java similarity index 94% rename from core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java rename to core/src/main/java/org/apache/struts2/DefaultActionInvocation.java index fe32bde351..cd8260a989 100644 --- a/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java +++ b/core/src/main/java/org/apache/struts2/DefaultActionInvocation.java @@ -16,26 +16,25 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; - -import com.opensymphony.xwork2.config.ConfigurationException; -import com.opensymphony.xwork2.config.entities.ActionConfig; -import com.opensymphony.xwork2.config.entities.InterceptorMapping; -import com.opensymphony.xwork2.config.entities.ResultConfig; -import com.opensymphony.xwork2.inject.Container; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.interceptor.ConditionalInterceptor; -import com.opensymphony.xwork2.interceptor.Interceptor; -import com.opensymphony.xwork2.interceptor.PreResultListener; -import com.opensymphony.xwork2.interceptor.WithLazyParams; -import com.opensymphony.xwork2.ognl.OgnlUtil; -import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.ValueStackFactory; +package org.apache.struts2; + +import org.apache.struts2.config.ConfigurationException; +import org.apache.struts2.config.entities.ActionConfig; +import org.apache.struts2.config.entities.InterceptorMapping; +import org.apache.struts2.config.entities.ResultConfig; +import org.apache.struts2.inject.Container; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.interceptor.ConditionalInterceptor; +import org.apache.struts2.interceptor.Interceptor; +import org.apache.struts2.interceptor.PreResultListener; +import org.apache.struts2.interceptor.WithLazyParams; +import org.apache.struts2.ognl.OgnlUtil; +import org.apache.struts2.util.ValueStack; +import org.apache.struts2.util.ValueStackFactory; import ognl.MethodFailedException; import ognl.NoSuchPropertyException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.struts2.StrutsException; import java.util.ArrayList; import java.util.Iterator; @@ -49,7 +48,7 @@ * @author Rainer Hermanns * @author tmjee * @version $Date$ $Id$ - * @see com.opensymphony.xwork2.DefaultActionProxy + * @see DefaultActionProxy */ public class DefaultActionInvocation implements ActionInvocation { @@ -190,7 +189,7 @@ public ValueStack getStack() { } /** - * Register a com.opensymphony.xwork2.interceptor.PreResultListener to be notified after the Action is executed and before the + * Register a org.apache.struts2.interceptor.PreResultListener to be notified after the Action is executed and before the * Result is executed. The ActionInvocation implementation must guarantee that listeners will be called in the order * in which they are registered. Listener registration and execution does not need to be thread-safe. * diff --git a/core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java b/core/src/main/java/org/apache/struts2/DefaultActionProxy.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java rename to core/src/main/java/org/apache/struts2/DefaultActionProxy.java index da8a9dbca6..82a5da14be 100644 --- a/core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java +++ b/core/src/main/java/org/apache/struts2/DefaultActionProxy.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; -import com.opensymphony.xwork2.config.Configuration; -import com.opensymphony.xwork2.config.ConfigurationException; -import com.opensymphony.xwork2.config.entities.ActionConfig; -import com.opensymphony.xwork2.inject.Inject; +import org.apache.struts2.config.Configuration; +import org.apache.struts2.config.ConfigurationException; +import org.apache.struts2.config.entities.ActionConfig; +import org.apache.struts2.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.apache.commons.text.StringEscapeUtils; import org.apache.logging.log4j.LogManager; diff --git a/core/src/main/java/com/opensymphony/xwork2/DefaultActionProxyFactory.java b/core/src/main/java/org/apache/struts2/DefaultActionProxyFactory.java similarity index 94% rename from core/src/main/java/com/opensymphony/xwork2/DefaultActionProxyFactory.java rename to core/src/main/java/org/apache/struts2/DefaultActionProxyFactory.java index 988c5099b3..c74c5c0b89 100644 --- a/core/src/main/java/com/opensymphony/xwork2/DefaultActionProxyFactory.java +++ b/core/src/main/java/org/apache/struts2/DefaultActionProxyFactory.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; -import com.opensymphony.xwork2.inject.Container; -import com.opensymphony.xwork2.inject.Inject; +import org.apache.struts2.inject.Container; +import org.apache.struts2.inject.Inject; import java.util.Map; /** - * Default factory for {@link com.opensymphony.xwork2.ActionProxyFactory}. + * Default factory for {@link org.apache.struts2.ActionProxyFactory}. * * @author Jason Carreira */ diff --git a/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java b/core/src/main/java/org/apache/struts2/DefaultLocaleProvider.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java rename to core/src/main/java/org/apache/struts2/DefaultLocaleProvider.java index 35f16191a8..4e6f8b9fd7 100644 --- a/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java +++ b/core/src/main/java/org/apache/struts2/DefaultLocaleProvider.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; import org.apache.commons.lang3.LocaleUtils; import org.apache.commons.lang3.StringUtils; diff --git a/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProviderFactory.java b/core/src/main/java/org/apache/struts2/DefaultLocaleProviderFactory.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProviderFactory.java rename to core/src/main/java/org/apache/struts2/DefaultLocaleProviderFactory.java index 7d04e010ca..b5f0e5271e 100644 --- a/core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProviderFactory.java +++ b/core/src/main/java/org/apache/struts2/DefaultLocaleProviderFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; public class DefaultLocaleProviderFactory implements LocaleProviderFactory { diff --git a/core/src/main/java/com/opensymphony/xwork2/DefaultTextProvider.java b/core/src/main/java/org/apache/struts2/DefaultTextProvider.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/DefaultTextProvider.java rename to core/src/main/java/org/apache/struts2/DefaultTextProvider.java index 6d7315a650..954e2ddae7 100644 --- a/core/src/main/java/com/opensymphony/xwork2/DefaultTextProvider.java +++ b/core/src/main/java/org/apache/struts2/DefaultTextProvider.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.ValueStack; import java.io.Serializable; import java.text.MessageFormat; diff --git a/core/src/main/java/com/opensymphony/xwork2/DefaultUnknownHandlerManager.java b/core/src/main/java/org/apache/struts2/DefaultUnknownHandlerManager.java similarity index 92% rename from core/src/main/java/com/opensymphony/xwork2/DefaultUnknownHandlerManager.java rename to core/src/main/java/org/apache/struts2/DefaultUnknownHandlerManager.java index 42f4a17cb2..d6d88cb8ac 100644 --- a/core/src/main/java/com/opensymphony/xwork2/DefaultUnknownHandlerManager.java +++ b/core/src/main/java/org/apache/struts2/DefaultUnknownHandlerManager.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; -import com.opensymphony.xwork2.config.Configuration; -import com.opensymphony.xwork2.config.ConfigurationException; -import com.opensymphony.xwork2.config.entities.ActionConfig; -import com.opensymphony.xwork2.config.entities.UnknownHandlerConfig; -import com.opensymphony.xwork2.inject.Container; -import com.opensymphony.xwork2.inject.Inject; +import org.apache.struts2.config.Configuration; +import org.apache.struts2.config.ConfigurationException; +import org.apache.struts2.config.entities.ActionConfig; +import org.apache.struts2.config.entities.UnknownHandlerConfig; +import org.apache.struts2.inject.Container; +import org.apache.struts2.inject.Inject; import java.util.ArrayList; import java.util.HashMap; @@ -33,7 +33,7 @@ /** * Default implementation of UnknownHandlerManager * - * @see com.opensymphony.xwork2.UnknownHandlerManager + * @see UnknownHandlerManager */ public class DefaultUnknownHandlerManager implements UnknownHandlerManager { diff --git a/core/src/main/java/com/opensymphony/xwork2/FileManager.java b/core/src/main/java/org/apache/struts2/FileManager.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/FileManager.java rename to core/src/main/java/org/apache/struts2/FileManager.java index 8c70aa90c8..f4d0d7cb1e 100644 --- a/core/src/main/java/com/opensymphony/xwork2/FileManager.java +++ b/core/src/main/java/org/apache/struts2/FileManager.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; import java.io.IOException; import java.io.InputStream; diff --git a/core/src/main/java/com/opensymphony/xwork2/FileManagerFactory.java b/core/src/main/java/org/apache/struts2/FileManagerFactory.java similarity index 85% rename from core/src/main/java/com/opensymphony/xwork2/FileManagerFactory.java rename to core/src/main/java/org/apache/struts2/FileManagerFactory.java index 5bedeaaca1..7aacd73cce 100644 --- a/core/src/main/java/com/opensymphony/xwork2/FileManagerFactory.java +++ b/core/src/main/java/org/apache/struts2/FileManagerFactory.java @@ -16,10 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; + +import org.apache.struts2.util.fs.DefaultFileManager; /** - * Factory that creates FileManager, default to {@link com.opensymphony.xwork2.util.fs.DefaultFileManager} + * Factory that creates FileManager, default to {@link DefaultFileManager} */ public interface FileManagerFactory { diff --git a/core/src/main/java/com/opensymphony/xwork2/LocaleProvider.java b/core/src/main/java/org/apache/struts2/LocaleProvider.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/LocaleProvider.java rename to core/src/main/java/org/apache/struts2/LocaleProvider.java index 00a41a25b3..0b502aa749 100644 --- a/core/src/main/java/com/opensymphony/xwork2/LocaleProvider.java +++ b/core/src/main/java/org/apache/struts2/LocaleProvider.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; import org.apache.commons.lang3.LocaleUtils; import org.apache.commons.lang3.StringUtils; diff --git a/core/src/main/java/com/opensymphony/xwork2/LocaleProviderFactory.java b/core/src/main/java/org/apache/struts2/LocaleProviderFactory.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/LocaleProviderFactory.java rename to core/src/main/java/org/apache/struts2/LocaleProviderFactory.java index df3363ef33..a2881c36d7 100644 --- a/core/src/main/java/com/opensymphony/xwork2/LocaleProviderFactory.java +++ b/core/src/main/java/org/apache/struts2/LocaleProviderFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; /** * Allows delegate creation of {@link LocaleProvider} to another implementation provided diff --git a/core/src/main/java/com/opensymphony/xwork2/LocalizedTextProvider.java b/core/src/main/java/org/apache/struts2/LocalizedTextProvider.java similarity index 95% rename from core/src/main/java/com/opensymphony/xwork2/LocalizedTextProvider.java rename to core/src/main/java/org/apache/struts2/LocalizedTextProvider.java index 0992ec7bd7..967a6d4781 100644 --- a/core/src/main/java/com/opensymphony/xwork2/LocalizedTextProvider.java +++ b/core/src/main/java/org/apache/struts2/LocalizedTextProvider.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import java.io.Serializable; import java.util.Locale; diff --git a/core/src/main/java/com/opensymphony/xwork2/ModelDriven.java b/core/src/main/java/org/apache/struts2/ModelDriven.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/ModelDriven.java rename to core/src/main/java/org/apache/struts2/ModelDriven.java index c07c6bbe76..0704109f15 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ModelDriven.java +++ b/core/src/main/java/org/apache/struts2/ModelDriven.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; /** * ModelDriven Actions provide a model object to be pushed onto the ValueStack diff --git a/core/src/main/java/com/opensymphony/xwork2/ObjectFactory.java b/core/src/main/java/org/apache/struts2/ObjectFactory.java similarity index 87% rename from core/src/main/java/com/opensymphony/xwork2/ObjectFactory.java rename to core/src/main/java/org/apache/struts2/ObjectFactory.java index 3a5c8f2660..32e273c87c 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ObjectFactory.java +++ b/core/src/main/java/org/apache/struts2/ObjectFactory.java @@ -16,32 +16,36 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; -import com.opensymphony.xwork2.config.ConfigurationException; -import com.opensymphony.xwork2.config.entities.ActionConfig; -import com.opensymphony.xwork2.config.entities.InterceptorConfig; -import com.opensymphony.xwork2.config.entities.ResultConfig; -import com.opensymphony.xwork2.conversion.TypeConverter; -import com.opensymphony.xwork2.factory.*; -import com.opensymphony.xwork2.inject.Container; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.interceptor.Interceptor; -import com.opensymphony.xwork2.util.ClassLoaderUtil; -import com.opensymphony.xwork2.validator.Validator; +import org.apache.struts2.config.ConfigurationException; +import org.apache.struts2.config.entities.ActionConfig; +import org.apache.struts2.config.entities.InterceptorConfig; +import org.apache.struts2.config.entities.ResultConfig; +import org.apache.struts2.conversion.TypeConverter; +import org.apache.struts2.inject.Container; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.interceptor.Interceptor; +import org.apache.struts2.util.ClassLoaderUtil; +import org.apache.struts2.validator.Validator; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.struts2.StrutsConstants; +import org.apache.struts2.factory.ActionFactory; +import org.apache.struts2.factory.ConverterFactory; +import org.apache.struts2.factory.InterceptorFactory; +import org.apache.struts2.factory.ResultFactory; +import org.apache.struts2.factory.UnknownHandlerFactory; +import org.apache.struts2.factory.ValidatorFactory; import java.io.Serializable; import java.util.Map; /** - * ObjectFactory is responsible for building the core framework objects. Users may register their + * ObjectFactory is responsible for building the core framework objects. Users may register their * own implementation of the ObjectFactory to control instantiation of these Objects. * *

- * This default implementation uses the {@link #buildBean(Class,java.util.Map) buildBean} + * This default implementation uses the {@link #buildBean(Class,java.util.Map) buildBean} * method to create all classes (interceptors, actions, results, etc). *

* @@ -135,7 +139,7 @@ public Class getClassInstance(String className) throws ClassNotFoundException { * @param actionName the name the action configuration is set up with in the configuration * @param namespace the namespace the action is configured in * @param config the action configuration found in the config for the actionName / namespace - * @param extraContext a Map of extra context which uses the same keys as the {@link com.opensymphony.xwork2.ActionContext} + * @param extraContext a Map of extra context which uses the same keys as the {@link org.apache.struts2.ActionContext} * @return instance of the action class to handle a web request * @throws Exception in case of any error */ @@ -147,7 +151,7 @@ public Object buildAction(String actionName, String namespace, ActionConfig conf * Build a generic Java object of the given type. * * @param clazz the type of Object to build - * @param extraContext a Map of extra context which uses the same keys as the {@link com.opensymphony.xwork2.ActionContext} + * @param extraContext a Map of extra context which uses the same keys as the {@link org.apache.struts2.ActionContext} * @return object for the given type * @throws Exception in case of any error */ @@ -171,19 +175,19 @@ protected Object injectInternalBeans(Object obj) { * Build a generic Java object of the given type. * * @param className the type of Object to build - * @param extraContext a Map of extra context which uses the same keys as the {@link com.opensymphony.xwork2.ActionContext} + * @param extraContext a Map of extra context which uses the same keys as the {@link org.apache.struts2.ActionContext} * @return object for the given type * @throws Exception in case of any error */ public Object buildBean(String className, Map extraContext) throws Exception { return buildBean(className, extraContext, true); } - + /** * Build a generic Java object of the given type. * * @param className the type of Object to build - * @param extraContext a Map of extra context which uses the same keys as the {@link com.opensymphony.xwork2.ActionContext} + * @param extraContext a Map of extra context which uses the same keys as the {@link org.apache.struts2.ActionContext} * @param injectInternal true if inject internal beans * @return object for the given type * @throws Exception in case of any error @@ -214,7 +218,7 @@ public Interceptor buildInterceptor(InterceptorConfig interceptorConfig, Map extraCo * * @param className the type of Validator to build * @param params property name -> value Map to set onto the Validator instance - * @param extraContext a Map of extra context which uses the same keys as the {@link com.opensymphony.xwork2.ActionContext} + * @param extraContext a Map of extra context which uses the same keys as the {@link org.apache.struts2.ActionContext} * * @return validator of the given type * @throws Exception in case of any error @@ -241,7 +245,7 @@ public Validator buildValidator(String className, Map params, Ma * Build converter of given type * * @param converterClass to instantiate - * @param extraContext a Map of extra context which uses the same keys as the {@link com.opensymphony.xwork2.ActionContext} + * @param extraContext a Map of extra context which uses the same keys as the {@link org.apache.struts2.ActionContext} * @return instance of converterClass with inject dependencies * @throws Exception in case of any error */ @@ -260,5 +264,5 @@ public TypeConverter buildConverter(Class converterClas public UnknownHandler buildUnknownHandler(String unknownHandlerName, Map extraContext) throws Exception { return unknownHandlerFactory.buildUnknownHandler(unknownHandlerName, extraContext); } - + } diff --git a/core/src/main/java/com/opensymphony/xwork2/Preparable.java b/core/src/main/java/org/apache/struts2/Preparable.java similarity index 86% rename from core/src/main/java/com/opensymphony/xwork2/Preparable.java rename to core/src/main/java/org/apache/struts2/Preparable.java index 23fdf68aec..dadbd90a82 100644 --- a/core/src/main/java/com/opensymphony/xwork2/Preparable.java +++ b/core/src/main/java/org/apache/struts2/Preparable.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; /** - * Preparable Actions will have their prepare() method called if the {@link com.opensymphony.xwork2.interceptor.PrepareInterceptor} + * Preparable Actions will have their prepare() method called if the {@link org.apache.struts2.interceptor.PrepareInterceptor} * is applied to the ActionConfig. * * @author Jason Carreira - * @see com.opensymphony.xwork2.interceptor.PrepareInterceptor + * @see org.apache.struts2.interceptor.PrepareInterceptor */ public interface Preparable { @@ -33,5 +33,5 @@ public interface Preparable { * @throws Exception thrown if a system level exception occurs. */ void prepare() throws Exception; - + } diff --git a/core/src/main/java/com/opensymphony/xwork2/ResourceBundleTextProvider.java b/core/src/main/java/org/apache/struts2/ResourceBundleTextProvider.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/ResourceBundleTextProvider.java rename to core/src/main/java/org/apache/struts2/ResourceBundleTextProvider.java index 97a783fe2b..b2ee3cad77 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ResourceBundleTextProvider.java +++ b/core/src/main/java/org/apache/struts2/ResourceBundleTextProvider.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; import java.util.ResourceBundle; diff --git a/core/src/main/java/com/opensymphony/xwork2/Result.java b/core/src/main/java/org/apache/struts2/Result.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/Result.java rename to core/src/main/java/org/apache/struts2/Result.java index 8c1687e5a6..407994eabb 100644 --- a/core/src/main/java/com/opensymphony/xwork2/Result.java +++ b/core/src/main/java/org/apache/struts2/Result.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; import java.io.Serializable; diff --git a/core/src/main/java/org/apache/struts2/ServletActionContext.java b/core/src/main/java/org/apache/struts2/ServletActionContext.java index e6038e302a..9efccfce50 100644 --- a/core/src/main/java/org/apache/struts2/ServletActionContext.java +++ b/core/src/main/java/org/apache/struts2/ServletActionContext.java @@ -18,8 +18,8 @@ */ package org.apache.struts2; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.ActionContext; +import org.apache.struts2.util.ValueStack; import jakarta.servlet.ServletContext; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/core/src/main/java/org/apache/struts2/StrutsConstants.java b/core/src/main/java/org/apache/struts2/StrutsConstants.java index 1f5b379290..85064e702f 100644 --- a/core/src/main/java/org/apache/struts2/StrutsConstants.java +++ b/core/src/main/java/org/apache/struts2/StrutsConstants.java @@ -19,6 +19,7 @@ package org.apache.struts2; import org.apache.struts2.components.date.DateFormatter; +import org.apache.struts2.conversion.impl.XWorkBasicConverter; import org.apache.struts2.dispatcher.mapper.CompositeActionMapper; /** @@ -73,7 +74,7 @@ public final class StrutsConstants { public static final String STRUTS_URL_RENDERER = "struts.urlRenderer"; - /** The com.opensymphony.xwork2.ObjectFactory implementation class */ + /** The org.apache.struts2.ObjectFactory implementation class */ public static final String STRUTS_OBJECTFACTORY = "struts.objectFactory"; public static final String STRUTS_OBJECTFACTORY_ACTIONFACTORY = "struts.objectFactory.actionFactory"; public static final String STRUTS_OBJECTFACTORY_RESULTFACTORY = "struts.objectFactory.resultFactory"; @@ -82,13 +83,13 @@ public final class StrutsConstants { public static final String STRUTS_OBJECTFACTORY_VALIDATORFACTORY = "struts.objectFactory.validatorFactory"; public static final String STRUTS_OBJECTFACTORY_UNKNOWNHANDLERFACTORY = "struts.objectFactory.unknownHandlerFactory"; - /** The com.opensymphony.xwork2.util.FileManager implementation class */ + /** The org.apache.struts2.util.FileManager implementation class */ public static final String STRUTS_FILE_MANAGER_FACTORY = "struts.fileManagerFactory"; - /** The com.opensymphony.xwork2.util.fs.FileManager implementation class */ + /** The org.apache.struts2.util.fs.FileManager implementation class */ public static final String STRUTS_FILE_MANAGER = "struts.fileManager"; - /** The com.opensymphony.xwork2.util.ObjectTypeDeterminer implementation class */ + /** The org.apache.struts2.util.ObjectTypeDeterminer implementation class */ public static final String STRUTS_OBJECTTYPEDETERMINER = "struts.objectTypeDeterminer"; /** The package containing actions that use Rife continuations */ @@ -240,7 +241,7 @@ public final class StrutsConstants { /** Fallback to empty namespace when request namespace didn't match any in action configuration */ public static final String STRUTS_ACTION_CONFIG_FALLBACK_TO_EMPTY_NAMESPACE = "struts.actionConfig.fallbackToEmptyNamespace"; - /** The {@link com.opensymphony.xwork2.LocaleProviderFactory} implementation class */ + /** The {@link org.apache.struts2.LocaleProviderFactory} implementation class */ public static final String STRUTS_LOCALE_PROVIDER_FACTORY = "struts.localeProviderFactory"; /** The name of the parameter to create when mapping an id (used by some action mappers) */ @@ -255,25 +256,25 @@ public final class StrutsConstants { public static final String STRUTS_OGNL_GUARD = "struts.ognlGuard"; - /** The com.opensymphony.xwork2.validator.ActionValidatorManager implementation class */ + /** The org.apache.struts2.validator.ActionValidatorManager implementation class */ public static final String STRUTS_ACTIONVALIDATORMANAGER = "struts.actionValidatorManager"; - /** The {@link com.opensymphony.xwork2.util.ValueStackFactory} implementation class */ + /** The {@link org.apache.struts2.util.ValueStackFactory} implementation class */ public static final String STRUTS_VALUESTACKFACTORY = "struts.valueStackFactory"; - /** The {@link com.opensymphony.xwork2.util.reflection.ReflectionProvider} implementation class */ + /** The {@link org.apache.struts2.util.reflection.ReflectionProvider} implementation class */ public static final String STRUTS_REFLECTIONPROVIDER = "struts.reflectionProvider"; - /** The {@link com.opensymphony.xwork2.util.reflection.ReflectionContextFactory} implementation class */ + /** The {@link org.apache.struts2.util.reflection.ReflectionContextFactory} implementation class */ public static final String STRUTS_REFLECTIONCONTEXTFACTORY = "struts.reflectionContextFactory"; - /** The {@link com.opensymphony.xwork2.util.PatternMatcher} implementation class */ + /** The {@link org.apache.struts2.util.PatternMatcher} implementation class */ public static final String STRUTS_PATTERNMATCHER = "struts.patternMatcher"; /** The {@link org.apache.struts2.dispatcher.StaticContentLoader} implementation class */ public static final String STRUTS_STATIC_CONTENT_LOADER = "struts.staticContentLoader"; - /** The {@link com.opensymphony.xwork2.UnknownHandlerManager} implementation class */ + /** The {@link org.apache.struts2.UnknownHandlerManager} implementation class */ public static final String STRUTS_UNKNOWN_HANDLER_MANAGER = "struts.unknownHandlerManager"; /** Throw RuntimeException when a property is not found, or the evaluation of the expression fails */ @@ -332,7 +333,7 @@ public final class StrutsConstants { /** * Specifies the type of cache to use for parsed OGNL expressions. Valid values defined in - * {@link com.opensymphony.xwork2.ognl.OgnlCacheFactory.CacheType}. + * {@link org.apache.struts2.ognl.OgnlCacheFactory.CacheType}. *
    *
  • For the W-TinyLfu cache, the eviction policy is detailed * here.
    • @@ -370,7 +371,7 @@ public final class StrutsConstants { /** The{@link org.apache.struts2.views.util.UrlHelper} implementation class */ public static final String STRUTS_URL_HELPER = "struts.view.urlHelper"; - /** {@link com.opensymphony.xwork2.conversion.impl.XWorkBasicConverter} */ + /** {@link XWorkBasicConverter} */ public static final String STRUTS_CONVERTER_COLLECTION = "struts.converter.collection"; public static final String STRUTS_CONVERTER_ARRAY = "struts.converter.array"; public static final String STRUTS_CONVERTER_DATE = "struts.converter.date"; @@ -462,7 +463,7 @@ public final class StrutsConstants { public static final String STRUTS_OGNL_AUTO_GROWTH_COLLECTION_LIMIT = "struts.ognl.autoGrowthCollectionLimit"; - /** See {@link com.opensymphony.xwork2.config.impl.AbstractMatcher#appendNamedParameters */ + /** See {@link org.apache.struts2.config.impl.AbstractMatcher#appendNamedParameters */ public static final String STRUTS_MATCHER_APPEND_NAMED_PARAMETERS = "struts.matcher.appendNamedParameters"; public static final String STRUTS_CHAINING_COPY_ERRORS = "struts.chaining.copyErrors"; diff --git a/core/src/main/java/org/apache/struts2/StrutsException.java b/core/src/main/java/org/apache/struts2/StrutsException.java index 9a7faa82b2..aad0223828 100644 --- a/core/src/main/java/org/apache/struts2/StrutsException.java +++ b/core/src/main/java/org/apache/struts2/StrutsException.java @@ -18,9 +18,9 @@ */ package org.apache.struts2; -import com.opensymphony.xwork2.util.location.Locatable; -import com.opensymphony.xwork2.util.location.Location; -import com.opensymphony.xwork2.util.location.LocationUtils; +import org.apache.struts2.util.location.Locatable; +import org.apache.struts2.util.location.Location; +import org.apache.struts2.util.location.LocationUtils; /** * A generic runtime exception that optionally contains Location information diff --git a/core/src/main/java/org/apache/struts2/StrutsStatics.java b/core/src/main/java/org/apache/struts2/StrutsStatics.java index 478bea734c..6ff9322261 100644 --- a/core/src/main/java/org/apache/struts2/StrutsStatics.java +++ b/core/src/main/java/org/apache/struts2/StrutsStatics.java @@ -31,27 +31,27 @@ public interface StrutsStatics { /** * Constant for the HTTP request object. */ - String HTTP_REQUEST = "com.opensymphony.xwork2.dispatcher.HttpServletRequest"; + String HTTP_REQUEST = "org.apache.struts2.dispatcher.HttpServletRequest"; /** * Constant for the HTTP response object. */ - String HTTP_RESPONSE = "com.opensymphony.xwork2.dispatcher.HttpServletResponse"; + String HTTP_RESPONSE = "org.apache.struts2.dispatcher.HttpServletResponse"; /** * Constant for an HTTP {@link jakarta.servlet.RequestDispatcher request dispatcher}. */ - String SERVLET_DISPATCHER = "com.opensymphony.xwork2.dispatcher.ServletDispatcher"; + String SERVLET_DISPATCHER = "org.apache.struts2.dispatcher.ServletDispatcher"; /** * Constant for the {@link jakarta.servlet.ServletContext servlet context} object. */ - String SERVLET_CONTEXT = "com.opensymphony.xwork2.dispatcher.ServletContext"; + String SERVLET_CONTEXT = "org.apache.struts2.dispatcher.ServletContext"; /** * Constant for the JSP {@link jakarta.servlet.jsp.PageContext page context}. */ - String PAGE_CONTEXT = "com.opensymphony.xwork2.dispatcher.PageContext"; + String PAGE_CONTEXT = "org.apache.struts2.dispatcher.PageContext"; /** * Set as an attribute in the request to let other parts of the framework know that the invocation is happening inside an diff --git a/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java b/core/src/main/java/org/apache/struts2/StrutsTextProviderFactory.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java rename to core/src/main/java/org/apache/struts2/StrutsTextProviderFactory.java index 5961d01e38..06a4617a04 100644 --- a/core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java +++ b/core/src/main/java/org/apache/struts2/StrutsTextProviderFactory.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; -import com.opensymphony.xwork2.inject.Inject; +import org.apache.struts2.inject.Inject; import java.util.ResourceBundle; diff --git a/core/src/main/java/com/opensymphony/xwork2/TextProvider.java b/core/src/main/java/org/apache/struts2/TextProvider.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/TextProvider.java rename to core/src/main/java/org/apache/struts2/TextProvider.java index 9ac7163c23..16924a7577 100644 --- a/core/src/main/java/com/opensymphony/xwork2/TextProvider.java +++ b/core/src/main/java/org/apache/struts2/TextProvider.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import java.util.List; import java.util.ResourceBundle; @@ -41,7 +41,7 @@ *

    * When you want to use your own implementation for Struts 2 project you have to define following * bean and constant in struts.xml: - * <bean class="org.demo.MyTextProvider" name="myTextProvider" type="com.opensymphony.xwork2.TextProvider" /> + * <bean class="org.demo.MyTextProvider" name="myTextProvider" type="org.apache.struts.TextProvider" /> * <constant name="struts.textProvider" value="myTextProvider" /> *

    * @@ -52,7 +52,7 @@ *

    * *

    - * Take a look on {@link com.opensymphony.xwork2.ActionSupport} for example TextProvider implementation. + * Take a look on {@link org.apache.struts2.ActionSupport} for example TextProvider implementation. *

    * @author Jason Carreira * @author Rainer Hermanns diff --git a/core/src/main/java/com/opensymphony/xwork2/TextProviderFactory.java b/core/src/main/java/org/apache/struts2/TextProviderFactory.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/TextProviderFactory.java rename to core/src/main/java/org/apache/struts2/TextProviderFactory.java index bad064178e..b7c5a1f5d3 100644 --- a/core/src/main/java/com/opensymphony/xwork2/TextProviderFactory.java +++ b/core/src/main/java/org/apache/struts2/TextProviderFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; import java.util.ResourceBundle; diff --git a/core/src/main/java/com/opensymphony/xwork2/TextProviderSupport.java b/core/src/main/java/org/apache/struts2/TextProviderSupport.java similarity index 99% rename from core/src/main/java/com/opensymphony/xwork2/TextProviderSupport.java rename to core/src/main/java/org/apache/struts2/TextProviderSupport.java index 7f8afbc9a4..cee8b86011 100644 --- a/core/src/main/java/com/opensymphony/xwork2/TextProviderSupport.java +++ b/core/src/main/java/org/apache/struts2/TextProviderSupport.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.ValueStack; import java.util.*; diff --git a/core/src/main/java/com/opensymphony/xwork2/Unchainable.java b/core/src/main/java/org/apache/struts2/Unchainable.java similarity index 90% rename from core/src/main/java/com/opensymphony/xwork2/Unchainable.java rename to core/src/main/java/org/apache/struts2/Unchainable.java index 9f96b92dc8..5ff75b0d99 100644 --- a/core/src/main/java/com/opensymphony/xwork2/Unchainable.java +++ b/core/src/main/java/org/apache/struts2/Unchainable.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; /** * Simple marker interface to indicate an object should not have its properties copied during chaining. * - * @see com.opensymphony.xwork2.interceptor.ChainingInterceptor + * @see org.apache.struts2.interceptor.ChainingInterceptor */ public interface Unchainable { } diff --git a/core/src/main/java/com/opensymphony/xwork2/UnknownHandler.java b/core/src/main/java/org/apache/struts2/UnknownHandler.java similarity index 92% rename from core/src/main/java/com/opensymphony/xwork2/UnknownHandler.java rename to core/src/main/java/org/apache/struts2/UnknownHandler.java index 5ae380225f..a763a01b6c 100644 --- a/core/src/main/java/com/opensymphony/xwork2/UnknownHandler.java +++ b/core/src/main/java/org/apache/struts2/UnknownHandler.java @@ -16,10 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; -import com.opensymphony.xwork2.config.entities.ActionConfig; -import org.apache.struts2.StrutsException; +import org.apache.struts2.config.entities.ActionConfig; /** * Handles cases when the result or action is unknown. @@ -29,21 +28,21 @@ *

    */ public interface UnknownHandler { - + /** * Handles the case when an action configuration is unknown. Implementations can return a new ActionConfig * to be used to process the request. - * + * * @param namespace The namespace * @param actionName The action name * @return An generated ActionConfig, can return null * @throws StrutsException in case of errors */ ActionConfig handleUnknownAction(String namespace, String actionName) throws StrutsException; - + /** - * Handles the case when a result cannot be found for an action and result code. - * + * Handles the case when a result cannot be found for an action and result code. + * * @param actionContext The action context * @param actionName The action name * @param actionConfig The action config @@ -52,10 +51,10 @@ public interface UnknownHandler { * @throws StrutsException in case of errors */ Result handleUnknownResult(ActionContext actionContext, String actionName, ActionConfig actionConfig, String resultCode) throws StrutsException; - + /** * Handles the case when an action method cannot be found. This method is responsible both for finding the method and executing it. - * + * * @since 2.1 * @param action The action object * @param methodName The method name to call diff --git a/core/src/main/java/com/opensymphony/xwork2/UnknownHandlerManager.java b/core/src/main/java/org/apache/struts2/UnknownHandlerManager.java similarity index 91% rename from core/src/main/java/com/opensymphony/xwork2/UnknownHandlerManager.java rename to core/src/main/java/org/apache/struts2/UnknownHandlerManager.java index 3e8246232c..8c7a330618 100644 --- a/core/src/main/java/com/opensymphony/xwork2/UnknownHandlerManager.java +++ b/core/src/main/java/org/apache/struts2/UnknownHandlerManager.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; -import com.opensymphony.xwork2.config.entities.ActionConfig; +import org.apache.struts2.config.entities.ActionConfig; import java.util.List; /** * An unknown handler manager contains a list of UnknownHandler and iterates on them by order * - * @see com.opensymphony.xwork2.DefaultUnknownHandlerManager + * @see org.apache.struts2.DefaultUnknownHandlerManager */ public interface UnknownHandlerManager { diff --git a/core/src/main/java/com/opensymphony/xwork2/Validateable.java b/core/src/main/java/org/apache/struts2/Validateable.java similarity index 90% rename from core/src/main/java/com/opensymphony/xwork2/Validateable.java rename to core/src/main/java/org/apache/struts2/Validateable.java index ed72263801..16f52670ab 100644 --- a/core/src/main/java/com/opensymphony/xwork2/Validateable.java +++ b/core/src/main/java/org/apache/struts2/Validateable.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; /** * Provides an interface in which a call for a validation check can be done. * * @author Jason Carreira * @see ActionSupport - * @see com.opensymphony.xwork2.interceptor.DefaultWorkflowInterceptor + * @see org.apache.struts2.interceptor.DefaultWorkflowInterceptor */ public interface Validateable { diff --git a/core/src/main/java/com/opensymphony/xwork2/ValidationAwareSupport.java b/core/src/main/java/org/apache/struts2/ValidationAwareSupport.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/ValidationAwareSupport.java rename to core/src/main/java/org/apache/struts2/ValidationAwareSupport.java index 385911c612..d014189399 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ValidationAwareSupport.java +++ b/core/src/main/java/org/apache/struts2/ValidationAwareSupport.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; -import com.opensymphony.xwork2.interceptor.ValidationAware; +import org.apache.struts2.interceptor.ValidationAware; import java.io.Serializable; import java.util.ArrayList; diff --git a/core/src/main/java/com/opensymphony/xwork2/XWorkJUnit4TestCase.java b/core/src/main/java/org/apache/struts2/XWorkJUnit4TestCase.java similarity index 80% rename from core/src/main/java/com/opensymphony/xwork2/XWorkJUnit4TestCase.java rename to core/src/main/java/org/apache/struts2/XWorkJUnit4TestCase.java index fe39c0c2a8..96afc8a4e1 100644 --- a/core/src/main/java/com/opensymphony/xwork2/XWorkJUnit4TestCase.java +++ b/core/src/main/java/org/apache/struts2/XWorkJUnit4TestCase.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; +package org.apache.struts2; -import com.opensymphony.xwork2.config.Configuration; -import com.opensymphony.xwork2.config.ConfigurationException; -import com.opensymphony.xwork2.config.ConfigurationManager; -import com.opensymphony.xwork2.config.ConfigurationProvider; -import com.opensymphony.xwork2.inject.Container; -import com.opensymphony.xwork2.inject.ContainerBuilder; -import com.opensymphony.xwork2.inject.Context; -import com.opensymphony.xwork2.inject.Factory; -import com.opensymphony.xwork2.inject.Scope; -import com.opensymphony.xwork2.test.StubConfigurationProvider; -import com.opensymphony.xwork2.util.XWorkTestCaseHelper; -import com.opensymphony.xwork2.util.location.LocatableProperties; +import org.apache.struts2.config.Configuration; +import org.apache.struts2.config.ConfigurationException; +import org.apache.struts2.config.ConfigurationManager; +import org.apache.struts2.config.ConfigurationProvider; +import org.apache.struts2.inject.Container; +import org.apache.struts2.inject.ContainerBuilder; +import org.apache.struts2.inject.Context; +import org.apache.struts2.inject.Factory; +import org.apache.struts2.inject.Scope; +import org.apache.struts2.test.StubConfigurationProvider; +import org.apache.struts2.util.XWorkTestCaseHelper; +import org.apache.struts2.util.location.LocatableProperties; import org.junit.After; import org.junit.Before; diff --git a/core/src/main/java/com/opensymphony/xwork2/XWorkTestCase.java b/core/src/main/java/org/apache/struts2/XWorkTestCase.java similarity index 87% rename from core/src/main/java/com/opensymphony/xwork2/XWorkTestCase.java rename to core/src/main/java/org/apache/struts2/XWorkTestCase.java index 56056703ef..fa31ea77b5 100644 --- a/core/src/main/java/com/opensymphony/xwork2/XWorkTestCase.java +++ b/core/src/main/java/org/apache/struts2/XWorkTestCase.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2; - -import com.opensymphony.xwork2.config.Configuration; -import com.opensymphony.xwork2.config.ConfigurationException; -import com.opensymphony.xwork2.config.ConfigurationManager; -import com.opensymphony.xwork2.config.ConfigurationProvider; -import com.opensymphony.xwork2.inject.Container; -import com.opensymphony.xwork2.inject.ContainerBuilder; -import com.opensymphony.xwork2.inject.Context; -import com.opensymphony.xwork2.inject.Factory; -import com.opensymphony.xwork2.inject.Scope; -import com.opensymphony.xwork2.test.StubConfigurationProvider; -import com.opensymphony.xwork2.util.XWorkTestCaseHelper; -import com.opensymphony.xwork2.util.location.LocatableProperties; +package org.apache.struts2; + +import org.apache.struts2.config.Configuration; +import org.apache.struts2.config.ConfigurationException; +import org.apache.struts2.config.ConfigurationManager; +import org.apache.struts2.config.ConfigurationProvider; +import org.apache.struts2.inject.Container; +import org.apache.struts2.inject.ContainerBuilder; +import org.apache.struts2.inject.Context; +import org.apache.struts2.inject.Factory; +import org.apache.struts2.inject.Scope; +import org.apache.struts2.test.StubConfigurationProvider; +import org.apache.struts2.util.XWorkTestCaseHelper; +import org.apache.struts2.util.location.LocatableProperties; import junit.framework.TestCase; import org.apache.commons.lang3.ClassUtils; diff --git a/core/src/main/java/org/apache/struts2/action/CspReportAction.java b/core/src/main/java/org/apache/struts2/action/CspReportAction.java index b4fee3937c..c8b6b7bc51 100644 --- a/core/src/main/java/org/apache/struts2/action/CspReportAction.java +++ b/core/src/main/java/org/apache/struts2/action/CspReportAction.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.action; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/core/src/main/java/org/apache/struts2/components/ActionComponent.java b/core/src/main/java/org/apache/struts2/components/ActionComponent.java index 96f417b03b..ee85a7aa1f 100644 --- a/core/src/main/java/org/apache/struts2/components/ActionComponent.java +++ b/core/src/main/java/org/apache/struts2/components/ActionComponent.java @@ -18,13 +18,13 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.ActionProxy; -import com.opensymphony.xwork2.ActionProxyFactory; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.ValueStackFactory; +import org.apache.struts2.ActionContext; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.ActionProxy; +import org.apache.struts2.ActionProxyFactory; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.ValueStack; +import org.apache.struts2.util.ValueStackFactory; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.jsp.PageContext; diff --git a/core/src/main/java/org/apache/struts2/components/ActionError.java b/core/src/main/java/org/apache/struts2/components/ActionError.java index aadb40fc81..d006aa34ba 100644 --- a/core/src/main/java/org/apache/struts2/components/ActionError.java +++ b/core/src/main/java/org/apache/struts2/components/ActionError.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import org.apache.commons.lang3.StringUtils; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; diff --git a/core/src/main/java/org/apache/struts2/components/ActionMessage.java b/core/src/main/java/org/apache/struts2/components/ActionMessage.java index 46ad4ef16c..8c68f5ba62 100644 --- a/core/src/main/java/org/apache/struts2/components/ActionMessage.java +++ b/core/src/main/java/org/apache/struts2/components/ActionMessage.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import org.apache.commons.lang3.StringUtils; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; diff --git a/core/src/main/java/org/apache/struts2/components/Anchor.java b/core/src/main/java/org/apache/struts2/components/Anchor.java index 8162c35691..d708b35e0c 100644 --- a/core/src/main/java/org/apache/struts2/components/Anchor.java +++ b/core/src/main/java/org/apache/struts2/components/Anchor.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.ValueStack; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; diff --git a/core/src/main/java/org/apache/struts2/components/AppendIterator.java b/core/src/main/java/org/apache/struts2/components/AppendIterator.java index 974840db17..7fb2985308 100644 --- a/core/src/main/java/org/apache/struts2/components/AppendIterator.java +++ b/core/src/main/java/org/apache/struts2/components/AppendIterator.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.components.Param.UnnamedParametric; diff --git a/core/src/main/java/org/apache/struts2/components/Bean.java b/core/src/main/java/org/apache/struts2/components/Bean.java index e8dc3b0a7a..db39cb16f5 100644 --- a/core/src/main/java/org/apache/struts2/components/Bean.java +++ b/core/src/main/java/org/apache/struts2/components/Bean.java @@ -18,12 +18,12 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.ObjectFactory; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.ObjectFactory; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.ValueStack; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; -import com.opensymphony.xwork2.util.reflection.ReflectionProvider; +import org.apache.struts2.util.reflection.ReflectionProvider; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; diff --git a/core/src/main/java/org/apache/struts2/components/Checkbox.java b/core/src/main/java/org/apache/struts2/components/Checkbox.java index 6c6160b9be..87c400d018 100644 --- a/core/src/main/java/org/apache/struts2/components/Checkbox.java +++ b/core/src/main/java/org/apache/struts2/components/Checkbox.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.ValueStack; import org.apache.struts2.StrutsConstants; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; diff --git a/core/src/main/java/org/apache/struts2/components/CheckboxList.java b/core/src/main/java/org/apache/struts2/components/CheckboxList.java index fe9a2436c3..acf8b44053 100644 --- a/core/src/main/java/org/apache/struts2/components/CheckboxList.java +++ b/core/src/main/java/org/apache/struts2/components/CheckboxList.java @@ -23,7 +23,7 @@ import org.apache.struts2.views.annotations.StrutsTag; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; /** * diff --git a/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java b/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java index db7230bdda..89d6444c25 100644 --- a/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java +++ b/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; import org.apache.struts2.views.annotations.StrutsTagAttribute; diff --git a/core/src/main/java/org/apache/struts2/components/ComboBox.java b/core/src/main/java/org/apache/struts2/components/ComboBox.java index 4f288fd93e..2ae6dfd34a 100644 --- a/core/src/main/java/org/apache/struts2/components/ComboBox.java +++ b/core/src/main/java/org/apache/struts2/components/ComboBox.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.util.MakeIterator; diff --git a/core/src/main/java/org/apache/struts2/components/Component.java b/core/src/main/java/org/apache/struts2/components/Component.java index d5633f7a89..e955ab0653 100644 --- a/core/src/main/java/org/apache/struts2/components/Component.java +++ b/core/src/main/java/org/apache/struts2/components/Component.java @@ -18,12 +18,12 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.security.NotExcludedAcceptedPatternsChecker; -import com.opensymphony.xwork2.util.TextParseUtil; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.ActionContext; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.security.NotExcludedAcceptedPatternsChecker; +import org.apache.struts2.util.TextParseUtil; +import org.apache.struts2.util.ValueStack; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.reflect.MethodUtils; diff --git a/core/src/main/java/org/apache/struts2/components/ComponentUrlProvider.java b/core/src/main/java/org/apache/struts2/components/ComponentUrlProvider.java index a2f55c51df..492e7170c0 100644 --- a/core/src/main/java/org/apache/struts2/components/ComponentUrlProvider.java +++ b/core/src/main/java/org/apache/struts2/components/ComponentUrlProvider.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/core/src/main/java/org/apache/struts2/components/ContextBean.java b/core/src/main/java/org/apache/struts2/components/ContextBean.java index 69f393a465..5d78d6d8ba 100644 --- a/core/src/main/java/org/apache/struts2/components/ContextBean.java +++ b/core/src/main/java/org/apache/struts2/components/ContextBean.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import org.apache.commons.lang3.StringUtils; import org.apache.struts2.views.annotations.StrutsTagAttribute; @@ -27,7 +27,7 @@ */ public abstract class ContextBean extends Component { protected String var; - + public ContextBean(ValueStack stack) { super(stack); } @@ -37,14 +37,14 @@ protected void putInContext(Object value) { stack.getContext().put(var, value); } } - + @StrutsTagAttribute(description="Name used to reference the value pushed into the Value Stack (scope: action).") public void setVar(String var) { if (var != null) { this.var = findString(var); } } - + protected String getVar() { return this.var; } diff --git a/core/src/main/java/org/apache/struts2/components/Date.java b/core/src/main/java/org/apache/struts2/components/Date.java index 2cded8f389..08d84ab778 100644 --- a/core/src/main/java/org/apache/struts2/components/Date.java +++ b/core/src/main/java/org/apache/struts2/components/Date.java @@ -18,9 +18,9 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.TextProvider; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.TextProvider; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.ValueStack; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.components.date.DateFormatter; diff --git a/core/src/main/java/org/apache/struts2/components/DateTextField.java b/core/src/main/java/org/apache/struts2/components/DateTextField.java index 76fb955154..314e376383 100644 --- a/core/src/main/java/org/apache/struts2/components/DateTextField.java +++ b/core/src/main/java/org/apache/struts2/components/DateTextField.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.views.annotations.StrutsTag; diff --git a/core/src/main/java/org/apache/struts2/components/Debug.java b/core/src/main/java/org/apache/struts2/components/Debug.java index 634b88f860..ddd228bf24 100644 --- a/core/src/main/java/org/apache/struts2/components/Debug.java +++ b/core/src/main/java/org/apache/struts2/components/Debug.java @@ -18,9 +18,9 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.reflection.ReflectionProvider; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.ValueStack; +import org.apache.struts2.util.reflection.ReflectionProvider; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.StrutsException; diff --git a/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java b/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java index 09fab37fbf..883557b711 100644 --- a/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java +++ b/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import org.apache.struts2.views.annotations.StrutsTagAttribute; import jakarta.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/components/DoubleSelect.java b/core/src/main/java/org/apache/struts2/components/DoubleSelect.java index cf102d2520..328c6684e4 100644 --- a/core/src/main/java/org/apache/struts2/components/DoubleSelect.java +++ b/core/src/main/java/org/apache/struts2/components/DoubleSelect.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import org.apache.commons.lang3.StringUtils; import org.apache.struts2.views.annotations.StrutsTag; diff --git a/core/src/main/java/org/apache/struts2/components/Else.java b/core/src/main/java/org/apache/struts2/components/Else.java index 6b697152ba..9f00a3a700 100644 --- a/core/src/main/java/org/apache/struts2/components/Else.java +++ b/core/src/main/java/org/apache/struts2/components/Else.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import org.apache.struts2.views.annotations.StrutsTag; import java.io.Writer; diff --git a/core/src/main/java/org/apache/struts2/components/ElseIf.java b/core/src/main/java/org/apache/struts2/components/ElseIf.java index 30f4a991c7..f98914c568 100644 --- a/core/src/main/java/org/apache/struts2/components/ElseIf.java +++ b/core/src/main/java/org/apache/struts2/components/ElseIf.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; diff --git a/core/src/main/java/org/apache/struts2/components/FieldError.java b/core/src/main/java/org/apache/struts2/components/FieldError.java index c044bfddb8..65a742026c 100644 --- a/core/src/main/java/org/apache/struts2/components/FieldError.java +++ b/core/src/main/java/org/apache/struts2/components/FieldError.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.components.Param.UnnamedParametric; diff --git a/core/src/main/java/org/apache/struts2/components/File.java b/core/src/main/java/org/apache/struts2/components/File.java index 605fd97f70..b36756da2c 100644 --- a/core/src/main/java/org/apache/struts2/components/File.java +++ b/core/src/main/java/org/apache/struts2/components/File.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.logging.log4j.LogManager; diff --git a/core/src/main/java/org/apache/struts2/components/Form.java b/core/src/main/java/org/apache/struts2/components/Form.java index 019e39bef2..d80d0e162a 100644 --- a/core/src/main/java/org/apache/struts2/components/Form.java +++ b/core/src/main/java/org/apache/struts2/components/Form.java @@ -18,21 +18,21 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.ObjectFactory; -import com.opensymphony.xwork2.config.Configuration; -import com.opensymphony.xwork2.config.RuntimeConfiguration; -import com.opensymphony.xwork2.config.entities.ActionConfig; -import com.opensymphony.xwork2.config.entities.InterceptorMapping; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.interceptor.MethodFilterInterceptorUtil; -import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.validator.ActionValidatorManager; -import com.opensymphony.xwork2.validator.FieldValidator; -import com.opensymphony.xwork2.validator.ValidationException; -import com.opensymphony.xwork2.validator.ValidationInterceptor; -import com.opensymphony.xwork2.validator.Validator; -import com.opensymphony.xwork2.validator.ValidatorContext; -import com.opensymphony.xwork2.validator.validators.VisitorFieldValidator; +import org.apache.struts2.ObjectFactory; +import org.apache.struts2.config.Configuration; +import org.apache.struts2.config.RuntimeConfiguration; +import org.apache.struts2.config.entities.ActionConfig; +import org.apache.struts2.config.entities.InterceptorMapping; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.interceptor.MethodFilterInterceptorUtil; +import org.apache.struts2.util.ValueStack; +import org.apache.struts2.validator.ActionValidatorManager; +import org.apache.struts2.validator.FieldValidator; +import org.apache.struts2.validator.ValidationException; +import org.apache.struts2.validator.ValidationInterceptor; +import org.apache.struts2.validator.Validator; +import org.apache.struts2.validator.ValidatorContext; +import org.apache.struts2.validator.validators.VisitorFieldValidator; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; diff --git a/core/src/main/java/org/apache/struts2/components/FormButton.java b/core/src/main/java/org/apache/struts2/components/FormButton.java index 914d050c9c..9c9074950b 100644 --- a/core/src/main/java/org/apache/struts2/components/FormButton.java +++ b/core/src/main/java/org/apache/struts2/components/FormButton.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.dispatcher.mapper.ActionMapping; diff --git a/core/src/main/java/org/apache/struts2/components/GenericUIBean.java b/core/src/main/java/org/apache/struts2/components/GenericUIBean.java index 2e0ac3cf1f..c54f37131c 100644 --- a/core/src/main/java/org/apache/struts2/components/GenericUIBean.java +++ b/core/src/main/java/org/apache/struts2/components/GenericUIBean.java @@ -24,7 +24,7 @@ import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.util.ContainUtil; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; /** * diff --git a/core/src/main/java/org/apache/struts2/components/Head.java b/core/src/main/java/org/apache/struts2/components/Head.java index 1bd28a9b1b..bd89baee63 100644 --- a/core/src/main/java/org/apache/struts2/components/Head.java +++ b/core/src/main/java/org/apache/struts2/components/Head.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.ValueStack; import org.apache.struts2.StrutsConstants; import org.apache.struts2.views.annotations.StrutsTag; diff --git a/core/src/main/java/org/apache/struts2/components/Hidden.java b/core/src/main/java/org/apache/struts2/components/Hidden.java index 205ad0cdf6..b8c16237e7 100644 --- a/core/src/main/java/org/apache/struts2/components/Hidden.java +++ b/core/src/main/java/org/apache/struts2/components/Hidden.java @@ -23,7 +23,7 @@ import org.apache.struts2.views.annotations.StrutsTag; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; /** * 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 49565fcbd7..44ff427df2 100644 --- a/core/src/main/java/org/apache/struts2/components/I18n.java +++ b/core/src/main/java/org/apache/struts2/components/I18n.java @@ -21,18 +21,17 @@ import java.io.Writer; import java.util.ResourceBundle; -import com.opensymphony.xwork2.LocaleProviderFactory; -import com.opensymphony.xwork2.LocalizedTextProvider; -import com.opensymphony.xwork2.TextProviderFactory; +import org.apache.struts2.LocaleProviderFactory; +import org.apache.struts2.LocalizedTextProvider; +import org.apache.struts2.TextProviderFactory; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.StrutsException; -import com.opensymphony.xwork2.LocaleProvider; -import com.opensymphony.xwork2.TextProvider; -import com.opensymphony.xwork2.inject.Container; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.LocaleProvider; +import org.apache.struts2.TextProvider; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.ValueStack; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/org/apache/struts2/components/If.java b/core/src/main/java/org/apache/struts2/components/If.java index 1ff0fc8f10..19ecf528ae 100644 --- a/core/src/main/java/org/apache/struts2/components/If.java +++ b/core/src/main/java/org/apache/struts2/components/If.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; diff --git a/core/src/main/java/org/apache/struts2/components/Include.java b/core/src/main/java/org/apache/struts2/components/Include.java index c78a11106b..8a0075cd29 100644 --- a/core/src/main/java/org/apache/struts2/components/Include.java +++ b/core/src/main/java/org/apache/struts2/components/Include.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.ValueStack; import jakarta.servlet.RequestDispatcher; import jakarta.servlet.ServletException; import jakarta.servlet.ServletOutputStream; diff --git a/core/src/main/java/org/apache/struts2/components/InputTransferSelect.java b/core/src/main/java/org/apache/struts2/components/InputTransferSelect.java index 585f4c803e..64802b2ed0 100644 --- a/core/src/main/java/org/apache/struts2/components/InputTransferSelect.java +++ b/core/src/main/java/org/apache/struts2/components/InputTransferSelect.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; diff --git a/core/src/main/java/org/apache/struts2/components/IteratorComponent.java b/core/src/main/java/org/apache/struts2/components/IteratorComponent.java index 1a87c53ce1..f45452ddfe 100644 --- a/core/src/main/java/org/apache/struts2/components/IteratorComponent.java +++ b/core/src/main/java/org/apache/struts2/components/IteratorComponent.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.ValueStack; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.ognl.ThreadAllowlist; diff --git a/core/src/main/java/org/apache/struts2/components/Label.java b/core/src/main/java/org/apache/struts2/components/Label.java index 787f0f6583..1a2f527605 100644 --- a/core/src/main/java/org/apache/struts2/components/Label.java +++ b/core/src/main/java/org/apache/struts2/components/Label.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.util.TextProviderHelper; diff --git a/core/src/main/java/org/apache/struts2/components/Link.java b/core/src/main/java/org/apache/struts2/components/Link.java index e147f58ac6..5c29765f73 100644 --- a/core/src/main/java/org/apache/struts2/components/Link.java +++ b/core/src/main/java/org/apache/struts2/components/Link.java @@ -19,7 +19,7 @@ package org.apache.struts2.components; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; diff --git a/core/src/main/java/org/apache/struts2/components/ListUIBean.java b/core/src/main/java/org/apache/struts2/components/ListUIBean.java index 2e7d6587de..5b23ab5736 100644 --- a/core/src/main/java/org/apache/struts2/components/ListUIBean.java +++ b/core/src/main/java/org/apache/struts2/components/ListUIBean.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import org.apache.commons.lang3.StringUtils; import org.apache.struts2.util.ContainUtil; import org.apache.struts2.util.MakeIterator; diff --git a/core/src/main/java/org/apache/struts2/components/MergeIterator.java b/core/src/main/java/org/apache/struts2/components/MergeIterator.java index 861d85d4c0..bb69ccfa68 100644 --- a/core/src/main/java/org/apache/struts2/components/MergeIterator.java +++ b/core/src/main/java/org/apache/struts2/components/MergeIterator.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.components.Param.UnnamedParametric; diff --git a/core/src/main/java/org/apache/struts2/components/Number.java b/core/src/main/java/org/apache/struts2/components/Number.java index f1e1d79b18..db101faff4 100644 --- a/core/src/main/java/org/apache/struts2/components/Number.java +++ b/core/src/main/java/org/apache/struts2/components/Number.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.ActionContext; +import org.apache.struts2.util.ValueStack; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.views.annotations.StrutsTag; diff --git a/core/src/main/java/org/apache/struts2/components/OptGroup.java b/core/src/main/java/org/apache/struts2/components/OptGroup.java index d7fae9fa6b..9dda53468f 100644 --- a/core/src/main/java/org/apache/struts2/components/OptGroup.java +++ b/core/src/main/java/org/apache/struts2/components/OptGroup.java @@ -18,9 +18,9 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.inject.Container; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.inject.Container; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.ValueStack; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.logging.log4j.LogManager; diff --git a/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java b/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java index 6e340ce1d0..d3fd9ed7cd 100644 --- a/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java +++ b/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; diff --git a/core/src/main/java/org/apache/struts2/components/Param.java b/core/src/main/java/org/apache/struts2/components/Param.java index c2c299e7ec..6fcd70a2eb 100644 --- a/core/src/main/java/org/apache/struts2/components/Param.java +++ b/core/src/main/java/org/apache/struts2/components/Param.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import org.apache.commons.lang3.StringUtils; import org.apache.struts2.StrutsException; import org.apache.struts2.views.annotations.StrutsTag; @@ -179,12 +179,12 @@ public void setName(String name) { public void setValue(String value) { this.value = value; } - + @StrutsTagAttribute(description="Whether to suppress empty parameters", type="Boolean", defaultValue="false") public void setSuppressEmptyParameters(boolean suppressEmptyParameters) { this.suppressEmptyParameters = suppressEmptyParameters; } - + /** *

    * Tags can implement this to support nested param tags without the name attribute. diff --git a/core/src/main/java/org/apache/struts2/components/Password.java b/core/src/main/java/org/apache/struts2/components/Password.java index 637cca00a0..471f7dbd24 100644 --- a/core/src/main/java/org/apache/struts2/components/Password.java +++ b/core/src/main/java/org/apache/struts2/components/Password.java @@ -24,7 +24,7 @@ import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; /** * diff --git a/core/src/main/java/org/apache/struts2/components/Property.java b/core/src/main/java/org/apache/struts2/components/Property.java index 4351a8507f..f57bd1cb48 100644 --- a/core/src/main/java/org/apache/struts2/components/Property.java +++ b/core/src/main/java/org/apache/struts2/components/Property.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import org.apache.commons.text.StringEscapeUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/org/apache/struts2/components/Push.java b/core/src/main/java/org/apache/struts2/components/Push.java index c2752e0bff..94494d366b 100644 --- a/core/src/main/java/org/apache/struts2/components/Push.java +++ b/core/src/main/java/org/apache/struts2/components/Push.java @@ -23,7 +23,7 @@ import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; /** * @@ -145,5 +145,5 @@ public boolean end(Writer writer, String body) { public void setValue(String value) { this.value = value; } - + } diff --git a/core/src/main/java/org/apache/struts2/components/Radio.java b/core/src/main/java/org/apache/struts2/components/Radio.java index 2b53484d06..d0d3eb1465 100644 --- a/core/src/main/java/org/apache/struts2/components/Radio.java +++ b/core/src/main/java/org/apache/struts2/components/Radio.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.views.annotations.StrutsTag; diff --git a/core/src/main/java/org/apache/struts2/components/Reset.java b/core/src/main/java/org/apache/struts2/components/Reset.java index 5da1b49368..c1ec34ca2b 100644 --- a/core/src/main/java/org/apache/struts2/components/Reset.java +++ b/core/src/main/java/org/apache/struts2/components/Reset.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; diff --git a/core/src/main/java/org/apache/struts2/components/Script.java b/core/src/main/java/org/apache/struts2/components/Script.java index cc4061bf06..6cb14bc95d 100644 --- a/core/src/main/java/org/apache/struts2/components/Script.java +++ b/core/src/main/java/org/apache/struts2/components/Script.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; @@ -128,7 +128,7 @@ public void setCrossorigin(String crossorigin) { public boolean usesBody() { return true; } - + @Override protected void evaluateExtraParams() { super.evaluateExtraParams(); diff --git a/core/src/main/java/org/apache/struts2/components/Select.java b/core/src/main/java/org/apache/struts2/components/Select.java index adc19c86e1..f1a8e5b6df 100644 --- a/core/src/main/java/org/apache/struts2/components/Select.java +++ b/core/src/main/java/org/apache/struts2/components/Select.java @@ -24,7 +24,7 @@ import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; /** * diff --git a/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java b/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java index ab87b77ad7..1651904ea2 100644 --- a/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java +++ b/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java @@ -18,11 +18,11 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.config.entities.ActionConfig; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.ActionContext; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.config.entities.ActionConfig; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.ValueStack; import jakarta.servlet.RequestDispatcher; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; diff --git a/core/src/main/java/org/apache/struts2/components/Set.java b/core/src/main/java/org/apache/struts2/components/Set.java index 750763050c..19198e4e57 100644 --- a/core/src/main/java/org/apache/struts2/components/Set.java +++ b/core/src/main/java/org/apache/struts2/components/Set.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import org.apache.struts2.dispatcher.DispatcherConstants; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; diff --git a/core/src/main/java/org/apache/struts2/components/Submit.java b/core/src/main/java/org/apache/struts2/components/Submit.java index eceb5df3dd..47024e99c9 100644 --- a/core/src/main/java/org/apache/struts2/components/Submit.java +++ b/core/src/main/java/org/apache/struts2/components/Submit.java @@ -26,7 +26,7 @@ import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; diff --git a/core/src/main/java/org/apache/struts2/components/Text.java b/core/src/main/java/org/apache/struts2/components/Text.java index 38cde39cec..4f9ea316d6 100644 --- a/core/src/main/java/org/apache/struts2/components/Text.java +++ b/core/src/main/java/org/apache/struts2/components/Text.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import org.apache.commons.text.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; @@ -52,7 +52,7 @@ * tag will be used as default message. If no value is found, the key of the * message will not be written out. *

    - * + * *

    * Note: If the var attribute is used with this tag, the tag's value will * not be written out. Instead the result will be saved into the @@ -146,7 +146,7 @@ public void setName(String name) { public void setEscapeHtml(boolean escape) { this.escapeHtml = escape; } - + @StrutsTagAttribute(description="Whether to escape Javascript", type="Boolean", defaultValue="false") public void setEscapeJavaScript(boolean escapeJavaScript) { this.escapeJavaScript = escapeJavaScript; diff --git a/core/src/main/java/org/apache/struts2/components/TextArea.java b/core/src/main/java/org/apache/struts2/components/TextArea.java index b61f595cbc..7f3babf561 100644 --- a/core/src/main/java/org/apache/struts2/components/TextArea.java +++ b/core/src/main/java/org/apache/struts2/components/TextArea.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; diff --git a/core/src/main/java/org/apache/struts2/components/TextField.java b/core/src/main/java/org/apache/struts2/components/TextField.java index f03ef8024c..90f50e5194 100644 --- a/core/src/main/java/org/apache/struts2/components/TextField.java +++ b/core/src/main/java/org/apache/struts2/components/TextField.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.views.annotations.StrutsTagAttribute; diff --git a/core/src/main/java/org/apache/struts2/components/Token.java b/core/src/main/java/org/apache/struts2/components/Token.java index 89d5e2394e..0405fe37b5 100644 --- a/core/src/main/java/org/apache/struts2/components/Token.java +++ b/core/src/main/java/org/apache/struts2/components/Token.java @@ -26,7 +26,7 @@ import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.util.TokenHelper; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; /** * diff --git a/core/src/main/java/org/apache/struts2/components/UIBean.java b/core/src/main/java/org/apache/struts2/components/UIBean.java index ff89c035da..67fbf78c50 100644 --- a/core/src/main/java/org/apache/struts2/components/UIBean.java +++ b/core/src/main/java/org/apache/struts2/components/UIBean.java @@ -18,10 +18,10 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.config.ConfigurationException; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.TextParseUtil; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.config.ConfigurationException; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.TextParseUtil; +import org.apache.struts2.util.ValueStack; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.lang3.ObjectUtils; diff --git a/core/src/main/java/org/apache/struts2/components/URL.java b/core/src/main/java/org/apache/struts2/components/URL.java index 2da816f658..16b6b5a59b 100644 --- a/core/src/main/java/org/apache/struts2/components/URL.java +++ b/core/src/main/java/org/apache/struts2/components/URL.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.ValueStack; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.StrutsConstants; diff --git a/core/src/main/java/org/apache/struts2/components/UpDownSelect.java b/core/src/main/java/org/apache/struts2/components/UpDownSelect.java index 2c6c0d287a..928864026f 100644 --- a/core/src/main/java/org/apache/struts2/components/UpDownSelect.java +++ b/core/src/main/java/org/apache/struts2/components/UpDownSelect.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; diff --git a/core/src/main/java/org/apache/struts2/components/UrlProvider.java b/core/src/main/java/org/apache/struts2/components/UrlProvider.java index cf1e56256a..477a8b6c26 100644 --- a/core/src/main/java/org/apache/struts2/components/UrlProvider.java +++ b/core/src/main/java/org/apache/struts2/components/UrlProvider.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/core/src/main/java/org/apache/struts2/components/date/DateTimeFormatterAdapter.java b/core/src/main/java/org/apache/struts2/components/date/DateTimeFormatterAdapter.java index 05767ab1b3..f68236414b 100644 --- a/core/src/main/java/org/apache/struts2/components/date/DateTimeFormatterAdapter.java +++ b/core/src/main/java/org/apache/struts2/components/date/DateTimeFormatterAdapter.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components.date; -import com.opensymphony.xwork2.ActionContext; +import org.apache.struts2.ActionContext; import java.time.format.DateTimeFormatter; import java.time.format.FormatStyle; diff --git a/core/src/main/java/org/apache/struts2/components/date/SimpleDateFormatAdapter.java b/core/src/main/java/org/apache/struts2/components/date/SimpleDateFormatAdapter.java index b7cf5441ac..8babfca475 100644 --- a/core/src/main/java/org/apache/struts2/components/date/SimpleDateFormatAdapter.java +++ b/core/src/main/java/org/apache/struts2/components/date/SimpleDateFormatAdapter.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components.date; -import com.opensymphony.xwork2.ActionContext; +import org.apache.struts2.ActionContext; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java b/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java index e8b5743f7b..9ebcd116d1 100644 --- a/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java +++ b/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.components.template; -import com.opensymphony.xwork2.util.ClassLoaderUtil; +import org.apache.struts2.util.ClassLoaderUtil; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.ServletActionContext; diff --git a/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java b/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java index 2f46a42ed9..99c1d4797f 100644 --- a/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java +++ b/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java @@ -18,11 +18,11 @@ */ package org.apache.struts2.components.template; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.ClassLoaderUtil; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.ActionContext; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.ClassLoaderUtil; +import org.apache.struts2.util.ValueStack; import freemarker.core.ParseException; import freemarker.template.Configuration; import freemarker.template.SimpleHash; diff --git a/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java b/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java index 7707a050c1..790f3d8591 100644 --- a/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java +++ b/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.components.template; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.ValueStack; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.jsp.PageContext; import org.apache.logging.log4j.LogManager; diff --git a/core/src/main/java/org/apache/struts2/components/template/TemplateEngineManager.java b/core/src/main/java/org/apache/struts2/components/template/TemplateEngineManager.java index e46c61a5e2..3e7b8cfd59 100644 --- a/core/src/main/java/org/apache/struts2/components/template/TemplateEngineManager.java +++ b/core/src/main/java/org/apache/struts2/components/template/TemplateEngineManager.java @@ -18,9 +18,9 @@ */ package org.apache.struts2.components.template; -import com.opensymphony.xwork2.config.ConfigurationException; -import com.opensymphony.xwork2.inject.Container; -import com.opensymphony.xwork2.inject.Inject; +import org.apache.struts2.config.ConfigurationException; +import org.apache.struts2.inject.Container; +import org.apache.struts2.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.apache.struts2.StrutsConstants; diff --git a/core/src/main/java/org/apache/struts2/components/template/TemplateRenderingContext.java b/core/src/main/java/org/apache/struts2/components/template/TemplateRenderingContext.java index 7b639d85d1..50251a106f 100644 --- a/core/src/main/java/org/apache/struts2/components/template/TemplateRenderingContext.java +++ b/core/src/main/java/org/apache/struts2/components/template/TemplateRenderingContext.java @@ -23,7 +23,7 @@ import org.apache.struts2.components.UIBean; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; /** * Context used when rendering templates. diff --git a/core/src/main/java/org/apache/struts2/config/AbstractBeanSelectionProvider.java b/core/src/main/java/org/apache/struts2/config/AbstractBeanSelectionProvider.java index f672ae0418..e0b08bd6b8 100644 --- a/core/src/main/java/org/apache/struts2/config/AbstractBeanSelectionProvider.java +++ b/core/src/main/java/org/apache/struts2/config/AbstractBeanSelectionProvider.java @@ -18,14 +18,19 @@ */ package org.apache.struts2.config; -import com.opensymphony.xwork2.ObjectFactory; -import com.opensymphony.xwork2.config.BeanSelectionProvider; -import com.opensymphony.xwork2.config.Configuration; -import com.opensymphony.xwork2.config.ConfigurationException; -import com.opensymphony.xwork2.inject.*; -import com.opensymphony.xwork2.util.ClassLoaderUtil; +import org.apache.struts2.ObjectFactory; +import org.apache.struts2.config.BeanSelectionProvider; +import org.apache.struts2.config.Configuration; +import org.apache.struts2.config.ConfigurationException; +import org.apache.struts2.inject.*; +import org.apache.struts2.util.ClassLoaderUtil; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.struts2.inject.Container; +import org.apache.struts2.inject.ContainerBuilder; +import org.apache.struts2.inject.Context; +import org.apache.struts2.inject.Factory; +import org.apache.struts2.inject.Scope; import java.util.Properties; diff --git a/core/src/main/java/com/opensymphony/xwork2/config/BeanSelectionProvider.java b/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java similarity index 95% rename from core/src/main/java/com/opensymphony/xwork2/config/BeanSelectionProvider.java rename to core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java index 687943d364..be5e9e8ed1 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/BeanSelectionProvider.java +++ b/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config; +package org.apache.struts2.config; /** * When implemented allows to alias already existing beans diff --git a/core/src/main/java/com/opensymphony/xwork2/config/Configuration.java b/core/src/main/java/org/apache/struts2/config/Configuration.java similarity index 92% rename from core/src/main/java/com/opensymphony/xwork2/config/Configuration.java rename to core/src/main/java/org/apache/struts2/config/Configuration.java index 3f170b19d6..131a62263a 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/Configuration.java +++ b/core/src/main/java/org/apache/struts2/config/Configuration.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config; +package org.apache.struts2.config; -import com.opensymphony.xwork2.config.entities.PackageConfig; -import com.opensymphony.xwork2.config.entities.UnknownHandlerConfig; -import com.opensymphony.xwork2.inject.Container; +import org.apache.struts2.config.entities.PackageConfig; +import org.apache.struts2.config.entities.UnknownHandlerConfig; +import org.apache.struts2.inject.Container; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/opensymphony/xwork2/config/ConfigurationException.java b/core/src/main/java/org/apache/struts2/config/ConfigurationException.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/config/ConfigurationException.java rename to core/src/main/java/org/apache/struts2/config/ConfigurationException.java index b9c34247b8..e98bdc576e 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/ConfigurationException.java +++ b/core/src/main/java/org/apache/struts2/config/ConfigurationException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config; +package org.apache.struts2.config; import org.apache.struts2.StrutsException; diff --git a/core/src/main/java/com/opensymphony/xwork2/config/ConfigurationManager.java b/core/src/main/java/org/apache/struts2/config/ConfigurationManager.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/config/ConfigurationManager.java rename to core/src/main/java/org/apache/struts2/config/ConfigurationManager.java index 49517eedf1..d9bbc4acaf 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/ConfigurationManager.java +++ b/core/src/main/java/org/apache/struts2/config/ConfigurationManager.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config; +package org.apache.struts2.config; -import com.opensymphony.xwork2.config.impl.DefaultConfiguration; -import com.opensymphony.xwork2.config.providers.StrutsDefaultConfigurationProvider; +import org.apache.struts2.config.impl.DefaultConfiguration; +import org.apache.struts2.config.providers.StrutsDefaultConfigurationProvider; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -55,7 +55,7 @@ public ConfigurationManager(String name) { /** * @return the current XWork configuration object. By default an instance of DefaultConfiguration will be returned * - * @see com.opensymphony.xwork2.config.impl.DefaultConfiguration + * @see org.apache.struts2.config.impl.DefaultConfiguration */ public synchronized Configuration getConfiguration() { if (wasConfigInitialised()) { diff --git a/core/src/main/java/com/opensymphony/xwork2/config/ConfigurationProvider.java b/core/src/main/java/org/apache/struts2/config/ConfigurationProvider.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/config/ConfigurationProvider.java rename to core/src/main/java/org/apache/struts2/config/ConfigurationProvider.java index 2140d51fa6..44e5d7d5fc 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/ConfigurationProvider.java +++ b/core/src/main/java/org/apache/struts2/config/ConfigurationProvider.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config; +package org.apache.struts2.config; /** * Interface to be implemented by all forms of XWork configuration classes. diff --git a/core/src/main/java/com/opensymphony/xwork2/config/ConfigurationUtil.java b/core/src/main/java/org/apache/struts2/config/ConfigurationUtil.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/config/ConfigurationUtil.java rename to core/src/main/java/org/apache/struts2/config/ConfigurationUtil.java index 06381c5b01..48d73ff8aa 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/ConfigurationUtil.java +++ b/core/src/main/java/org/apache/struts2/config/ConfigurationUtil.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config; +package org.apache.struts2.config; -import com.opensymphony.xwork2.config.entities.PackageConfig; +import org.apache.struts2.config.entities.PackageConfig; import org.apache.commons.lang3.ClassUtils; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; diff --git a/core/src/main/java/com/opensymphony/xwork2/config/ContainerProvider.java b/core/src/main/java/org/apache/struts2/config/ContainerProvider.java similarity index 92% rename from core/src/main/java/com/opensymphony/xwork2/config/ContainerProvider.java rename to core/src/main/java/org/apache/struts2/config/ContainerProvider.java index e43bf8134c..fe04a76d6c 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/ContainerProvider.java +++ b/core/src/main/java/org/apache/struts2/config/ContainerProvider.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config; +package org.apache.struts2.config; -import com.opensymphony.xwork2.inject.ContainerBuilder; -import com.opensymphony.xwork2.util.location.LocatableProperties; +import org.apache.struts2.inject.ContainerBuilder; +import org.apache.struts2.util.location.LocatableProperties; /** diff --git a/core/src/main/java/org/apache/struts2/config/DefaultPropertiesProvider.java b/core/src/main/java/org/apache/struts2/config/DefaultPropertiesProvider.java index cdc14723ab..d0009ec183 100644 --- a/core/src/main/java/org/apache/struts2/config/DefaultPropertiesProvider.java +++ b/core/src/main/java/org/apache/struts2/config/DefaultPropertiesProvider.java @@ -18,9 +18,9 @@ */ package org.apache.struts2.config; -import com.opensymphony.xwork2.config.ConfigurationException; -import com.opensymphony.xwork2.inject.ContainerBuilder; -import com.opensymphony.xwork2.util.location.LocatableProperties; +import org.apache.struts2.config.ConfigurationException; +import org.apache.struts2.inject.ContainerBuilder; +import org.apache.struts2.util.location.LocatableProperties; /** * Loads the default properties, separate from the usual struts.properties loading diff --git a/core/src/main/java/org/apache/struts2/config/DefaultSettings.java b/core/src/main/java/org/apache/struts2/config/DefaultSettings.java index fc16c61ae7..ef5fde1197 100644 --- a/core/src/main/java/org/apache/struts2/config/DefaultSettings.java +++ b/core/src/main/java/org/apache/struts2/config/DefaultSettings.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.config; -import com.opensymphony.xwork2.util.location.Location; +import org.apache.struts2.util.location.Location; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.StrutsConstants; @@ -43,8 +43,8 @@ public class DefaultSettings implements Settings { private Settings delegate; /** - * Constructs an instance by loading the standard property files, - * any custom property files (struts.custom.properties), + * Constructs an instance by loading the standard property files, + * any custom property files (struts.custom.properties), * and any custom message resources (). *

    * Since this constructor combines Settings from multiple resources, diff --git a/core/src/main/java/org/apache/struts2/config/DelegatingSettings.java b/core/src/main/java/org/apache/struts2/config/DelegatingSettings.java index ef4ce31f24..16c4aba48d 100644 --- a/core/src/main/java/org/apache/struts2/config/DelegatingSettings.java +++ b/core/src/main/java/org/apache/struts2/config/DelegatingSettings.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.config; -import com.opensymphony.xwork2.util.location.Location; +import org.apache.struts2.util.location.Location; import java.util.HashSet; import java.util.Iterator; diff --git a/core/src/main/java/com/opensymphony/xwork2/config/FileManagerFactoryProvider.java b/core/src/main/java/org/apache/struts2/config/FileManagerFactoryProvider.java similarity index 86% rename from core/src/main/java/com/opensymphony/xwork2/config/FileManagerFactoryProvider.java rename to core/src/main/java/org/apache/struts2/config/FileManagerFactoryProvider.java index d572b4c7a8..5c015f0e0a 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/FileManagerFactoryProvider.java +++ b/core/src/main/java/org/apache/struts2/config/FileManagerFactoryProvider.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config; +package org.apache.struts2.config; -import com.opensymphony.xwork2.FileManagerFactory; -import com.opensymphony.xwork2.inject.ContainerBuilder; -import com.opensymphony.xwork2.inject.Scope; -import com.opensymphony.xwork2.util.location.LocatableProperties; +import org.apache.struts2.FileManagerFactory; +import org.apache.struts2.inject.ContainerBuilder; +import org.apache.struts2.inject.Scope; +import org.apache.struts2.util.location.LocatableProperties; /** * Allows to specify custom {@link FileManagerFactory} diff --git a/core/src/main/java/com/opensymphony/xwork2/config/FileManagerProvider.java b/core/src/main/java/org/apache/struts2/config/FileManagerProvider.java similarity index 86% rename from core/src/main/java/com/opensymphony/xwork2/config/FileManagerProvider.java rename to core/src/main/java/org/apache/struts2/config/FileManagerProvider.java index 632882b942..20718746cc 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/FileManagerProvider.java +++ b/core/src/main/java/org/apache/struts2/config/FileManagerProvider.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config; +package org.apache.struts2.config; -import com.opensymphony.xwork2.FileManager; -import com.opensymphony.xwork2.inject.ContainerBuilder; -import com.opensymphony.xwork2.inject.Scope; -import com.opensymphony.xwork2.util.location.LocatableProperties; +import org.apache.struts2.FileManager; +import org.apache.struts2.inject.ContainerBuilder; +import org.apache.struts2.inject.Scope; +import org.apache.struts2.util.location.LocatableProperties; /** * Allows to specify custom {@link FileManager} by user diff --git a/core/src/main/java/org/apache/struts2/config/NullResult.java b/core/src/main/java/org/apache/struts2/config/NullResult.java index 5b29b6787a..4ecdf5d484 100644 --- a/core/src/main/java/org/apache/struts2/config/NullResult.java +++ b/core/src/main/java/org/apache/struts2/config/NullResult.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.config; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.Result; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.Result; /** * Null result to get around annotation defaults that can't be null diff --git a/core/src/main/java/com/opensymphony/xwork2/config/PackageProvider.java b/core/src/main/java/org/apache/struts2/config/PackageProvider.java similarity index 94% rename from core/src/main/java/com/opensymphony/xwork2/config/PackageProvider.java rename to core/src/main/java/org/apache/struts2/config/PackageProvider.java index fd25639dca..adf8ae4a1b 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/PackageProvider.java +++ b/core/src/main/java/org/apache/struts2/config/PackageProvider.java @@ -16,23 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config; +package org.apache.struts2.config; /** - * Provides configuration packages. The separate init and loadPackages calls are due to the need to + * Provides configuration packages. The separate init and loadPackages calls are due to the need to * preserve backwards compatibility with the 2.0 {@link ConfigurationProvider} interface - * + * * @since 2.1 */ public interface PackageProvider { - + /** * Initializes with the configuration * @param configuration The configuration * @throws ConfigurationException If anything goes wrong */ void init(Configuration configuration) throws ConfigurationException; - + /** * Tells whether the PackageProvider should reload its configuration * @@ -45,5 +45,5 @@ public interface PackageProvider { * @throws ConfigurationException in case of configuration errors */ void loadPackages() throws ConfigurationException; - + } diff --git a/core/src/main/java/org/apache/struts2/config/PropertiesConfigurationProvider.java b/core/src/main/java/org/apache/struts2/config/PropertiesConfigurationProvider.java index 69be377155..a5b46fd823 100644 --- a/core/src/main/java/org/apache/struts2/config/PropertiesConfigurationProvider.java +++ b/core/src/main/java/org/apache/struts2/config/PropertiesConfigurationProvider.java @@ -18,11 +18,11 @@ */ package org.apache.struts2.config; -import com.opensymphony.xwork2.config.Configuration; -import com.opensymphony.xwork2.config.ConfigurationException; -import com.opensymphony.xwork2.config.ConfigurationProvider; -import com.opensymphony.xwork2.inject.ContainerBuilder; -import com.opensymphony.xwork2.util.location.LocatableProperties; +import org.apache.struts2.config.Configuration; +import org.apache.struts2.config.ConfigurationException; +import org.apache.struts2.config.ConfigurationProvider; +import org.apache.struts2.inject.ContainerBuilder; +import org.apache.struts2.util.location.LocatableProperties; import java.util.Iterator; diff --git a/core/src/main/java/org/apache/struts2/config/PropertiesSettings.java b/core/src/main/java/org/apache/struts2/config/PropertiesSettings.java index 1a79a714cf..e7dbf51a2c 100644 --- a/core/src/main/java/org/apache/struts2/config/PropertiesSettings.java +++ b/core/src/main/java/org/apache/struts2/config/PropertiesSettings.java @@ -18,10 +18,10 @@ */ package org.apache.struts2.config; -import com.opensymphony.xwork2.util.ClassLoaderUtil; -import com.opensymphony.xwork2.util.location.LocatableProperties; -import com.opensymphony.xwork2.util.location.Location; -import com.opensymphony.xwork2.util.location.LocationImpl; +import org.apache.struts2.util.ClassLoaderUtil; +import org.apache.struts2.util.location.LocatableProperties; +import org.apache.struts2.util.location.Location; +import org.apache.struts2.util.location.LocationImpl; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.StrutsException; diff --git a/core/src/main/java/com/opensymphony/xwork2/config/RuntimeConfiguration.java b/core/src/main/java/org/apache/struts2/config/RuntimeConfiguration.java similarity index 95% rename from core/src/main/java/com/opensymphony/xwork2/config/RuntimeConfiguration.java rename to core/src/main/java/org/apache/struts2/config/RuntimeConfiguration.java index 9d5b5421fa..57916423d7 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/RuntimeConfiguration.java +++ b/core/src/main/java/org/apache/struts2/config/RuntimeConfiguration.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config; +package org.apache.struts2.config; -import com.opensymphony.xwork2.config.entities.ActionConfig; +import org.apache.struts2.config.entities.ActionConfig; import java.io.Serializable; import java.util.Map; diff --git a/core/src/main/java/com/opensymphony/xwork2/config/ServletContextAwareConfigurationProvider.java b/core/src/main/java/org/apache/struts2/config/ServletContextAwareConfigurationProvider.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/config/ServletContextAwareConfigurationProvider.java rename to core/src/main/java/org/apache/struts2/config/ServletContextAwareConfigurationProvider.java index 8dcd3eef7f..3cf98e5630 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/ServletContextAwareConfigurationProvider.java +++ b/core/src/main/java/org/apache/struts2/config/ServletContextAwareConfigurationProvider.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config; +package org.apache.struts2.config; import jakarta.servlet.ServletContext; diff --git a/core/src/main/java/org/apache/struts2/config/Settings.java b/core/src/main/java/org/apache/struts2/config/Settings.java index b9fb2ce448..37a69a8819 100644 --- a/core/src/main/java/org/apache/struts2/config/Settings.java +++ b/core/src/main/java/org/apache/struts2/config/Settings.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.config; -import com.opensymphony.xwork2.util.location.Location; +import org.apache.struts2.util.location.Location; import java.util.Iterator; @@ -36,7 +36,7 @@ interface Settings { String get(String name); /** - * Returns {@link com.opensymphony.xwork2.util.location.Location} of given setting + * Returns {@link org.apache.struts2.util.location.Location} of given setting * * @param name Name of the setting to locate * @return The location of the setting or null diff --git a/core/src/main/java/org/apache/struts2/config/StrutsBeanSelectionProvider.java b/core/src/main/java/org/apache/struts2/config/StrutsBeanSelectionProvider.java index a52a67749f..206de9ad05 100644 --- a/core/src/main/java/org/apache/struts2/config/StrutsBeanSelectionProvider.java +++ b/core/src/main/java/org/apache/struts2/config/StrutsBeanSelectionProvider.java @@ -18,49 +18,49 @@ */ package org.apache.struts2.config; -import com.opensymphony.xwork2.ActionProxyFactory; -import com.opensymphony.xwork2.FileManager; -import com.opensymphony.xwork2.FileManagerFactory; -import com.opensymphony.xwork2.LocaleProviderFactory; -import com.opensymphony.xwork2.LocalizedTextProvider; -import com.opensymphony.xwork2.ObjectFactory; -import com.opensymphony.xwork2.TextProvider; -import com.opensymphony.xwork2.TextProviderFactory; -import com.opensymphony.xwork2.UnknownHandlerManager; -import com.opensymphony.xwork2.conversion.ConversionAnnotationProcessor; -import com.opensymphony.xwork2.conversion.ConversionFileProcessor; -import com.opensymphony.xwork2.conversion.ConversionPropertiesProcessor; -import com.opensymphony.xwork2.conversion.ObjectTypeDeterminer; -import com.opensymphony.xwork2.conversion.TypeConverterCreator; -import com.opensymphony.xwork2.conversion.TypeConverterHolder; -import com.opensymphony.xwork2.conversion.impl.ArrayConverter; -import com.opensymphony.xwork2.conversion.impl.CollectionConverter; -import com.opensymphony.xwork2.conversion.impl.DateConverter; -import com.opensymphony.xwork2.conversion.impl.NumberConverter; -import com.opensymphony.xwork2.conversion.impl.StringConverter; -import com.opensymphony.xwork2.conversion.impl.XWorkConverter; -import com.opensymphony.xwork2.factory.ActionFactory; -import com.opensymphony.xwork2.factory.ConverterFactory; -import com.opensymphony.xwork2.factory.InterceptorFactory; -import com.opensymphony.xwork2.factory.ResultFactory; -import com.opensymphony.xwork2.factory.UnknownHandlerFactory; -import com.opensymphony.xwork2.factory.ValidatorFactory; -import com.opensymphony.xwork2.inject.ContainerBuilder; -import com.opensymphony.xwork2.inject.Scope; -import com.opensymphony.xwork2.ognl.BeanInfoCacheFactory; -import com.opensymphony.xwork2.ognl.ExpressionCacheFactory; -import com.opensymphony.xwork2.ognl.SecurityMemberAccess; -import com.opensymphony.xwork2.ognl.accessor.RootAccessor; -import com.opensymphony.xwork2.security.AcceptedPatternsChecker; -import com.opensymphony.xwork2.security.ExcludedPatternsChecker; -import com.opensymphony.xwork2.security.NotExcludedAcceptedPatternsChecker; -import com.opensymphony.xwork2.util.PatternMatcher; -import com.opensymphony.xwork2.util.TextParser; -import com.opensymphony.xwork2.util.ValueStackFactory; -import com.opensymphony.xwork2.util.location.LocatableProperties; -import com.opensymphony.xwork2.util.reflection.ReflectionContextFactory; -import com.opensymphony.xwork2.util.reflection.ReflectionProvider; -import com.opensymphony.xwork2.validator.ActionValidatorManager; +import org.apache.struts2.ActionProxyFactory; +import org.apache.struts2.FileManager; +import org.apache.struts2.FileManagerFactory; +import org.apache.struts2.LocaleProviderFactory; +import org.apache.struts2.LocalizedTextProvider; +import org.apache.struts2.ObjectFactory; +import org.apache.struts2.TextProvider; +import org.apache.struts2.TextProviderFactory; +import org.apache.struts2.UnknownHandlerManager; +import org.apache.struts2.conversion.ConversionAnnotationProcessor; +import org.apache.struts2.conversion.ConversionFileProcessor; +import org.apache.struts2.conversion.ConversionPropertiesProcessor; +import org.apache.struts2.conversion.ObjectTypeDeterminer; +import org.apache.struts2.conversion.TypeConverterCreator; +import org.apache.struts2.conversion.TypeConverterHolder; +import org.apache.struts2.conversion.impl.ArrayConverter; +import org.apache.struts2.conversion.impl.CollectionConverter; +import org.apache.struts2.conversion.impl.DateConverter; +import org.apache.struts2.conversion.impl.NumberConverter; +import org.apache.struts2.conversion.impl.StringConverter; +import org.apache.struts2.conversion.impl.XWorkConverter; +import org.apache.struts2.factory.ActionFactory; +import org.apache.struts2.factory.ConverterFactory; +import org.apache.struts2.factory.InterceptorFactory; +import org.apache.struts2.factory.ResultFactory; +import org.apache.struts2.factory.UnknownHandlerFactory; +import org.apache.struts2.factory.ValidatorFactory; +import org.apache.struts2.inject.ContainerBuilder; +import org.apache.struts2.inject.Scope; +import org.apache.struts2.ognl.BeanInfoCacheFactory; +import org.apache.struts2.ognl.ExpressionCacheFactory; +import org.apache.struts2.ognl.SecurityMemberAccess; +import org.apache.struts2.ognl.accessor.RootAccessor; +import org.apache.struts2.security.AcceptedPatternsChecker; +import org.apache.struts2.security.ExcludedPatternsChecker; +import org.apache.struts2.security.NotExcludedAcceptedPatternsChecker; +import org.apache.struts2.util.PatternMatcher; +import org.apache.struts2.util.TextParser; +import org.apache.struts2.util.ValueStackFactory; +import org.apache.struts2.util.location.LocatableProperties; +import org.apache.struts2.util.reflection.ReflectionContextFactory; +import org.apache.struts2.util.reflection.ReflectionProvider; +import org.apache.struts2.validator.ActionValidatorManager; import ognl.MethodAccessor; import org.apache.struts2.StrutsConstants; import org.apache.struts2.components.UrlRenderer; @@ -97,49 +97,49 @@ * Description * * - * com.opensymphony.xwork2.ObjectFactory + * org.apache.struts2..ObjectFactory * struts.objectFactory * singleton * Creates actions, results, and interceptors * * - * com.opensymphony.xwork2.factory.ActionFactory + * org.apache.struts2..factory.ActionFactory * struts.objectFactory.actionFactory * singleton * Dedicated factory used to create Actions, you can implement/extend existing one instead of defining new ObjectFactory * * - * com.opensymphony.xwork2.factory.ResultFactory + * org.apache.struts2..factory.ResultFactory * struts.objectFactory.resultFactory * singleton * Dedicated factory used to create Results, you can implement/extend existing one instead of defining new ObjectFactory * * - * com.opensymphony.xwork2.factory.InterceptorFactory + * org.apache.struts2..factory.InterceptorFactory * struts.objectFactory.interceptorFactory * singleton * Dedicated factory used to create Interceptors, you can implement/extend existing one instead of defining new ObjectFactory * * - * com.opensymphony.xwork2.factory.ConverterFactory + * org.apache.struts2..factory.ConverterFactory * struts.objectFactory.converterFactory * singleton * Dedicated factory used to create TypeConverters, you can implement/extend existing one instead of defining new ObjectFactory * * - * com.opensymphony.xwork2.factory.ValidatorFactory + * org.apache.struts2..factory.ValidatorFactory * struts.objectFactory.validatorFactory * singleton * Dedicated factory used to create Validators, you can implement/extend existing one instead of defining new ObjectFactory * * - * com.opensymphony.xwork2.ActionProxyFactory + * org.apache.struts2..ActionProxyFactory * struts.actionProxyFactory * singleton * Creates the ActionProxy * * - * com.opensymphony.xwork2.util.ObjectTypeDeterminer + * org.apache.struts2..util.ObjectTypeDeterminer * struts.objectTypeDeterminer * singleton * Determines what the key and element class of a Map or Collection should be @@ -169,38 +169,38 @@ * Loads and processes Velocity templates * * - * com.opensymphony.xwork2.validator.ActionValidatorManager + * org.apache.struts2..validator.ActionValidatorManager * struts.actionValidatorManager * singleton * Main interface for validation managers (regular and annotation based). Handles both the loading of * configuration and the actual validation (since 2.1) * * - * com.opensymphony.xwork2.util.ValueStackFactory + * org.apache.struts2..util.ValueStackFactory * struts.valueStackFactory * singleton * Creates value stacks (since 2.1) * * - * com.opensymphony.xwork2.reflection.ReflectionProvider + * org.apache.struts2..reflection.ReflectionProvider * struts.reflectionProvider * singleton * Provides reflection services, key place to plug in a custom expression language (since 2.1) * * - * com.opensymphony.xwork2.reflection.ReflectionContextFactory + * org.apache.struts2..reflection.ReflectionContextFactory * struts.reflectionContextFactory * singleton * Creates reflection context maps used for reflection and expression language operations (since 2.1) * * - * com.opensymphony.xwork2.config.PackageProvider + * org.apache.struts2..config.PackageProvider * N/A * singleton * All beans registered as PackageProvider implementations will be automatically included in configuration building (since 2.1) * * - * com.opensymphony.xwork2.util.PatternMatcher + * org.apache.struts2..util.PatternMatcher * struts.patternMatcher * singleton * Matches patterns, such as action names, generally used in configuration (since 2.1) @@ -212,25 +212,25 @@ * Loads static resources (since 2.1) * * - * com.opensymphony.xwork2.conversion.impl.XWorkConverter + * org.apache.struts2..conversion.impl.XWorkConverter * struts.xworkConverter * singleton * Handles conversion logic and allows to load custom converters per class or per action * * - * com.opensymphony.xwork2.TextProvider + * org.apache.struts2..TextProvider * struts.textProvider * default * Allows provide custom TextProvider for whole application, it's better to use struts.textProviderFactory * * - * com.opensymphony.xwork2.TextProviderFactory + * org.apache.struts2..TextProviderFactory * struts.textProviderFactory * default * Allows provide custom TextProviderFactory for whole application * * - * com.opensymphony.xwork2.LocaleProviderFactory + * org.apache.struts2..LocaleProviderFactory * struts.localeProviderFactory * singleton * Allows provide custom LocaleProvider for whole application @@ -242,7 +242,7 @@ * Allows provide custom implementation of environment specific URL rendering/creating class * * - * com.opensymphony.xwork2.UnknownHandlerManager + * org.apache.struts2..UnknownHandlerManager * struts.unknownHandlerManager * singleton * Implementation of this interface allows handle logic of unknown Actions, Methods or Results @@ -254,87 +254,87 @@ * Helper class used with URLRenderer to provide exact logic for building URLs * * - * com.opensymphony.xwork2.FileManagerFactory + * org.apache.struts2..FileManagerFactory * struts.fileManagerFactory * singleton * Used to create {@link FileManager} instance to access files on the File System as also to monitor if reload is needed, * can be implemented / overwritten to meet specific an application server needs * * - * com.opensymphony.xwork2.conversion.impl.CollectionConverter + * org.apache.struts2..conversion.impl.CollectionConverter * struts.converter.collection * singleton * Converter used to convert any object to Collection and back * * - * com.opensymphony.xwork2.conversion.impl.ArrayConverter + * org.apache.struts2..conversion.impl.ArrayConverter * struts.converter.array * singleton * Converter used to convert any object to Array and back * * - * com.opensymphony.xwork2.conversion.impl.DateConverter + * org.apache.struts2..conversion.impl.DateConverter * struts.converter.date * singleton * Converter used to convert any object to Date and back * * - * com.opensymphony.xwork2.conversion.impl.NumberConverter + * org.apache.struts2..conversion.impl.NumberConverter * struts.converter.number * singleton * Converter used to convert any object to Number and back * * - * com.opensymphony.xwork2.conversion.impl.StringConverter + * org.apache.struts2..conversion.impl.StringConverter * struts.converter.string * singleton * Converter used to convert any object to String and back * * - * com.opensymphony.xwork2.conversion.ConversionPropertiesProcessor + * org.apache.struts2..conversion.ConversionPropertiesProcessor * struts.conversion.properties.processor * singleton * Process Properties to create converters * * - * com.opensymphony.xwork2.conversion.ConversionPropertiesProcessor + * org.apache.struts2..conversion.ConversionPropertiesProcessor * struts.converter.file.processor * singleton * Process <class>-conversion.properties file create converters</class> * * - * com.opensymphony.xwork2.conversion.ConversionAnnotationProcessor + * org.apache.struts2..conversion.ConversionAnnotationProcessor * struts.converter.annotation.processor * singleton * Process TypeConversion annotation to create converters * * - * com.opensymphony.xwork2.conversion.TypeConverterCreator + * org.apache.struts2..conversion.TypeConverterCreator * struts.converter.creator * singleton * Creates user converters * * - * com.opensymphony.xwork2.conversion.TypeConverterHolder + * org.apache.struts2..conversion.TypeConverterHolder * struts.converter.holder * singleton * Holds user converters' instances * * - * com.opensymphony.xwork2.util.TextParser + * org.apache.struts2..util.TextParser * struts.expression.parser * singleton * Used to parse expressions like ${foo.bar} or %{bar.foo} but it is up tp the TextParser's * implementation what kind of opening char to use (#, $, %, etc) * * - * com.opensymphony.xwork2.ExcludedPatternsChecker + * org.apache.struts2..ExcludedPatternsChecker * struts.excludedPatterns.checker * request * Used across different interceptors to check if given string matches one of the excluded patterns * * - * com.opensymphony.xwork2.AcceptedPatternsChecker + * org.apache.struts2..AcceptedPatternsChecker * struts.acceptedPatterns.checker * request * Used across different interceptors to check if given string matches one of the accepted patterns @@ -346,7 +346,7 @@ * Matches content type of uploaded files (since 2.3.22) * * - * com.opensymphony.xwork2.LocalizedTextProvider + * org.apache.struts2..LocalizedTextProvider * struts.localizedTextProvider * singleton * Provides access to resource bundles used to localise messages (since 2.5.11) diff --git a/core/src/main/java/org/apache/struts2/config/StrutsJavaConfigurationProvider.java b/core/src/main/java/org/apache/struts2/config/StrutsJavaConfigurationProvider.java index 6636b37801..6fdccb794f 100644 --- a/core/src/main/java/org/apache/struts2/config/StrutsJavaConfigurationProvider.java +++ b/core/src/main/java/org/apache/struts2/config/StrutsJavaConfigurationProvider.java @@ -18,18 +18,18 @@ */ package org.apache.struts2.config; -import com.opensymphony.xwork2.config.BeanSelectionProvider; -import com.opensymphony.xwork2.config.Configuration; -import com.opensymphony.xwork2.config.ConfigurationException; -import com.opensymphony.xwork2.config.ConfigurationProvider; -import com.opensymphony.xwork2.config.entities.UnknownHandlerConfig; -import com.opensymphony.xwork2.config.impl.LocatableFactory; -import com.opensymphony.xwork2.config.providers.ValueSubstitutor; -import com.opensymphony.xwork2.inject.ContainerBuilder; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.location.LocatableProperties; -import com.opensymphony.xwork2.util.location.Location; -import com.opensymphony.xwork2.util.location.LocationUtils; +import org.apache.struts2.config.BeanSelectionProvider; +import org.apache.struts2.config.Configuration; +import org.apache.struts2.config.ConfigurationException; +import org.apache.struts2.config.ConfigurationProvider; +import org.apache.struts2.config.entities.UnknownHandlerConfig; +import org.apache.struts2.config.impl.LocatableFactory; +import org.apache.struts2.config.providers.ValueSubstitutor; +import org.apache.struts2.inject.ContainerBuilder; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.location.LocatableProperties; +import org.apache.struts2.util.location.Location; +import org.apache.struts2.util.location.LocationUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.config.entities.BeanConfig; diff --git a/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java b/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java index 48d223d2c2..12a57a3a89 100644 --- a/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java +++ b/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java @@ -18,13 +18,13 @@ */ package org.apache.struts2.config; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.config.ConfigurationException; -import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider; -import com.opensymphony.xwork2.inject.ContainerBuilder; -import com.opensymphony.xwork2.inject.Context; -import com.opensymphony.xwork2.inject.Factory; -import com.opensymphony.xwork2.util.location.LocatableProperties; +import org.apache.struts2.ActionContext; +import org.apache.struts2.config.ConfigurationException; +import org.apache.struts2.config.providers.XmlConfigurationProvider; +import org.apache.struts2.inject.ContainerBuilder; +import org.apache.struts2.inject.Context; +import org.apache.struts2.inject.Factory; +import org.apache.struts2.util.location.LocatableProperties; import jakarta.servlet.ServletContext; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -92,9 +92,6 @@ public StrutsXmlConfigurationProvider(String filename, ServletContext ctx) { } } - /* (non-Javadoc) - * @see com.opensymphony.xwork2.config.providers.XmlConfigurationProvider#register(com.opensymphony.xwork2.inject.ContainerBuilder, java.util.Properties) - */ @Override public void register(ContainerBuilder containerBuilder, LocatableProperties props) throws ConfigurationException { if (servletContext != null && !containerBuilder.contains(ServletContext.class)) { @@ -114,7 +111,7 @@ public Class type() { } /* (non-Javadoc) - * @see com.opensymphony.xwork2.config.providers.XmlConfigurationProvider#init(com.opensymphony.xwork2.config.Configuration) + * @see org.apache.struts2.config.providers.XmlConfigurationProvider#init(org.apache.struts2.config.Configuration) */ @Override public void loadPackages() { @@ -127,7 +124,7 @@ public void loadPackages() { * Look for the configuration file on the classpath and in the file system * * @param fileName The file name to retrieve - * @see com.opensymphony.xwork2.config.providers.XmlConfigurationProvider#getConfigurationUrls + * @see org.apache.struts2.config.providers.XmlConfigurationProvider#getConfigurationUrls */ @Override protected Iterator getConfigurationUrls(String fileName) throws IOException { diff --git a/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java b/core/src/main/java/org/apache/struts2/config/entities/ActionConfig.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java rename to core/src/main/java/org/apache/struts2/config/entities/ActionConfig.java index f259400d54..53599638ab 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java +++ b/core/src/main/java/org/apache/struts2/config/entities/ActionConfig.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config.entities; +package org.apache.struts2.config.entities; -import com.opensymphony.xwork2.util.location.Located; -import com.opensymphony.xwork2.util.location.Location; +import org.apache.struts2.util.location.Located; +import org.apache.struts2.util.location.Location; import org.apache.commons.lang3.StringUtils; import java.io.Serializable; diff --git a/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java b/core/src/main/java/org/apache/struts2/config/entities/AllowedMethods.java similarity index 99% rename from core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java rename to core/src/main/java/org/apache/struts2/config/entities/AllowedMethods.java index 1967dd7db8..9cc6c883d9 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java +++ b/core/src/main/java/org/apache/struts2/config/entities/AllowedMethods.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config.entities; +package org.apache.struts2.config.entities; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/org/apache/struts2/config/entities/BeanConfig.java b/core/src/main/java/org/apache/struts2/config/entities/BeanConfig.java index d01db0f0db..7caa798dff 100644 --- a/core/src/main/java/org/apache/struts2/config/entities/BeanConfig.java +++ b/core/src/main/java/org/apache/struts2/config/entities/BeanConfig.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.config.entities; -import com.opensymphony.xwork2.inject.Container; -import com.opensymphony.xwork2.inject.Scope; +import org.apache.struts2.inject.Container; +import org.apache.struts2.inject.Scope; public class BeanConfig { private final Class clazz; diff --git a/core/src/main/java/org/apache/struts2/config/entities/BeanSelectionConfig.java b/core/src/main/java/org/apache/struts2/config/entities/BeanSelectionConfig.java index dfa76974df..4ad6968ca2 100644 --- a/core/src/main/java/org/apache/struts2/config/entities/BeanSelectionConfig.java +++ b/core/src/main/java/org/apache/struts2/config/entities/BeanSelectionConfig.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.config.entities; -import com.opensymphony.xwork2.config.BeanSelectionProvider; -import com.opensymphony.xwork2.inject.Container; +import org.apache.struts2.config.BeanSelectionProvider; +import org.apache.struts2.inject.Container; public class BeanSelectionConfig { diff --git a/core/src/main/java/com/opensymphony/xwork2/config/entities/ExceptionMappingConfig.java b/core/src/main/java/org/apache/struts2/config/entities/ExceptionMappingConfig.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/config/entities/ExceptionMappingConfig.java rename to core/src/main/java/org/apache/struts2/config/entities/ExceptionMappingConfig.java index 0b43670066..73fb41f298 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/entities/ExceptionMappingConfig.java +++ b/core/src/main/java/org/apache/struts2/config/entities/ExceptionMappingConfig.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config.entities; +package org.apache.struts2.config.entities; -import com.opensymphony.xwork2.util.location.Located; -import com.opensymphony.xwork2.util.location.Location; +import org.apache.struts2.util.location.Located; +import org.apache.struts2.util.location.Location; import java.io.Serializable; import java.util.Collections; diff --git a/core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorConfig.java b/core/src/main/java/org/apache/struts2/config/entities/InterceptorConfig.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorConfig.java rename to core/src/main/java/org/apache/struts2/config/entities/InterceptorConfig.java index 69974a1340..ee10cd8806 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorConfig.java +++ b/core/src/main/java/org/apache/struts2/config/entities/InterceptorConfig.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config.entities; +package org.apache.struts2.config.entities; -import com.opensymphony.xwork2.util.location.Located; -import com.opensymphony.xwork2.util.location.Location; +import org.apache.struts2.util.location.Located; +import org.apache.struts2.util.location.Location; import java.io.Serializable; import java.util.Collections; diff --git a/core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorListHolder.java b/core/src/main/java/org/apache/struts2/config/entities/InterceptorListHolder.java similarity index 95% rename from core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorListHolder.java rename to core/src/main/java/org/apache/struts2/config/entities/InterceptorListHolder.java index ab9829afa0..fa39778b32 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorListHolder.java +++ b/core/src/main/java/org/apache/struts2/config/entities/InterceptorListHolder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config.entities; +package org.apache.struts2.config.entities; import java.util.List; diff --git a/core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorLocator.java b/core/src/main/java/org/apache/struts2/config/entities/InterceptorLocator.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorLocator.java rename to core/src/main/java/org/apache/struts2/config/entities/InterceptorLocator.java index 178ec3dbc7..3c5fad99a8 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorLocator.java +++ b/core/src/main/java/org/apache/struts2/config/entities/InterceptorLocator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config.entities; +package org.apache.struts2.config.entities; /** * Defines an object that can be used to retrieve interceptor configuration diff --git a/core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorMapping.java b/core/src/main/java/org/apache/struts2/config/entities/InterceptorMapping.java similarity index 95% rename from core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorMapping.java rename to core/src/main/java/org/apache/struts2/config/entities/InterceptorMapping.java index e90cd10147..2c26e458e5 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorMapping.java +++ b/core/src/main/java/org/apache/struts2/config/entities/InterceptorMapping.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config.entities; +package org.apache.struts2.config.entities; -import com.opensymphony.xwork2.interceptor.Interceptor; +import org.apache.struts2.interceptor.Interceptor; import java.io.Serializable; import java.util.HashMap; diff --git a/core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorStackConfig.java b/core/src/main/java/org/apache/struts2/config/entities/InterceptorStackConfig.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorStackConfig.java rename to core/src/main/java/org/apache/struts2/config/entities/InterceptorStackConfig.java index bcd9a3da0d..03ae5a92a5 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorStackConfig.java +++ b/core/src/main/java/org/apache/struts2/config/entities/InterceptorStackConfig.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config.entities; +package org.apache.struts2.config.entities; -import com.opensymphony.xwork2.util.location.Located; -import com.opensymphony.xwork2.util.location.Location; +import org.apache.struts2.util.location.Located; +import org.apache.struts2.util.location.Location; import java.io.Serial; import java.io.Serializable; diff --git a/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java b/core/src/main/java/org/apache/struts2/config/entities/PackageConfig.java similarity index 99% rename from core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java rename to core/src/main/java/org/apache/struts2/config/entities/PackageConfig.java index 753cc64ff5..ccf2e756fb 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java +++ b/core/src/main/java/org/apache/struts2/config/entities/PackageConfig.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config.entities; +package org.apache.struts2.config.entities; -import com.opensymphony.xwork2.util.location.Located; -import com.opensymphony.xwork2.util.location.Location; +import org.apache.struts2.util.location.Located; +import org.apache.struts2.util.location.Location; import java.io.Serializable; import java.util.ArrayList; diff --git a/core/src/main/java/com/opensymphony/xwork2/config/entities/Parameterizable.java b/core/src/main/java/org/apache/struts2/config/entities/Parameterizable.java similarity index 88% rename from core/src/main/java/com/opensymphony/xwork2/config/entities/Parameterizable.java rename to core/src/main/java/org/apache/struts2/config/entities/Parameterizable.java index cae046e78a..f00c73d3c8 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/entities/Parameterizable.java +++ b/core/src/main/java/org/apache/struts2/config/entities/Parameterizable.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config.entities; +package org.apache.struts2.config.entities; import java.util.Map; @@ -28,7 +28,7 @@ *

    * *

    - * The {@link com.opensymphony.xwork2.interceptor.StaticParametersInterceptor} must be in the action's interceptor + * The {@link org.apache.struts2.interceptor.StaticParametersInterceptor} must be in the action's interceptor * queue for this to work. *

    * diff --git a/core/src/main/java/com/opensymphony/xwork2/config/entities/ResultConfig.java b/core/src/main/java/org/apache/struts2/config/entities/ResultConfig.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/config/entities/ResultConfig.java rename to core/src/main/java/org/apache/struts2/config/entities/ResultConfig.java index f0d7752aa5..5e2a1daae7 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/entities/ResultConfig.java +++ b/core/src/main/java/org/apache/struts2/config/entities/ResultConfig.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config.entities; +package org.apache.struts2.config.entities; -import com.opensymphony.xwork2.util.location.Located; -import com.opensymphony.xwork2.util.location.Location; +import org.apache.struts2.util.location.Located; +import org.apache.struts2.util.location.Location; import java.io.Serializable; import java.util.Collections; diff --git a/core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java b/core/src/main/java/org/apache/struts2/config/entities/ResultTypeConfig.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java rename to core/src/main/java/org/apache/struts2/config/entities/ResultTypeConfig.java index 723319ed84..d03e65ecad 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java +++ b/core/src/main/java/org/apache/struts2/config/entities/ResultTypeConfig.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config.entities; +package org.apache.struts2.config.entities; -import com.opensymphony.xwork2.util.location.Located; -import com.opensymphony.xwork2.util.location.Location; +import org.apache.struts2.util.location.Located; +import org.apache.struts2.util.location.Location; import java.io.Serializable; import java.util.Collections; diff --git a/core/src/main/java/com/opensymphony/xwork2/config/entities/UnknownHandlerConfig.java b/core/src/main/java/org/apache/struts2/config/entities/UnknownHandlerConfig.java similarity index 88% rename from core/src/main/java/com/opensymphony/xwork2/config/entities/UnknownHandlerConfig.java rename to core/src/main/java/org/apache/struts2/config/entities/UnknownHandlerConfig.java index b6732fa257..2e22ee8ee0 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/entities/UnknownHandlerConfig.java +++ b/core/src/main/java/org/apache/struts2/config/entities/UnknownHandlerConfig.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config.entities; +package org.apache.struts2.config.entities; -import com.opensymphony.xwork2.util.location.Located; -import com.opensymphony.xwork2.util.location.Location; +import org.apache.struts2.util.location.Located; +import org.apache.struts2.util.location.Location; public class UnknownHandlerConfig extends Located { diff --git a/core/src/main/java/com/opensymphony/xwork2/config/entities/package.html b/core/src/main/java/org/apache/struts2/config/entities/package.html similarity index 100% rename from core/src/main/java/com/opensymphony/xwork2/config/entities/package.html rename to core/src/main/java/org/apache/struts2/config/entities/package.html diff --git a/core/src/main/java/com/opensymphony/xwork2/config/impl/AbstractMatcher.java b/core/src/main/java/org/apache/struts2/config/impl/AbstractMatcher.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/config/impl/AbstractMatcher.java rename to core/src/main/java/org/apache/struts2/config/impl/AbstractMatcher.java index ed5e053761..b4e1e6b704 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/impl/AbstractMatcher.java +++ b/core/src/main/java/org/apache/struts2/config/impl/AbstractMatcher.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config.impl; +package org.apache.struts2.config.impl; -import com.opensymphony.xwork2.util.PatternMatcher; +import org.apache.struts2.util.PatternMatcher; import org.apache.commons.lang3.math.NumberUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -59,7 +59,7 @@ public abstract class AbstractMatcher implements Serializable { /** * This flag controls if passed named params should be appended * to the map in {@link #replaceParameters(Map, Map)} - * and will be accessible in {@link com.opensymphony.xwork2.config.entities.ResultConfig}. + * and will be accessible in {@link org.apache.struts2.config.entities.ResultConfig}. * If set to false, the named parameters won't be appended. *

    * This behaviour is controlled by {@link org.apache.struts2.StrutsConstants#STRUTS_MATCHER_APPEND_NAMED_PARAMETERS} diff --git a/core/src/main/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcher.java b/core/src/main/java/org/apache/struts2/config/impl/ActionConfigMatcher.java similarity index 95% rename from core/src/main/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcher.java rename to core/src/main/java/org/apache/struts2/config/impl/ActionConfigMatcher.java index 2bf4c6c726..0cd42f4f14 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcher.java +++ b/core/src/main/java/org/apache/struts2/config/impl/ActionConfigMatcher.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config.impl; +package org.apache.struts2.config.impl; -import com.opensymphony.xwork2.config.entities.ActionConfig; -import com.opensymphony.xwork2.config.entities.ExceptionMappingConfig; -import com.opensymphony.xwork2.config.entities.ResultConfig; -import com.opensymphony.xwork2.util.PatternMatcher; +import org.apache.struts2.config.entities.ActionConfig; +import org.apache.struts2.config.entities.ExceptionMappingConfig; +import org.apache.struts2.config.entities.ResultConfig; +import org.apache.struts2.util.PatternMatcher; import org.apache.commons.lang3.StringUtils; import java.io.Serializable; diff --git a/core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java b/core/src/main/java/org/apache/struts2/config/impl/DefaultConfiguration.java similarity index 83% rename from core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java rename to core/src/main/java/org/apache/struts2/config/impl/DefaultConfiguration.java index de3af59874..b7bc934259 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java +++ b/core/src/main/java/org/apache/struts2/config/impl/DefaultConfiguration.java @@ -16,91 +16,91 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config.impl; - -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.DefaultLocaleProviderFactory; -import com.opensymphony.xwork2.DefaultTextProvider; -import com.opensymphony.xwork2.FileManager; -import com.opensymphony.xwork2.FileManagerFactory; -import com.opensymphony.xwork2.LocaleProviderFactory; -import com.opensymphony.xwork2.LocalizedTextProvider; -import com.opensymphony.xwork2.ObjectFactory; -import com.opensymphony.xwork2.StrutsTextProviderFactory; -import com.opensymphony.xwork2.TextProvider; -import com.opensymphony.xwork2.TextProviderFactory; -import com.opensymphony.xwork2.config.Configuration; -import com.opensymphony.xwork2.config.ConfigurationException; -import com.opensymphony.xwork2.config.ContainerProvider; -import com.opensymphony.xwork2.config.FileManagerFactoryProvider; -import com.opensymphony.xwork2.config.FileManagerProvider; -import com.opensymphony.xwork2.config.PackageProvider; -import com.opensymphony.xwork2.config.RuntimeConfiguration; -import com.opensymphony.xwork2.config.entities.ActionConfig; -import com.opensymphony.xwork2.config.entities.InterceptorMapping; -import com.opensymphony.xwork2.config.entities.PackageConfig; -import com.opensymphony.xwork2.config.entities.ResultConfig; -import com.opensymphony.xwork2.config.entities.ResultTypeConfig; -import com.opensymphony.xwork2.config.entities.UnknownHandlerConfig; -import com.opensymphony.xwork2.config.providers.EnvsValueSubstitutor; -import com.opensymphony.xwork2.config.providers.InterceptorBuilder; -import com.opensymphony.xwork2.config.providers.ValueSubstitutor; -import com.opensymphony.xwork2.conversion.ConversionAnnotationProcessor; -import com.opensymphony.xwork2.conversion.ConversionFileProcessor; -import com.opensymphony.xwork2.conversion.ConversionPropertiesProcessor; -import com.opensymphony.xwork2.conversion.ObjectTypeDeterminer; -import com.opensymphony.xwork2.conversion.TypeConverter; -import com.opensymphony.xwork2.conversion.TypeConverterCreator; -import com.opensymphony.xwork2.conversion.TypeConverterHolder; -import com.opensymphony.xwork2.conversion.impl.ArrayConverter; -import com.opensymphony.xwork2.conversion.impl.CollectionConverter; -import com.opensymphony.xwork2.conversion.impl.DateConverter; -import com.opensymphony.xwork2.conversion.impl.DefaultConversionAnnotationProcessor; -import com.opensymphony.xwork2.conversion.impl.DefaultConversionFileProcessor; -import com.opensymphony.xwork2.conversion.impl.DefaultObjectTypeDeterminer; -import com.opensymphony.xwork2.conversion.impl.NumberConverter; -import com.opensymphony.xwork2.conversion.impl.StringConverter; -import com.opensymphony.xwork2.conversion.impl.XWorkBasicConverter; -import com.opensymphony.xwork2.conversion.impl.XWorkConverter; -import com.opensymphony.xwork2.factory.ActionFactory; -import com.opensymphony.xwork2.factory.ConverterFactory; -import com.opensymphony.xwork2.factory.DefaultActionFactory; -import com.opensymphony.xwork2.factory.DefaultInterceptorFactory; -import com.opensymphony.xwork2.factory.DefaultResultFactory; -import com.opensymphony.xwork2.factory.DefaultUnknownHandlerFactory; -import com.opensymphony.xwork2.factory.DefaultValidatorFactory; -import com.opensymphony.xwork2.factory.InterceptorFactory; -import com.opensymphony.xwork2.factory.ResultFactory; -import com.opensymphony.xwork2.factory.StrutsConverterFactory; -import com.opensymphony.xwork2.factory.UnknownHandlerFactory; -import com.opensymphony.xwork2.factory.ValidatorFactory; -import com.opensymphony.xwork2.inject.Container; -import com.opensymphony.xwork2.inject.ContainerBuilder; -import com.opensymphony.xwork2.inject.Context; -import com.opensymphony.xwork2.inject.Factory; -import com.opensymphony.xwork2.inject.Scope; -import com.opensymphony.xwork2.ognl.BeanInfoCacheFactory; -import com.opensymphony.xwork2.ognl.DefaultOgnlBeanInfoCacheFactory; -import com.opensymphony.xwork2.ognl.DefaultOgnlExpressionCacheFactory; -import com.opensymphony.xwork2.ognl.ExpressionCacheFactory; -import com.opensymphony.xwork2.ognl.OgnlCacheFactory; -import com.opensymphony.xwork2.ognl.OgnlReflectionProvider; -import com.opensymphony.xwork2.ognl.OgnlUtil; -import com.opensymphony.xwork2.ognl.OgnlValueStackFactory; -import com.opensymphony.xwork2.ognl.SecurityMemberAccess; -import com.opensymphony.xwork2.ognl.accessor.CompoundRootAccessor; -import com.opensymphony.xwork2.ognl.accessor.RootAccessor; -import com.opensymphony.xwork2.ognl.accessor.XWorkMethodAccessor; -import com.opensymphony.xwork2.util.OgnlTextParser; -import com.opensymphony.xwork2.util.PatternMatcher; -import com.opensymphony.xwork2.util.StrutsLocalizedTextProvider; -import com.opensymphony.xwork2.util.TextParser; -import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.ValueStackFactory; -import com.opensymphony.xwork2.util.fs.DefaultFileManager; -import com.opensymphony.xwork2.util.fs.DefaultFileManagerFactory; -import com.opensymphony.xwork2.util.location.LocatableProperties; -import com.opensymphony.xwork2.util.reflection.ReflectionProvider; +package org.apache.struts2.config.impl; + +import org.apache.struts2.ActionContext; +import org.apache.struts2.DefaultLocaleProviderFactory; +import org.apache.struts2.DefaultTextProvider; +import org.apache.struts2.FileManager; +import org.apache.struts2.FileManagerFactory; +import org.apache.struts2.LocaleProviderFactory; +import org.apache.struts2.LocalizedTextProvider; +import org.apache.struts2.ObjectFactory; +import org.apache.struts2.StrutsTextProviderFactory; +import org.apache.struts2.TextProvider; +import org.apache.struts2.TextProviderFactory; +import org.apache.struts2.config.Configuration; +import org.apache.struts2.config.ConfigurationException; +import org.apache.struts2.config.ContainerProvider; +import org.apache.struts2.config.FileManagerFactoryProvider; +import org.apache.struts2.config.FileManagerProvider; +import org.apache.struts2.config.PackageProvider; +import org.apache.struts2.config.RuntimeConfiguration; +import org.apache.struts2.config.entities.ActionConfig; +import org.apache.struts2.config.entities.InterceptorMapping; +import org.apache.struts2.config.entities.PackageConfig; +import org.apache.struts2.config.entities.ResultConfig; +import org.apache.struts2.config.entities.ResultTypeConfig; +import org.apache.struts2.config.entities.UnknownHandlerConfig; +import org.apache.struts2.config.providers.EnvsValueSubstitutor; +import org.apache.struts2.config.providers.InterceptorBuilder; +import org.apache.struts2.config.providers.ValueSubstitutor; +import org.apache.struts2.conversion.ConversionAnnotationProcessor; +import org.apache.struts2.conversion.ConversionFileProcessor; +import org.apache.struts2.conversion.ConversionPropertiesProcessor; +import org.apache.struts2.conversion.ObjectTypeDeterminer; +import org.apache.struts2.conversion.TypeConverter; +import org.apache.struts2.conversion.TypeConverterCreator; +import org.apache.struts2.conversion.TypeConverterHolder; +import org.apache.struts2.conversion.impl.ArrayConverter; +import org.apache.struts2.conversion.impl.CollectionConverter; +import org.apache.struts2.conversion.impl.DateConverter; +import org.apache.struts2.conversion.impl.DefaultConversionAnnotationProcessor; +import org.apache.struts2.conversion.impl.DefaultConversionFileProcessor; +import org.apache.struts2.conversion.impl.DefaultObjectTypeDeterminer; +import org.apache.struts2.conversion.impl.NumberConverter; +import org.apache.struts2.conversion.impl.StringConverter; +import org.apache.struts2.conversion.impl.XWorkBasicConverter; +import org.apache.struts2.conversion.impl.XWorkConverter; +import org.apache.struts2.factory.ActionFactory; +import org.apache.struts2.factory.ConverterFactory; +import org.apache.struts2.factory.DefaultActionFactory; +import org.apache.struts2.factory.DefaultInterceptorFactory; +import org.apache.struts2.factory.DefaultResultFactory; +import org.apache.struts2.factory.DefaultUnknownHandlerFactory; +import org.apache.struts2.factory.DefaultValidatorFactory; +import org.apache.struts2.factory.InterceptorFactory; +import org.apache.struts2.factory.ResultFactory; +import org.apache.struts2.factory.StrutsConverterFactory; +import org.apache.struts2.factory.UnknownHandlerFactory; +import org.apache.struts2.factory.ValidatorFactory; +import org.apache.struts2.inject.Container; +import org.apache.struts2.inject.ContainerBuilder; +import org.apache.struts2.inject.Context; +import org.apache.struts2.inject.Factory; +import org.apache.struts2.inject.Scope; +import org.apache.struts2.ognl.BeanInfoCacheFactory; +import org.apache.struts2.ognl.DefaultOgnlBeanInfoCacheFactory; +import org.apache.struts2.ognl.DefaultOgnlExpressionCacheFactory; +import org.apache.struts2.ognl.ExpressionCacheFactory; +import org.apache.struts2.ognl.OgnlCacheFactory; +import org.apache.struts2.ognl.OgnlReflectionProvider; +import org.apache.struts2.ognl.OgnlUtil; +import org.apache.struts2.ognl.OgnlValueStackFactory; +import org.apache.struts2.ognl.SecurityMemberAccess; +import org.apache.struts2.ognl.accessor.CompoundRootAccessor; +import org.apache.struts2.ognl.accessor.RootAccessor; +import org.apache.struts2.ognl.accessor.XWorkMethodAccessor; +import org.apache.struts2.util.OgnlTextParser; +import org.apache.struts2.util.PatternMatcher; +import org.apache.struts2.util.StrutsLocalizedTextProvider; +import org.apache.struts2.util.TextParser; +import org.apache.struts2.util.ValueStack; +import org.apache.struts2.util.ValueStackFactory; +import org.apache.struts2.util.fs.DefaultFileManager; +import org.apache.struts2.util.fs.DefaultFileManagerFactory; +import org.apache.struts2.util.location.LocatableProperties; +import org.apache.struts2.util.reflection.ReflectionProvider; import ognl.MethodAccessor; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; @@ -488,7 +488,7 @@ private void setDefaultResults(Map results, PackageConfig * @param baseConfig the ActionConfig which holds only the configuration specific to itself, without the defaults * and inheritance * @return a full ActionConfig for runtime configuration with all of the inherited and default params - * @throws com.opensymphony.xwork2.config.ConfigurationException + * @throws org.apache.struts2.config.ConfigurationException * */ private ActionConfig buildFullActionConfig(PackageConfig packageContext, ActionConfig baseConfig) throws ConfigurationException { diff --git a/core/src/main/java/com/opensymphony/xwork2/config/impl/LocatableConstantFactory.java b/core/src/main/java/org/apache/struts2/config/impl/LocatableConstantFactory.java similarity index 84% rename from core/src/main/java/com/opensymphony/xwork2/config/impl/LocatableConstantFactory.java rename to core/src/main/java/org/apache/struts2/config/impl/LocatableConstantFactory.java index 319448060e..a3476be6b7 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/impl/LocatableConstantFactory.java +++ b/core/src/main/java/org/apache/struts2/config/impl/LocatableConstantFactory.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config.impl; +package org.apache.struts2.config.impl; -import com.opensymphony.xwork2.inject.Context; -import com.opensymphony.xwork2.inject.Factory; -import com.opensymphony.xwork2.util.location.Located; -import com.opensymphony.xwork2.util.location.LocationUtils; +import org.apache.struts2.inject.Context; +import org.apache.struts2.inject.Factory; +import org.apache.struts2.util.location.Located; +import org.apache.struts2.util.location.LocationUtils; /** * Factory that remembers where a constant came from diff --git a/core/src/main/java/com/opensymphony/xwork2/config/impl/LocatableFactory.java b/core/src/main/java/org/apache/struts2/config/impl/LocatableFactory.java similarity index 86% rename from core/src/main/java/com/opensymphony/xwork2/config/impl/LocatableFactory.java rename to core/src/main/java/org/apache/struts2/config/impl/LocatableFactory.java index fdc282b349..95bb6acfb7 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/impl/LocatableFactory.java +++ b/core/src/main/java/org/apache/struts2/config/impl/LocatableFactory.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config.impl; +package org.apache.struts2.config.impl; -import com.opensymphony.xwork2.inject.Context; -import com.opensymphony.xwork2.inject.Factory; -import com.opensymphony.xwork2.inject.Scope; -import com.opensymphony.xwork2.util.location.Located; -import com.opensymphony.xwork2.util.location.LocationUtils; +import org.apache.struts2.inject.Context; +import org.apache.struts2.inject.Factory; +import org.apache.struts2.inject.Scope; +import org.apache.struts2.util.location.Located; +import org.apache.struts2.util.location.LocationUtils; import java.util.Map; diff --git a/core/src/main/java/com/opensymphony/xwork2/config/impl/MockConfiguration.java b/core/src/main/java/org/apache/struts2/config/impl/MockConfiguration.java similarity index 82% rename from core/src/main/java/com/opensymphony/xwork2/config/impl/MockConfiguration.java rename to core/src/main/java/org/apache/struts2/config/impl/MockConfiguration.java index fd59b4bd74..cb8adb946f 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/impl/MockConfiguration.java +++ b/core/src/main/java/org/apache/struts2/config/impl/MockConfiguration.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config.impl; - -import com.opensymphony.xwork2.config.Configuration; -import com.opensymphony.xwork2.config.ConfigurationException; -import com.opensymphony.xwork2.config.ContainerProvider; -import com.opensymphony.xwork2.config.PackageProvider; -import com.opensymphony.xwork2.config.RuntimeConfiguration; -import com.opensymphony.xwork2.config.entities.PackageConfig; -import com.opensymphony.xwork2.config.entities.UnknownHandlerConfig; -import com.opensymphony.xwork2.config.providers.StrutsDefaultConfigurationProvider; -import com.opensymphony.xwork2.inject.Container; -import com.opensymphony.xwork2.inject.ContainerBuilder; -import com.opensymphony.xwork2.inject.Scope; -import com.opensymphony.xwork2.util.location.LocatableProperties; +package org.apache.struts2.config.impl; + +import org.apache.struts2.config.Configuration; +import org.apache.struts2.config.ConfigurationException; +import org.apache.struts2.config.ContainerProvider; +import org.apache.struts2.config.PackageProvider; +import org.apache.struts2.config.RuntimeConfiguration; +import org.apache.struts2.config.entities.PackageConfig; +import org.apache.struts2.config.entities.UnknownHandlerConfig; +import org.apache.struts2.config.providers.StrutsDefaultConfigurationProvider; +import org.apache.struts2.inject.Container; +import org.apache.struts2.inject.ContainerBuilder; +import org.apache.struts2.inject.Scope; +import org.apache.struts2.util.location.LocatableProperties; import java.util.HashMap; import java.util.HashSet; diff --git a/core/src/main/java/com/opensymphony/xwork2/config/impl/NamespaceMatch.java b/core/src/main/java/org/apache/struts2/config/impl/NamespaceMatch.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/config/impl/NamespaceMatch.java rename to core/src/main/java/org/apache/struts2/config/impl/NamespaceMatch.java index 376ade0f5b..d2ec7da50b 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/impl/NamespaceMatch.java +++ b/core/src/main/java/org/apache/struts2/config/impl/NamespaceMatch.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config.impl; +package org.apache.struts2.config.impl; import java.util.Map; diff --git a/core/src/main/java/com/opensymphony/xwork2/config/impl/NamespaceMatcher.java b/core/src/main/java/org/apache/struts2/config/impl/NamespaceMatcher.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/config/impl/NamespaceMatcher.java rename to core/src/main/java/org/apache/struts2/config/impl/NamespaceMatcher.java index b24fc759a8..f15bf5b000 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/impl/NamespaceMatcher.java +++ b/core/src/main/java/org/apache/struts2/config/impl/NamespaceMatcher.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config.impl; +package org.apache.struts2.config.impl; -import com.opensymphony.xwork2.util.PatternMatcher; +import org.apache.struts2.util.PatternMatcher; import java.util.Map; import java.util.Set; diff --git a/core/src/main/java/com/opensymphony/xwork2/config/impl/package.html b/core/src/main/java/org/apache/struts2/config/impl/package.html similarity index 100% rename from core/src/main/java/com/opensymphony/xwork2/config/impl/package.html rename to core/src/main/java/org/apache/struts2/config/impl/package.html diff --git a/core/src/main/java/com/opensymphony/xwork2/config/providers/CycleDetector.java b/core/src/main/java/org/apache/struts2/config/providers/CycleDetector.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/config/providers/CycleDetector.java rename to core/src/main/java/org/apache/struts2/config/providers/CycleDetector.java index b6365411de..affe82cd07 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/providers/CycleDetector.java +++ b/core/src/main/java/org/apache/struts2/config/providers/CycleDetector.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config.providers; +package org.apache.struts2.config.providers; import java.util.ArrayList; import java.util.HashMap; diff --git a/core/src/main/java/com/opensymphony/xwork2/config/providers/DirectedGraph.java b/core/src/main/java/org/apache/struts2/config/providers/DirectedGraph.java similarity index 99% rename from core/src/main/java/com/opensymphony/xwork2/config/providers/DirectedGraph.java rename to core/src/main/java/org/apache/struts2/config/providers/DirectedGraph.java index 6caacc40e7..b36e47e6f9 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/providers/DirectedGraph.java +++ b/core/src/main/java/org/apache/struts2/config/providers/DirectedGraph.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config.providers; +package org.apache.struts2.config.providers; import java.util.Collections; import java.util.HashMap; diff --git a/core/src/main/java/com/opensymphony/xwork2/config/providers/EnvsValueSubstitutor.java b/core/src/main/java/org/apache/struts2/config/providers/EnvsValueSubstitutor.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/config/providers/EnvsValueSubstitutor.java rename to core/src/main/java/org/apache/struts2/config/providers/EnvsValueSubstitutor.java index 9e58fdeba0..50badeeecf 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/providers/EnvsValueSubstitutor.java +++ b/core/src/main/java/org/apache/struts2/config/providers/EnvsValueSubstitutor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config.providers; +package org.apache.struts2.config.providers; import org.apache.commons.text.StringSubstitutor; import org.apache.commons.text.lookup.StringLookupFactory; diff --git a/core/src/main/java/com/opensymphony/xwork2/config/providers/InterceptorBuilder.java b/core/src/main/java/org/apache/struts2/config/providers/InterceptorBuilder.java similarity index 94% rename from core/src/main/java/com/opensymphony/xwork2/config/providers/InterceptorBuilder.java rename to core/src/main/java/org/apache/struts2/config/providers/InterceptorBuilder.java index 170e94fc13..72d4f47be6 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/providers/InterceptorBuilder.java +++ b/core/src/main/java/org/apache/struts2/config/providers/InterceptorBuilder.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config.providers; - -import com.opensymphony.xwork2.ObjectFactory; -import com.opensymphony.xwork2.config.ConfigurationException; -import com.opensymphony.xwork2.config.entities.InterceptorConfig; -import com.opensymphony.xwork2.config.entities.InterceptorLocator; -import com.opensymphony.xwork2.config.entities.InterceptorMapping; -import com.opensymphony.xwork2.config.entities.InterceptorStackConfig; -import com.opensymphony.xwork2.interceptor.Interceptor; -import com.opensymphony.xwork2.util.location.Location; +package org.apache.struts2.config.providers; + +import org.apache.struts2.ObjectFactory; +import org.apache.struts2.config.ConfigurationException; +import org.apache.struts2.config.entities.InterceptorConfig; +import org.apache.struts2.config.entities.InterceptorLocator; +import org.apache.struts2.config.entities.InterceptorMapping; +import org.apache.struts2.config.entities.InterceptorStackConfig; +import org.apache.struts2.interceptor.Interceptor; +import org.apache.struts2.util.location.Location; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; diff --git a/core/src/main/java/com/opensymphony/xwork2/config/providers/StrutsDefaultConfigurationProvider.java b/core/src/main/java/org/apache/struts2/config/providers/StrutsDefaultConfigurationProvider.java similarity index 67% rename from core/src/main/java/com/opensymphony/xwork2/config/providers/StrutsDefaultConfigurationProvider.java rename to core/src/main/java/org/apache/struts2/config/providers/StrutsDefaultConfigurationProvider.java index 6e66dd7a37..31bce4ec3f 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/providers/StrutsDefaultConfigurationProvider.java +++ b/core/src/main/java/org/apache/struts2/config/providers/StrutsDefaultConfigurationProvider.java @@ -16,55 +16,55 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config.providers; - -import com.opensymphony.xwork2.ActionProxyFactory; -import com.opensymphony.xwork2.DefaultActionProxyFactory; -import com.opensymphony.xwork2.DefaultUnknownHandlerManager; -import com.opensymphony.xwork2.FileManagerFactory; -import com.opensymphony.xwork2.UnknownHandlerManager; -import com.opensymphony.xwork2.config.Configuration; -import com.opensymphony.xwork2.config.ConfigurationException; -import com.opensymphony.xwork2.config.ConfigurationProvider; -import com.opensymphony.xwork2.config.impl.DefaultConfiguration; -import com.opensymphony.xwork2.conversion.NullHandler; -import com.opensymphony.xwork2.conversion.impl.ArrayConverter; -import com.opensymphony.xwork2.conversion.impl.CollectionConverter; -import com.opensymphony.xwork2.conversion.impl.DateConverter; -import com.opensymphony.xwork2.conversion.impl.InstantiatingNullHandler; -import com.opensymphony.xwork2.conversion.impl.NumberConverter; -import com.opensymphony.xwork2.conversion.impl.StringConverter; -import com.opensymphony.xwork2.inject.ContainerBuilder; -import com.opensymphony.xwork2.inject.Scope; -import com.opensymphony.xwork2.ognl.ObjectProxy; -import com.opensymphony.xwork2.ognl.OgnlReflectionContextFactory; -import com.opensymphony.xwork2.ognl.accessor.HttpParametersPropertyAccessor; -import com.opensymphony.xwork2.ognl.accessor.ObjectAccessor; -import com.opensymphony.xwork2.ognl.accessor.ObjectProxyPropertyAccessor; -import com.opensymphony.xwork2.ognl.accessor.ParameterPropertyAccessor; -import com.opensymphony.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor; -import com.opensymphony.xwork2.ognl.accessor.XWorkEnumerationAccessor; -import com.opensymphony.xwork2.ognl.accessor.XWorkIteratorPropertyAccessor; -import com.opensymphony.xwork2.ognl.accessor.XWorkListPropertyAccessor; -import com.opensymphony.xwork2.ognl.accessor.XWorkMapPropertyAccessor; -import com.opensymphony.xwork2.security.AcceptedPatternsChecker; -import com.opensymphony.xwork2.security.DefaultAcceptedPatternsChecker; -import com.opensymphony.xwork2.security.DefaultExcludedPatternsChecker; -import com.opensymphony.xwork2.security.DefaultNotExcludedAcceptedPatternsChecker; -import com.opensymphony.xwork2.security.ExcludedPatternsChecker; -import com.opensymphony.xwork2.security.NotExcludedAcceptedPatternsChecker; -import com.opensymphony.xwork2.util.PatternMatcher; -import com.opensymphony.xwork2.util.WildcardHelper; -import com.opensymphony.xwork2.util.fs.DefaultFileManagerFactory; -import com.opensymphony.xwork2.util.location.LocatableProperties; -import com.opensymphony.xwork2.util.reflection.ReflectionContextFactory; -import com.opensymphony.xwork2.validator.ActionValidatorManager; -import com.opensymphony.xwork2.validator.AnnotationActionValidatorManager; -import com.opensymphony.xwork2.validator.DefaultActionValidatorManager; -import com.opensymphony.xwork2.validator.DefaultValidatorFactory; -import com.opensymphony.xwork2.validator.DefaultValidatorFileParser; -import com.opensymphony.xwork2.validator.ValidatorFactory; -import com.opensymphony.xwork2.validator.ValidatorFileParser; +package org.apache.struts2.config.providers; + +import org.apache.struts2.ActionProxyFactory; +import org.apache.struts2.DefaultActionProxyFactory; +import org.apache.struts2.DefaultUnknownHandlerManager; +import org.apache.struts2.FileManagerFactory; +import org.apache.struts2.UnknownHandlerManager; +import org.apache.struts2.config.Configuration; +import org.apache.struts2.config.ConfigurationException; +import org.apache.struts2.config.ConfigurationProvider; +import org.apache.struts2.config.impl.DefaultConfiguration; +import org.apache.struts2.conversion.NullHandler; +import org.apache.struts2.conversion.impl.ArrayConverter; +import org.apache.struts2.conversion.impl.CollectionConverter; +import org.apache.struts2.conversion.impl.DateConverter; +import org.apache.struts2.conversion.impl.InstantiatingNullHandler; +import org.apache.struts2.conversion.impl.NumberConverter; +import org.apache.struts2.conversion.impl.StringConverter; +import org.apache.struts2.inject.ContainerBuilder; +import org.apache.struts2.inject.Scope; +import org.apache.struts2.ognl.ObjectProxy; +import org.apache.struts2.ognl.OgnlReflectionContextFactory; +import org.apache.struts2.ognl.accessor.HttpParametersPropertyAccessor; +import org.apache.struts2.ognl.accessor.ObjectAccessor; +import org.apache.struts2.ognl.accessor.ObjectProxyPropertyAccessor; +import org.apache.struts2.ognl.accessor.ParameterPropertyAccessor; +import org.apache.struts2.ognl.accessor.XWorkCollectionPropertyAccessor; +import org.apache.struts2.ognl.accessor.XWorkEnumerationAccessor; +import org.apache.struts2.ognl.accessor.XWorkIteratorPropertyAccessor; +import org.apache.struts2.ognl.accessor.XWorkListPropertyAccessor; +import org.apache.struts2.ognl.accessor.XWorkMapPropertyAccessor; +import org.apache.struts2.security.AcceptedPatternsChecker; +import org.apache.struts2.security.DefaultAcceptedPatternsChecker; +import org.apache.struts2.security.DefaultExcludedPatternsChecker; +import org.apache.struts2.security.DefaultNotExcludedAcceptedPatternsChecker; +import org.apache.struts2.security.ExcludedPatternsChecker; +import org.apache.struts2.security.NotExcludedAcceptedPatternsChecker; +import org.apache.struts2.util.PatternMatcher; +import org.apache.struts2.util.WildcardHelper; +import org.apache.struts2.util.fs.DefaultFileManagerFactory; +import org.apache.struts2.util.location.LocatableProperties; +import org.apache.struts2.util.reflection.ReflectionContextFactory; +import org.apache.struts2.validator.ActionValidatorManager; +import org.apache.struts2.validator.AnnotationActionValidatorManager; +import org.apache.struts2.validator.DefaultActionValidatorManager; +import org.apache.struts2.validator.DefaultValidatorFactory; +import org.apache.struts2.validator.DefaultValidatorFileParser; +import org.apache.struts2.validator.ValidatorFactory; +import org.apache.struts2.validator.ValidatorFileParser; import ognl.PropertyAccessor; import org.apache.struts2.dispatcher.HttpParameters; import org.apache.struts2.dispatcher.Parameter; diff --git a/core/src/main/java/com/opensymphony/xwork2/config/providers/ValueSubstitutor.java b/core/src/main/java/org/apache/struts2/config/providers/ValueSubstitutor.java similarity index 94% rename from core/src/main/java/com/opensymphony/xwork2/config/providers/ValueSubstitutor.java rename to core/src/main/java/org/apache/struts2/config/providers/ValueSubstitutor.java index da6a01d40c..92926697cd 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/providers/ValueSubstitutor.java +++ b/core/src/main/java/org/apache/struts2/config/providers/ValueSubstitutor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config.providers; +package org.apache.struts2.config.providers; /** * @since Apache Struts 2.5.6 diff --git a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java b/core/src/main/java/org/apache/struts2/config/providers/XmlConfigurationProvider.java similarity index 93% rename from core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java rename to core/src/main/java/org/apache/struts2/config/providers/XmlConfigurationProvider.java index c3c8049c2f..1191f13806 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java +++ b/core/src/main/java/org/apache/struts2/config/providers/XmlConfigurationProvider.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config.providers; - -import com.opensymphony.xwork2.FileManager; -import com.opensymphony.xwork2.FileManagerFactory; -import com.opensymphony.xwork2.config.Configuration; -import com.opensymphony.xwork2.config.ConfigurationException; -import com.opensymphony.xwork2.inject.ContainerBuilder; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.ClassLoaderUtil; -import com.opensymphony.xwork2.util.ClassPathFinder; -import com.opensymphony.xwork2.util.DomHelper; -import com.opensymphony.xwork2.util.location.LocatableProperties; +package org.apache.struts2.config.providers; + +import org.apache.struts2.FileManager; +import org.apache.struts2.FileManagerFactory; +import org.apache.struts2.config.Configuration; +import org.apache.struts2.config.ConfigurationException; +import org.apache.struts2.inject.ContainerBuilder; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.ClassLoaderUtil; +import org.apache.struts2.util.ClassPathFinder; +import org.apache.struts2.util.DomHelper; +import org.apache.struts2.util.location.LocatableProperties; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.StrutsException; diff --git a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlDocConfigurationProvider.java b/core/src/main/java/org/apache/struts2/config/providers/XmlDocConfigurationProvider.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/config/providers/XmlDocConfigurationProvider.java rename to core/src/main/java/org/apache/struts2/config/providers/XmlDocConfigurationProvider.java index 87eb2a84aa..2ae13bcce0 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlDocConfigurationProvider.java +++ b/core/src/main/java/org/apache/struts2/config/providers/XmlDocConfigurationProvider.java @@ -16,34 +16,34 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config.providers; - -import com.opensymphony.xwork2.Action; -import com.opensymphony.xwork2.ObjectFactory; -import com.opensymphony.xwork2.config.BeanSelectionProvider; -import com.opensymphony.xwork2.config.Configuration; -import com.opensymphony.xwork2.config.ConfigurationException; -import com.opensymphony.xwork2.config.ConfigurationProvider; -import com.opensymphony.xwork2.config.ConfigurationUtil; -import com.opensymphony.xwork2.config.entities.ActionConfig; -import com.opensymphony.xwork2.config.entities.ExceptionMappingConfig; -import com.opensymphony.xwork2.config.entities.InterceptorConfig; -import com.opensymphony.xwork2.config.entities.InterceptorMapping; -import com.opensymphony.xwork2.config.entities.InterceptorStackConfig; -import com.opensymphony.xwork2.config.entities.PackageConfig; -import com.opensymphony.xwork2.config.entities.ResultConfig; -import com.opensymphony.xwork2.config.entities.ResultTypeConfig; -import com.opensymphony.xwork2.config.entities.UnknownHandlerConfig; -import com.opensymphony.xwork2.config.impl.LocatableFactory; -import com.opensymphony.xwork2.inject.Container; -import com.opensymphony.xwork2.inject.ContainerBuilder; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.inject.Scope; -import com.opensymphony.xwork2.util.ClassLoaderUtil; -import com.opensymphony.xwork2.util.DomHelper; -import com.opensymphony.xwork2.util.location.LocatableProperties; -import com.opensymphony.xwork2.util.location.Location; -import com.opensymphony.xwork2.util.location.LocationUtils; +package org.apache.struts2.config.providers; + +import org.apache.struts2.Action; +import org.apache.struts2.ObjectFactory; +import org.apache.struts2.config.BeanSelectionProvider; +import org.apache.struts2.config.Configuration; +import org.apache.struts2.config.ConfigurationException; +import org.apache.struts2.config.ConfigurationProvider; +import org.apache.struts2.config.ConfigurationUtil; +import org.apache.struts2.config.entities.ActionConfig; +import org.apache.struts2.config.entities.ExceptionMappingConfig; +import org.apache.struts2.config.entities.InterceptorConfig; +import org.apache.struts2.config.entities.InterceptorMapping; +import org.apache.struts2.config.entities.InterceptorStackConfig; +import org.apache.struts2.config.entities.PackageConfig; +import org.apache.struts2.config.entities.ResultConfig; +import org.apache.struts2.config.entities.ResultTypeConfig; +import org.apache.struts2.config.entities.UnknownHandlerConfig; +import org.apache.struts2.config.impl.LocatableFactory; +import org.apache.struts2.inject.Container; +import org.apache.struts2.inject.ContainerBuilder; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.inject.Scope; +import org.apache.struts2.util.ClassLoaderUtil; +import org.apache.struts2.util.DomHelper; +import org.apache.struts2.util.location.LocatableProperties; +import org.apache.struts2.util.location.Location; +import org.apache.struts2.util.location.LocationUtils; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; @@ -66,7 +66,7 @@ import java.util.Set; import java.util.function.Consumer; -import static com.opensymphony.xwork2.util.TextParseUtil.commaDelimitedStringToSet; +import static org.apache.struts2.util.TextParseUtil.commaDelimitedStringToSet; import static java.lang.Boolean.parseBoolean; import static java.lang.Character.isLowerCase; import static java.lang.Character.toUpperCase; @@ -76,7 +76,7 @@ import static org.apache.commons.lang3.StringUtils.trimToNull; /** - * This is a base XWork2 {@link ConfigurationProvider} for loading configuration from a parsed + * This is a base Struts {@link ConfigurationProvider} for loading configuration from a parsed * {@link Document XML document}. By extending this class, configuration can be loaded from any source that an XML * document can be parsed from. Note that this class does not validate the document against any provided DTDs. For * loading configuration from an XML file with DTD validation, please see diff --git a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlHelper.java b/core/src/main/java/org/apache/struts2/config/providers/XmlHelper.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/config/providers/XmlHelper.java rename to core/src/main/java/org/apache/struts2/config/providers/XmlHelper.java index 8f6977f854..6ad3651f41 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlHelper.java +++ b/core/src/main/java/org/apache/struts2/config/providers/XmlHelper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.config.providers; +package org.apache.struts2.config.providers; import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; diff --git a/core/src/main/java/com/opensymphony/xwork2/config/providers/package.html b/core/src/main/java/org/apache/struts2/config/providers/package.html similarity index 100% rename from core/src/main/java/com/opensymphony/xwork2/config/providers/package.html rename to core/src/main/java/org/apache/struts2/config/providers/package.html diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/ConversionAnnotationProcessor.java b/core/src/main/java/org/apache/struts2/conversion/ConversionAnnotationProcessor.java similarity index 86% rename from core/src/main/java/com/opensymphony/xwork2/conversion/ConversionAnnotationProcessor.java rename to core/src/main/java/org/apache/struts2/conversion/ConversionAnnotationProcessor.java index 9daa28b129..13f2287023 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/ConversionAnnotationProcessor.java +++ b/core/src/main/java/org/apache/struts2/conversion/ConversionAnnotationProcessor.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.conversion; +package org.apache.struts2.conversion; -import com.opensymphony.xwork2.conversion.annotations.TypeConversion; +import org.apache.struts2.conversion.annotations.TypeConversion; import java.util.Map; /** - * Used to process {@link com.opensymphony.xwork2.conversion.annotations.TypeConversion} + * Used to process {@link TypeConversion} * annotation to read defined Converters */ public interface ConversionAnnotationProcessor { diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/ConversionFileProcessor.java b/core/src/main/java/org/apache/struts2/conversion/ConversionFileProcessor.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/conversion/ConversionFileProcessor.java rename to core/src/main/java/org/apache/struts2/conversion/ConversionFileProcessor.java index f16a9eb70d..5fe2063e76 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/ConversionFileProcessor.java +++ b/core/src/main/java/org/apache/struts2/conversion/ConversionFileProcessor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.conversion; +package org.apache.struts2.conversion; import java.util.Map; diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/ConversionPropertiesProcessor.java b/core/src/main/java/org/apache/struts2/conversion/ConversionPropertiesProcessor.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/conversion/ConversionPropertiesProcessor.java rename to core/src/main/java/org/apache/struts2/conversion/ConversionPropertiesProcessor.java index 5fc6dd2065..b6848744c5 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/ConversionPropertiesProcessor.java +++ b/core/src/main/java/org/apache/struts2/conversion/ConversionPropertiesProcessor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.conversion; +package org.apache.struts2.conversion; /** * Used to read converters from Properties file diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/NullHandler.java b/core/src/main/java/org/apache/struts2/conversion/NullHandler.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/conversion/NullHandler.java rename to core/src/main/java/org/apache/struts2/conversion/NullHandler.java index 01cbec76bd..2eb2ed06fc 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/NullHandler.java +++ b/core/src/main/java/org/apache/struts2/conversion/NullHandler.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.conversion; +package org.apache.struts2.conversion; import java.util.Map; @@ -42,7 +42,7 @@ public interface NullHandler * @return object */ Object nullMethodResult(Map context, Object target, String methodName, Object[] args); - + /** * Property in target evaluated to null. Property can be a constant * String property name or a DynamicSubscript. diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/ObjectTypeDeterminer.java b/core/src/main/java/org/apache/struts2/conversion/ObjectTypeDeterminer.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/conversion/ObjectTypeDeterminer.java rename to core/src/main/java/org/apache/struts2/conversion/ObjectTypeDeterminer.java index 852b33043a..d43e45e047 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/ObjectTypeDeterminer.java +++ b/core/src/main/java/org/apache/struts2/conversion/ObjectTypeDeterminer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.conversion; +package org.apache.struts2.conversion; /** * Determines what the key and and element class of a Map or Collection should be. For Maps, the elements are the diff --git a/core/src/main/java/org/apache/struts2/conversion/StrutsConversionPropertiesProcessor.java b/core/src/main/java/org/apache/struts2/conversion/StrutsConversionPropertiesProcessor.java index 0f509dfb47..df4ca6972b 100644 --- a/core/src/main/java/org/apache/struts2/conversion/StrutsConversionPropertiesProcessor.java +++ b/core/src/main/java/org/apache/struts2/conversion/StrutsConversionPropertiesProcessor.java @@ -18,13 +18,9 @@ */ package org.apache.struts2.conversion; -import com.opensymphony.xwork2.conversion.ConversionPropertiesProcessor; -import com.opensymphony.xwork2.conversion.TypeConverter; -import com.opensymphony.xwork2.conversion.TypeConverterCreator; -import com.opensymphony.xwork2.conversion.TypeConverterHolder; -import com.opensymphony.xwork2.inject.EarlyInitializable; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.ClassLoaderUtil; +import org.apache.struts2.inject.EarlyInitializable; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.ClassLoaderUtil; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; import org.apache.struts2.StrutsException; diff --git a/core/src/main/java/org/apache/struts2/conversion/StrutsTypeConverterCreator.java b/core/src/main/java/org/apache/struts2/conversion/StrutsTypeConverterCreator.java index eee8ff7df5..443f2ff5a5 100644 --- a/core/src/main/java/org/apache/struts2/conversion/StrutsTypeConverterCreator.java +++ b/core/src/main/java/org/apache/struts2/conversion/StrutsTypeConverterCreator.java @@ -18,10 +18,8 @@ */ package org.apache.struts2.conversion; -import com.opensymphony.xwork2.ObjectFactory; -import com.opensymphony.xwork2.conversion.TypeConverter; -import com.opensymphony.xwork2.conversion.TypeConverterCreator; -import com.opensymphony.xwork2.inject.Inject; +import org.apache.struts2.ObjectFactory; +import org.apache.struts2.inject.Inject; /** * Default implementation of {@link TypeConverterCreator} diff --git a/core/src/main/java/org/apache/struts2/conversion/StrutsTypeConverterHolder.java b/core/src/main/java/org/apache/struts2/conversion/StrutsTypeConverterHolder.java index c904f3676a..3013c3bd47 100644 --- a/core/src/main/java/org/apache/struts2/conversion/StrutsTypeConverterHolder.java +++ b/core/src/main/java/org/apache/struts2/conversion/StrutsTypeConverterHolder.java @@ -18,9 +18,6 @@ */ package org.apache.struts2.conversion; -import com.opensymphony.xwork2.conversion.TypeConverter; -import com.opensymphony.xwork2.conversion.TypeConverterHolder; - import java.util.HashMap; import java.util.HashSet; import java.util.Map; diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/TypeConverter.java b/core/src/main/java/org/apache/struts2/conversion/TypeConverter.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/conversion/TypeConverter.java rename to core/src/main/java/org/apache/struts2/conversion/TypeConverter.java index 98725e95a5..322d70436d 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/TypeConverter.java +++ b/core/src/main/java/org/apache/struts2/conversion/TypeConverter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.conversion; +package org.apache.struts2.conversion; import java.lang.reflect.Member; import java.util.Map; diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/TypeConverterCreator.java b/core/src/main/java/org/apache/struts2/conversion/TypeConverterCreator.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/conversion/TypeConverterCreator.java rename to core/src/main/java/org/apache/struts2/conversion/TypeConverterCreator.java index 57151bc9f3..88a18b8924 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/TypeConverterCreator.java +++ b/core/src/main/java/org/apache/struts2/conversion/TypeConverterCreator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.conversion; +package org.apache.struts2.conversion; /** * Instantiate converter classes, if cannot create TypeConverter throws exception diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/TypeConverterHolder.java b/core/src/main/java/org/apache/struts2/conversion/TypeConverterHolder.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/conversion/TypeConverterHolder.java rename to core/src/main/java/org/apache/struts2/conversion/TypeConverterHolder.java index d58b65ae83..d20324719d 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/TypeConverterHolder.java +++ b/core/src/main/java/org/apache/struts2/conversion/TypeConverterHolder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.conversion; +package org.apache.struts2.conversion; import java.util.Map; diff --git a/core/src/main/java/org/apache/struts2/conversion/UploadedFileConverter.java b/core/src/main/java/org/apache/struts2/conversion/UploadedFileConverter.java index c57a3ef9c7..6549e8bf34 100644 --- a/core/src/main/java/org/apache/struts2/conversion/UploadedFileConverter.java +++ b/core/src/main/java/org/apache/struts2/conversion/UploadedFileConverter.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.conversion; -import com.opensymphony.xwork2.conversion.impl.DefaultTypeConverter; +import org.apache.struts2.conversion.impl.DefaultTypeConverter; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.dispatcher.multipart.UploadedFile; diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/annotations/Conversion.java b/core/src/main/java/org/apache/struts2/conversion/annotations/Conversion.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/conversion/annotations/Conversion.java rename to core/src/main/java/org/apache/struts2/conversion/annotations/Conversion.java index 3e8b173439..4f25b18ad7 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/annotations/Conversion.java +++ b/core/src/main/java/org/apache/struts2/conversion/annotations/Conversion.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.conversion.annotations; +package org.apache.struts2.conversion.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/annotations/ConversionRule.java b/core/src/main/java/org/apache/struts2/conversion/annotations/ConversionRule.java similarity index 95% rename from core/src/main/java/com/opensymphony/xwork2/conversion/annotations/ConversionRule.java rename to core/src/main/java/org/apache/struts2/conversion/annotations/ConversionRule.java index 8a5e1785d5..fa75f69e46 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/annotations/ConversionRule.java +++ b/core/src/main/java/org/apache/struts2/conversion/annotations/ConversionRule.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.conversion.annotations; +package org.apache.struts2.conversion.annotations; /** * ConversionRule diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/annotations/ConversionType.java b/core/src/main/java/org/apache/struts2/conversion/annotations/ConversionType.java similarity index 95% rename from core/src/main/java/com/opensymphony/xwork2/conversion/annotations/ConversionType.java rename to core/src/main/java/org/apache/struts2/conversion/annotations/ConversionType.java index 7f219ee8ab..cff08a7863 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/annotations/ConversionType.java +++ b/core/src/main/java/org/apache/struts2/conversion/annotations/ConversionType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.conversion.annotations; +package org.apache.struts2.conversion.annotations; /** * ConversionType diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java b/core/src/main/java/org/apache/struts2/conversion/annotations/TypeConversion.java similarity index 95% rename from core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java rename to core/src/main/java/org/apache/struts2/conversion/annotations/TypeConversion.java index eda8a585a2..a28d8c9873 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java +++ b/core/src/main/java/org/apache/struts2/conversion/annotations/TypeConversion.java @@ -16,9 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.conversion.annotations; +package org.apache.struts2.conversion.annotations; -import com.opensymphony.xwork2.conversion.impl.XWorkBasicConverter; +import org.apache.struts2.conversion.impl.XWorkBasicConverter; +import org.apache.struts2.conversion.impl.DefaultObjectTypeDeterminer; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -173,9 +174,9 @@ /** * The ConversionRule can be a PROPERTY, KEY, KEY_PROPERTY, ELEMENT, COLLECTION (deprecated) or a MAP. - * Note: Collection and Map conversion rules can be determined via com.opensymphony.xwork2.util.DefaultObjectTypeDeterminer. + * Note: Collection and Map conversion rules can be determined via org.apache.struts2.util.DefaultObjectTypeDeterminer. * - * @see com.opensymphony.xwork2.conversion.impl.DefaultObjectTypeDeterminer + * @see DefaultObjectTypeDeterminer * * @return the conversion rule */ diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/annotations/package.html b/core/src/main/java/org/apache/struts2/conversion/annotations/package.html similarity index 100% rename from core/src/main/java/com/opensymphony/xwork2/conversion/annotations/package.html rename to core/src/main/java/org/apache/struts2/conversion/annotations/package.html diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/ArrayConverter.java b/core/src/main/java/org/apache/struts2/conversion/impl/ArrayConverter.java similarity index 94% rename from core/src/main/java/com/opensymphony/xwork2/conversion/impl/ArrayConverter.java rename to core/src/main/java/org/apache/struts2/conversion/impl/ArrayConverter.java index 3de49878e3..e21ad34823 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/ArrayConverter.java +++ b/core/src/main/java/org/apache/struts2/conversion/impl/ArrayConverter.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.conversion.impl; +package org.apache.struts2.conversion.impl; -import com.opensymphony.xwork2.conversion.TypeConverter; +import org.apache.struts2.conversion.TypeConverter; import java.lang.reflect.Array; import java.lang.reflect.Member; diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/CollectionConverter.java b/core/src/main/java/org/apache/struts2/conversion/impl/CollectionConverter.java similarity index 89% rename from core/src/main/java/com/opensymphony/xwork2/conversion/impl/CollectionConverter.java rename to core/src/main/java/org/apache/struts2/conversion/impl/CollectionConverter.java index b7f707f404..815380927b 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/CollectionConverter.java +++ b/core/src/main/java/org/apache/struts2/conversion/impl/CollectionConverter.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.conversion.impl; +package org.apache.struts2.conversion.impl; -import com.opensymphony.xwork2.conversion.ObjectTypeDeterminer; -import com.opensymphony.xwork2.conversion.TypeConverter; -import com.opensymphony.xwork2.inject.Inject; +import org.apache.struts2.conversion.ObjectTypeDeterminer; +import org.apache.struts2.conversion.TypeConverter; +import org.apache.struts2.inject.Inject; import java.lang.reflect.Member; import java.util.Collection; @@ -61,7 +61,7 @@ public Object convertValue(Map context, Object target, Member me for (Object anObjArray : objArray) { Object convertedValue = converter.convertValue(context, target, member, propertyName, anObjArray, memberType); - if (!TypeConverter.NO_CONVERSION_POSSIBLE.equals(convertedValue)) { + if (!NO_CONVERSION_POSSIBLE.equals(convertedValue)) { result.add(convertedValue); } } @@ -72,7 +72,7 @@ public Object convertValue(Map context, Object target, Member me for (Object aCol : col) { Object convertedValue = converter.convertValue(context, target, member, propertyName, aCol, memberType); - if (!TypeConverter.NO_CONVERSION_POSSIBLE.equals(convertedValue)) { + if (!NO_CONVERSION_POSSIBLE.equals(convertedValue)) { result.add(convertedValue); } } @@ -80,7 +80,7 @@ public Object convertValue(Map context, Object target, Member me result = createCollection(toType, memberType, -1); TypeConverter converter = getTypeConverter(context); Object convertedValue = converter.convertValue(context, target, member, propertyName, value, memberType); - if (!TypeConverter.NO_CONVERSION_POSSIBLE.equals(convertedValue)) { + if (!NO_CONVERSION_POSSIBLE.equals(convertedValue)) { result.add(convertedValue); } } diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/ConversionData.java b/core/src/main/java/org/apache/struts2/conversion/impl/ConversionData.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/conversion/impl/ConversionData.java rename to core/src/main/java/org/apache/struts2/conversion/impl/ConversionData.java index 2c3dd5d5f2..fa9c28f610 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/ConversionData.java +++ b/core/src/main/java/org/apache/struts2/conversion/impl/ConversionData.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.conversion.impl; +package org.apache.struts2.conversion.impl; public class ConversionData { private Object value; diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DateConverter.java b/core/src/main/java/org/apache/struts2/conversion/impl/DateConverter.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/conversion/impl/DateConverter.java rename to core/src/main/java/org/apache/struts2/conversion/impl/DateConverter.java index 298381b162..6d89be2847 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DateConverter.java +++ b/core/src/main/java/org/apache/struts2/conversion/impl/DateConverter.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.conversion.impl; +package org.apache.struts2.conversion.impl; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.TextProvider; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.ActionContext; +import org.apache.struts2.TextProvider; +import org.apache.struts2.util.ValueStack; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.conversion.TypeConversionException; diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultConversionAnnotationProcessor.java b/core/src/main/java/org/apache/struts2/conversion/impl/DefaultConversionAnnotationProcessor.java similarity index 88% rename from core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultConversionAnnotationProcessor.java rename to core/src/main/java/org/apache/struts2/conversion/impl/DefaultConversionAnnotationProcessor.java index 8021f3f92e..fcf2d727d3 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultConversionAnnotationProcessor.java +++ b/core/src/main/java/org/apache/struts2/conversion/impl/DefaultConversionAnnotationProcessor.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.conversion.impl; +package org.apache.struts2.conversion.impl; -import com.opensymphony.xwork2.conversion.ConversionAnnotationProcessor; -import com.opensymphony.xwork2.conversion.TypeConverter; -import com.opensymphony.xwork2.conversion.TypeConverterCreator; -import com.opensymphony.xwork2.conversion.TypeConverterHolder; -import com.opensymphony.xwork2.conversion.annotations.ConversionRule; -import com.opensymphony.xwork2.conversion.annotations.ConversionType; -import com.opensymphony.xwork2.conversion.annotations.TypeConversion; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.ClassLoaderUtil; +import org.apache.struts2.conversion.ConversionAnnotationProcessor; +import org.apache.struts2.conversion.TypeConverter; +import org.apache.struts2.conversion.TypeConverterCreator; +import org.apache.struts2.conversion.TypeConverterHolder; +import org.apache.struts2.conversion.annotations.ConversionRule; +import org.apache.struts2.conversion.annotations.ConversionType; +import org.apache.struts2.conversion.annotations.TypeConversion; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.ClassLoaderUtil; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultConversionFileProcessor.java b/core/src/main/java/org/apache/struts2/conversion/impl/DefaultConversionFileProcessor.java similarity index 92% rename from core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultConversionFileProcessor.java rename to core/src/main/java/org/apache/struts2/conversion/impl/DefaultConversionFileProcessor.java index 7995b7dc33..24db040b4f 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultConversionFileProcessor.java +++ b/core/src/main/java/org/apache/struts2/conversion/impl/DefaultConversionFileProcessor.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.conversion.impl; +package org.apache.struts2.conversion.impl; -import com.opensymphony.xwork2.FileManager; -import com.opensymphony.xwork2.FileManagerFactory; -import com.opensymphony.xwork2.conversion.ConversionFileProcessor; -import com.opensymphony.xwork2.conversion.TypeConverter; -import com.opensymphony.xwork2.conversion.TypeConverterCreator; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.ClassLoaderUtil; +import org.apache.struts2.FileManager; +import org.apache.struts2.FileManagerFactory; +import org.apache.struts2.conversion.ConversionFileProcessor; +import org.apache.struts2.conversion.TypeConverter; +import org.apache.struts2.conversion.TypeConverterCreator; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.ClassLoaderUtil; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultObjectTypeDeterminer.java b/core/src/main/java/org/apache/struts2/conversion/impl/DefaultObjectTypeDeterminer.java similarity index 94% rename from core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultObjectTypeDeterminer.java rename to core/src/main/java/org/apache/struts2/conversion/impl/DefaultObjectTypeDeterminer.java index 62d902355a..db56ae0754 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultObjectTypeDeterminer.java +++ b/core/src/main/java/org/apache/struts2/conversion/impl/DefaultObjectTypeDeterminer.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.conversion.impl; +package org.apache.struts2.conversion.impl; -import com.opensymphony.xwork2.conversion.ObjectTypeDeterminer; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.CreateIfNull; -import com.opensymphony.xwork2.util.Element; -import com.opensymphony.xwork2.util.Key; -import com.opensymphony.xwork2.util.KeyProperty; -import com.opensymphony.xwork2.util.reflection.ReflectionException; -import com.opensymphony.xwork2.util.reflection.ReflectionProvider; +import org.apache.struts2.conversion.ObjectTypeDeterminer; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.CreateIfNull; +import org.apache.struts2.util.Element; +import org.apache.struts2.util.Key; +import org.apache.struts2.util.KeyProperty; +import org.apache.struts2.util.reflection.ReflectionException; +import org.apache.struts2.util.reflection.ReflectionProvider; import org.apache.commons.lang3.BooleanUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -82,7 +82,7 @@ public DefaultObjectTypeDeterminer(@Inject XWorkConverter converter, @Inject Ref * * @param parentClass the Class which contains as a property the Map or Collection we are finding the key for. * @param property the property of the Map or Collection for the given parent class - * @see com.opensymphony.xwork2.conversion.ObjectTypeDeterminer#getKeyClass(Class, String) + * @see ObjectTypeDeterminer#getKeyClass(Class, String) */ public Class getKeyClass(Class parentClass, String property) { Key annotation = getAnnotation(parentClass, property, Key.class); @@ -106,7 +106,7 @@ public Class getKeyClass(Class parentClass, String property) { * * @param parentClass the Class which contains as a property the Map or Collection we are finding the key for. * @param property the property of the Map or Collection for the given parent class - * @see com.opensymphony.xwork2.conversion.ObjectTypeDeterminer#getElementClass(Class, String, Object) + * @see ObjectTypeDeterminer#getElementClass(Class, String, Object) */ public Class getElementClass(Class parentClass, String property, Object key) { Element annotation = getAnnotation(parentClass, property, Element.class); @@ -135,7 +135,7 @@ public Class getElementClass(Class parentClass, String property, Object key) { * * @param parentClass the Class which contains as a property the Map or Collection we are finding the key for. * @param property the property of the Map or Collection for the given parent class - * @see com.opensymphony.xwork2.conversion.ObjectTypeDeterminer#getKeyProperty(Class, String) + * @see ObjectTypeDeterminer#getKeyProperty(Class, String) */ public String getKeyProperty(Class parentClass, String property) { KeyProperty annotation = getAnnotation(parentClass, property, KeyProperty.class); diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverter.java b/core/src/main/java/org/apache/struts2/conversion/impl/DefaultTypeConverter.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverter.java rename to core/src/main/java/org/apache/struts2/conversion/impl/DefaultTypeConverter.java index fb9d91cd60..a6ebef0a2e 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverter.java +++ b/core/src/main/java/org/apache/struts2/conversion/impl/DefaultTypeConverter.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.conversion.impl; +package org.apache.struts2.conversion.impl; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.LocaleProviderFactory; -import com.opensymphony.xwork2.conversion.TypeConverter; -import com.opensymphony.xwork2.inject.Container; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.ognl.XWorkTypeConverterWrapper; +import org.apache.struts2.ActionContext; +import org.apache.struts2.LocaleProviderFactory; +import org.apache.struts2.conversion.TypeConverter; +import org.apache.struts2.inject.Container; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.ognl.XWorkTypeConverterWrapper; import ognl.OgnlContext; import java.lang.reflect.Array; diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/InstantiatingNullHandler.java b/core/src/main/java/org/apache/struts2/conversion/impl/InstantiatingNullHandler.java similarity index 93% rename from core/src/main/java/com/opensymphony/xwork2/conversion/impl/InstantiatingNullHandler.java rename to core/src/main/java/org/apache/struts2/conversion/impl/InstantiatingNullHandler.java index e7cc1713b4..52ebdd836c 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/InstantiatingNullHandler.java +++ b/core/src/main/java/org/apache/struts2/conversion/impl/InstantiatingNullHandler.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.conversion.impl; - -import com.opensymphony.xwork2.ObjectFactory; -import com.opensymphony.xwork2.conversion.NullHandler; -import com.opensymphony.xwork2.conversion.ObjectTypeDeterminer; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.reflection.ReflectionContextState; -import com.opensymphony.xwork2.util.reflection.ReflectionProvider; +package org.apache.struts2.conversion.impl; + +import org.apache.struts2.ObjectFactory; +import org.apache.struts2.conversion.NullHandler; +import org.apache.struts2.conversion.ObjectTypeDeterminer; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.reflection.ReflectionContextState; +import org.apache.struts2.util.reflection.ReflectionProvider; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/NumberConverter.java b/core/src/main/java/org/apache/struts2/conversion/impl/NumberConverter.java similarity index 99% rename from core/src/main/java/com/opensymphony/xwork2/conversion/impl/NumberConverter.java rename to core/src/main/java/org/apache/struts2/conversion/impl/NumberConverter.java index f1b03ad5fa..8a1da51239 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/NumberConverter.java +++ b/core/src/main/java/org/apache/struts2/conversion/impl/NumberConverter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.conversion.impl; +package org.apache.struts2.conversion.impl; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/StringConverter.java b/core/src/main/java/org/apache/struts2/conversion/impl/StringConverter.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/conversion/impl/StringConverter.java rename to core/src/main/java/org/apache/struts2/conversion/impl/StringConverter.java index e0f7d4bb23..807c82f87c 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/StringConverter.java +++ b/core/src/main/java/org/apache/struts2/conversion/impl/StringConverter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.conversion.impl; +package org.apache.struts2.conversion.impl; import org.apache.commons.lang3.StringUtils; diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverter.java b/core/src/main/java/org/apache/struts2/conversion/impl/XWorkBasicConverter.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverter.java rename to core/src/main/java/org/apache/struts2/conversion/impl/XWorkBasicConverter.java index c02b5ce61a..c270a4bcdb 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverter.java +++ b/core/src/main/java/org/apache/struts2/conversion/impl/XWorkBasicConverter.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.conversion.impl; +package org.apache.struts2.conversion.impl; -import com.opensymphony.xwork2.conversion.TypeConverter; -import com.opensymphony.xwork2.inject.Container; -import com.opensymphony.xwork2.inject.Inject; +import org.apache.struts2.conversion.TypeConverter; +import org.apache.struts2.inject.Container; +import org.apache.struts2.inject.Inject; import org.apache.struts2.StrutsConstants; import org.apache.struts2.conversion.TypeConversionException; diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java b/core/src/main/java/org/apache/struts2/conversion/impl/XWorkConverter.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java rename to core/src/main/java/org/apache/struts2/conversion/impl/XWorkConverter.java index cdad25991a..507f765d07 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java +++ b/core/src/main/java/org/apache/struts2/conversion/impl/XWorkConverter.java @@ -16,24 +16,24 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.conversion.impl; - -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.FileManager; -import com.opensymphony.xwork2.FileManagerFactory; -import com.opensymphony.xwork2.LocalizedTextProvider; -import com.opensymphony.xwork2.conversion.ConversionAnnotationProcessor; -import com.opensymphony.xwork2.conversion.ConversionFileProcessor; -import com.opensymphony.xwork2.conversion.TypeConverter; -import com.opensymphony.xwork2.conversion.TypeConverterHolder; -import com.opensymphony.xwork2.conversion.annotations.Conversion; -import com.opensymphony.xwork2.conversion.annotations.TypeConversion; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.AnnotationUtils; -import com.opensymphony.xwork2.util.ClassLoaderUtil; -import com.opensymphony.xwork2.util.CompoundRoot; -import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.reflection.ReflectionContextState; +package org.apache.struts2.conversion.impl; + +import org.apache.struts2.ActionContext; +import org.apache.struts2.FileManager; +import org.apache.struts2.FileManagerFactory; +import org.apache.struts2.LocalizedTextProvider; +import org.apache.struts2.conversion.ConversionAnnotationProcessor; +import org.apache.struts2.conversion.ConversionFileProcessor; +import org.apache.struts2.conversion.TypeConverter; +import org.apache.struts2.conversion.TypeConverterHolder; +import org.apache.struts2.conversion.annotations.Conversion; +import org.apache.struts2.conversion.annotations.TypeConversion; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.AnnotationUtils; +import org.apache.struts2.util.ClassLoaderUtil; +import org.apache.struts2.util.CompoundRoot; +import org.apache.struts2.util.ValueStack; +import org.apache.struts2.util.reflection.ReflectionContextState; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkList.java b/core/src/main/java/org/apache/struts2/conversion/impl/XWorkList.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkList.java rename to core/src/main/java/org/apache/struts2/conversion/impl/XWorkList.java index ee5093ed47..2850cbe39d 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkList.java +++ b/core/src/main/java/org/apache/struts2/conversion/impl/XWorkList.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.conversion.impl; +package org.apache.struts2.conversion.impl; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ObjectFactory; -import com.opensymphony.xwork2.conversion.TypeConverter; +import org.apache.struts2.ActionContext; +import org.apache.struts2.ObjectFactory; +import org.apache.struts2.conversion.TypeConverter; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.StrutsException; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ContainerHolder.java b/core/src/main/java/org/apache/struts2/dispatcher/ContainerHolder.java index 2d1c61657e..5e0b0ceb17 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/ContainerHolder.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/ContainerHolder.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.dispatcher; -import com.opensymphony.xwork2.inject.Container; +import org.apache.struts2.inject.Container; /** * Simple class to hold Container instance per thread to minimise number of attempts diff --git a/core/src/main/java/org/apache/struts2/dispatcher/DefaultActionSupport.java b/core/src/main/java/org/apache/struts2/dispatcher/DefaultActionSupport.java index 12828a0062..4b223f6dfc 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/DefaultActionSupport.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/DefaultActionSupport.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.dispatcher; -import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts2.ActionSupport; import jakarta.servlet.http.HttpServletRequest; import org.apache.struts2.ServletActionContext; import org.apache.struts2.interceptor.parameter.StrutsParameter; @@ -44,7 +44,7 @@ public DefaultActionSupport() { } /* (non-Javadoc) - * @see com.opensymphony.xwork2.ActionSupport#execute() + * @see org.apache.struts2.ActionSupport#execute() */ @Override public String execute() throws Exception { diff --git a/core/src/main/java/org/apache/struts2/dispatcher/DefaultDispatcherErrorHandler.java b/core/src/main/java/org/apache/struts2/dispatcher/DefaultDispatcherErrorHandler.java index 00cc4ff100..d643458541 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/DefaultDispatcherErrorHandler.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/DefaultDispatcherErrorHandler.java @@ -18,9 +18,9 @@ */ package org.apache.struts2.dispatcher; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.location.Location; -import com.opensymphony.xwork2.util.location.LocationUtils; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.location.Location; +import org.apache.struts2.util.location.LocationUtils; import freemarker.template.Template; import jakarta.servlet.RequestDispatcher; import jakarta.servlet.ServletContext; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java b/core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java index be8b18df40..18f4c54dd5 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.dispatcher; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.ClassLoaderUtil; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.ClassLoaderUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.lang3.BooleanUtils; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java index 4033a42b71..b7583f6e6b 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java @@ -18,36 +18,36 @@ */ package org.apache.struts2.dispatcher; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.ActionProxy; -import com.opensymphony.xwork2.ActionProxyFactory; -import com.opensymphony.xwork2.FileManager; -import com.opensymphony.xwork2.FileManagerFactory; -import com.opensymphony.xwork2.LocaleProviderFactory; -import com.opensymphony.xwork2.ObjectFactory; -import com.opensymphony.xwork2.Result; -import com.opensymphony.xwork2.config.Configuration; -import com.opensymphony.xwork2.config.ConfigurationException; -import com.opensymphony.xwork2.config.ConfigurationManager; -import com.opensymphony.xwork2.config.ConfigurationProvider; -import com.opensymphony.xwork2.config.FileManagerFactoryProvider; -import com.opensymphony.xwork2.config.FileManagerProvider; -import com.opensymphony.xwork2.config.ServletContextAwareConfigurationProvider; -import com.opensymphony.xwork2.config.entities.InterceptorMapping; -import com.opensymphony.xwork2.config.entities.InterceptorStackConfig; -import com.opensymphony.xwork2.config.entities.PackageConfig; -import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider; -import com.opensymphony.xwork2.inject.Container; -import com.opensymphony.xwork2.inject.ContainerBuilder; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.interceptor.Interceptor; -import com.opensymphony.xwork2.util.ClassLoaderUtil; -import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.ValueStackFactory; -import com.opensymphony.xwork2.util.location.LocatableProperties; -import com.opensymphony.xwork2.util.location.Location; -import com.opensymphony.xwork2.util.location.LocationUtils; +import org.apache.struts2.ActionContext; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.ActionProxy; +import org.apache.struts2.ActionProxyFactory; +import org.apache.struts2.FileManager; +import org.apache.struts2.FileManagerFactory; +import org.apache.struts2.LocaleProviderFactory; +import org.apache.struts2.ObjectFactory; +import org.apache.struts2.Result; +import org.apache.struts2.config.Configuration; +import org.apache.struts2.config.ConfigurationException; +import org.apache.struts2.config.ConfigurationManager; +import org.apache.struts2.config.ConfigurationProvider; +import org.apache.struts2.config.FileManagerFactoryProvider; +import org.apache.struts2.config.FileManagerProvider; +import org.apache.struts2.config.ServletContextAwareConfigurationProvider; +import org.apache.struts2.config.entities.InterceptorMapping; +import org.apache.struts2.config.entities.InterceptorStackConfig; +import org.apache.struts2.config.entities.PackageConfig; +import org.apache.struts2.config.providers.XmlConfigurationProvider; +import org.apache.struts2.inject.Container; +import org.apache.struts2.inject.ContainerBuilder; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.interceptor.Interceptor; +import org.apache.struts2.util.ClassLoaderUtil; +import org.apache.struts2.util.ValueStack; +import org.apache.struts2.util.ValueStackFactory; +import org.apache.struts2.util.location.LocatableProperties; +import org.apache.struts2.util.location.Location; +import org.apache.struts2.util.location.LocationUtils; import jakarta.servlet.ServletContext; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/InitOperations.java b/core/src/main/java/org/apache/struts2/dispatcher/InitOperations.java index 6f37a6392e..7c849edb7d 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/InitOperations.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/InitOperations.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.dispatcher; -import com.opensymphony.xwork2.ActionContext; +import org.apache.struts2.ActionContext; import java.util.HashMap; import java.util.Iterator; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/MockDispatcher.java b/core/src/main/java/org/apache/struts2/dispatcher/MockDispatcher.java index 65b8128775..d6a101d9ea 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/MockDispatcher.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/MockDispatcher.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.dispatcher; -import com.opensymphony.xwork2.config.ConfigurationManager; +import org.apache.struts2.config.ConfigurationManager; import jakarta.servlet.ServletContext; import java.util.Map; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/PrepareOperations.java b/core/src/main/java/org/apache/struts2/dispatcher/PrepareOperations.java index 142e6414b5..09df2c15f3 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/PrepareOperations.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/PrepareOperations.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.dispatcher; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.ActionContext; +import org.apache.struts2.util.ValueStack; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java b/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java index 69033dd9c5..416bf89d6e 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.dispatcher; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.ActionContext; +import org.apache.struts2.util.ValueStack; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequestWrapper; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapper.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapper.java index dd81a463ff..cdd1760cfa 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapper.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapper.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.dispatcher.mapper; -import com.opensymphony.xwork2.config.ConfigurationManager; +import org.apache.struts2.config.ConfigurationManager; import jakarta.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapping.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapping.java index 1d9bde5f1e..6414d3922c 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapping.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapping.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.dispatcher.mapper; -import com.opensymphony.xwork2.Result; +import org.apache.struts2.Result; import java.util.HashMap; import java.util.Map; @@ -108,7 +108,7 @@ public String getMethod() { public Result getResult() { return result; } - + /** * @return The extension used during this request */ @@ -150,7 +150,7 @@ public void setMethod(String method) { public void setParams(Map params) { this.params = params; } - + /** * @param extension The extension used in the request */ diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java index 90960a342f..f1e59eab92 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java @@ -18,9 +18,9 @@ */ package org.apache.struts2.dispatcher.mapper; -import com.opensymphony.xwork2.config.ConfigurationManager; -import com.opensymphony.xwork2.inject.Container; -import com.opensymphony.xwork2.inject.Inject; +import org.apache.struts2.config.ConfigurationManager; +import org.apache.struts2.inject.Container; +import org.apache.struts2.inject.Inject; import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java index 53797f5cf3..6e0f57c8b9 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java @@ -18,13 +18,13 @@ */ package org.apache.struts2.dispatcher.mapper; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.config.Configuration; -import com.opensymphony.xwork2.config.ConfigurationManager; -import com.opensymphony.xwork2.config.entities.ActionConfig; -import com.opensymphony.xwork2.config.entities.PackageConfig; -import com.opensymphony.xwork2.inject.Container; -import com.opensymphony.xwork2.inject.Inject; +import org.apache.struts2.ActionContext; +import org.apache.struts2.config.Configuration; +import org.apache.struts2.config.ConfigurationManager; +import org.apache.struts2.config.entities.ActionConfig; +import org.apache.struts2.config.entities.PackageConfig; +import org.apache.struts2.inject.Container; +import org.apache.struts2.inject.Inject; import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/PrefixBasedActionMapper.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/PrefixBasedActionMapper.java index 4ca0665758..a7126e80a6 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/PrefixBasedActionMapper.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/PrefixBasedActionMapper.java @@ -18,9 +18,9 @@ */ package org.apache.struts2.dispatcher.mapper; -import com.opensymphony.xwork2.config.ConfigurationManager; -import com.opensymphony.xwork2.inject.Container; -import com.opensymphony.xwork2.inject.Inject; +import org.apache.struts2.config.ConfigurationManager; +import org.apache.struts2.inject.Container; +import org.apache.struts2.inject.Inject; import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java index a2d1569c6d..988c23943c 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.dispatcher.mapper; -import com.opensymphony.xwork2.config.ConfigurationManager; -import com.opensymphony.xwork2.inject.Inject; +import org.apache.struts2.config.ConfigurationManager; +import org.apache.struts2.inject.Inject; import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java index 2af648b7ee..d93d45e98f 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.dispatcher.mapper; -import com.opensymphony.xwork2.config.ConfigurationManager; -import com.opensymphony.xwork2.inject.Inject; +import org.apache.struts2.config.ConfigurationManager; +import org.apache.struts2.inject.Inject; import jakarta.servlet.http.HttpServletRequest; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java b/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java index 94ce2122d6..ccb25e0535 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.dispatcher.multipart; -import com.opensymphony.xwork2.inject.Inject; +import org.apache.struts2.inject.Inject; import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.fileupload2.core.FileUploadByteCountLimitException; import org.apache.commons.fileupload2.core.FileUploadContentTypeException; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java b/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java index 532a5e45a0..6f5afe3490 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.dispatcher.multipart; -import com.opensymphony.xwork2.LocaleProvider; +import org.apache.struts2.LocaleProvider; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.dispatcher.LocalizedMessage; diff --git a/core/src/main/java/com/opensymphony/xwork2/factory/ActionFactory.java b/core/src/main/java/org/apache/struts2/factory/ActionFactory.java similarity index 88% rename from core/src/main/java/com/opensymphony/xwork2/factory/ActionFactory.java rename to core/src/main/java/org/apache/struts2/factory/ActionFactory.java index 15a0f780f3..1eb9dc3039 100644 --- a/core/src/main/java/com/opensymphony/xwork2/factory/ActionFactory.java +++ b/core/src/main/java/org/apache/struts2/factory/ActionFactory.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.factory; +package org.apache.struts2.factory; -import com.opensymphony.xwork2.config.entities.ActionConfig; +import org.apache.struts2.config.entities.ActionConfig; import java.util.Map; /** - * Used by {@link com.opensymphony.xwork2.ObjectFactory} to build actions + * Used by {@link org.apache.struts2.ObjectFactory} to build actions */ public interface ActionFactory { diff --git a/core/src/main/java/com/opensymphony/xwork2/factory/ConverterFactory.java b/core/src/main/java/org/apache/struts2/factory/ConverterFactory.java similarity index 82% rename from core/src/main/java/com/opensymphony/xwork2/factory/ConverterFactory.java rename to core/src/main/java/org/apache/struts2/factory/ConverterFactory.java index 00610ea9e2..a0c9cf6125 100644 --- a/core/src/main/java/com/opensymphony/xwork2/factory/ConverterFactory.java +++ b/core/src/main/java/org/apache/struts2/factory/ConverterFactory.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.factory; +package org.apache.struts2.factory; -import com.opensymphony.xwork2.conversion.TypeConverter; +import org.apache.struts2.conversion.TypeConverter; import java.util.Map; /** - * Dedicated interface used by {@link com.opensymphony.xwork2.ObjectFactory} to build {@link TypeConverter} + * Dedicated interface used by {@link org.apache.struts2.ObjectFactory} to build {@link TypeConverter} */ public interface ConverterFactory { @@ -31,7 +31,7 @@ public interface ConverterFactory { * Build converter of given type * * @param converterClass to instantiate - * @param extraContext a Map of extra context which uses the same keys as the {@link com.opensymphony.xwork2.ActionContext} + * @param extraContext a Map of extra context which uses the same keys as the {@link org.apache.struts2.ActionContext} * * @return instance of converterClass with inject dependencies * diff --git a/core/src/main/java/com/opensymphony/xwork2/factory/DefaultActionFactory.java b/core/src/main/java/org/apache/struts2/factory/DefaultActionFactory.java similarity index 87% rename from core/src/main/java/com/opensymphony/xwork2/factory/DefaultActionFactory.java rename to core/src/main/java/org/apache/struts2/factory/DefaultActionFactory.java index 44c036ce48..15d4555372 100644 --- a/core/src/main/java/com/opensymphony/xwork2/factory/DefaultActionFactory.java +++ b/core/src/main/java/org/apache/struts2/factory/DefaultActionFactory.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.factory; +package org.apache.struts2.factory; -import com.opensymphony.xwork2.ObjectFactory; -import com.opensymphony.xwork2.config.entities.ActionConfig; -import com.opensymphony.xwork2.inject.Inject; +import org.apache.struts2.ObjectFactory; +import org.apache.struts2.config.entities.ActionConfig; +import org.apache.struts2.inject.Inject; import java.util.Map; diff --git a/core/src/main/java/com/opensymphony/xwork2/factory/DefaultInterceptorFactory.java b/core/src/main/java/org/apache/struts2/factory/DefaultInterceptorFactory.java similarity index 88% rename from core/src/main/java/com/opensymphony/xwork2/factory/DefaultInterceptorFactory.java rename to core/src/main/java/org/apache/struts2/factory/DefaultInterceptorFactory.java index 745b26efb4..e5fb827ea1 100644 --- a/core/src/main/java/com/opensymphony/xwork2/factory/DefaultInterceptorFactory.java +++ b/core/src/main/java/org/apache/struts2/factory/DefaultInterceptorFactory.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.factory; +package org.apache.struts2.factory; -import com.opensymphony.xwork2.ObjectFactory; -import com.opensymphony.xwork2.config.ConfigurationException; -import com.opensymphony.xwork2.config.entities.InterceptorConfig; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.interceptor.Interceptor; -import com.opensymphony.xwork2.interceptor.WithLazyParams; -import com.opensymphony.xwork2.util.reflection.ReflectionProvider; +import org.apache.struts2.ObjectFactory; +import org.apache.struts2.config.ConfigurationException; +import org.apache.struts2.config.entities.InterceptorConfig; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.interceptor.Interceptor; +import org.apache.struts2.interceptor.WithLazyParams; +import org.apache.struts2.util.reflection.ReflectionProvider; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -84,7 +84,7 @@ public Interceptor buildInterceptor(InterceptorConfig interceptorConfig, Map *

    * Prefix based factory should be used with {@link org.apache.struts2.dispatcher.mapper.PrefixBasedActionMapper} - * to use appropriate {@link com.opensymphony.xwork2.ActionProxyFactory} connected with given + * to use appropriate {@link org.apache.struts2.ActionProxyFactory} connected with given * {@link org.apache.struts2.dispatcher.mapper.ActionMapper} *

    * diff --git a/core/src/main/java/com/opensymphony/xwork2/factory/ResultFactory.java b/core/src/main/java/org/apache/struts2/factory/ResultFactory.java similarity index 79% rename from core/src/main/java/com/opensymphony/xwork2/factory/ResultFactory.java rename to core/src/main/java/org/apache/struts2/factory/ResultFactory.java index b965bf8bd1..52df10c910 100644 --- a/core/src/main/java/com/opensymphony/xwork2/factory/ResultFactory.java +++ b/core/src/main/java/org/apache/struts2/factory/ResultFactory.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.factory; +package org.apache.struts2.factory; -import com.opensymphony.xwork2.Result; -import com.opensymphony.xwork2.config.entities.ResultConfig; +import org.apache.struts2.Result; +import org.apache.struts2.config.entities.ResultConfig; import java.util.Map; /** - * Used by {@link com.opensymphony.xwork2.ObjectFactory} to build {@link com.opensymphony.xwork2.Result} + * Used by {@link org.apache.struts2.ObjectFactory} to build {@link org.apache.struts2.Result} */ public interface ResultFactory { diff --git a/core/src/main/java/org/apache/struts2/factory/StrutsActionProxy.java b/core/src/main/java/org/apache/struts2/factory/StrutsActionProxy.java index c7542b6aba..dbf2f3a9b8 100644 --- a/core/src/main/java/org/apache/struts2/factory/StrutsActionProxy.java +++ b/core/src/main/java/org/apache/struts2/factory/StrutsActionProxy.java @@ -18,9 +18,9 @@ */ package org.apache.struts2.factory; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.DefaultActionProxy; +import org.apache.struts2.ActionContext; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.DefaultActionProxy; import org.apache.struts2.ServletActionContext; import java.io.Serial; diff --git a/core/src/main/java/org/apache/struts2/factory/StrutsActionProxyFactory.java b/core/src/main/java/org/apache/struts2/factory/StrutsActionProxyFactory.java index 2b32baa180..0a5cbf5aa5 100644 --- a/core/src/main/java/org/apache/struts2/factory/StrutsActionProxyFactory.java +++ b/core/src/main/java/org/apache/struts2/factory/StrutsActionProxyFactory.java @@ -18,15 +18,15 @@ */ package org.apache.struts2.factory; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.ActionProxy; -import com.opensymphony.xwork2.DefaultActionProxyFactory; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.ActionProxy; +import org.apache.struts2.DefaultActionProxyFactory; public class StrutsActionProxyFactory extends DefaultActionProxyFactory { @Override public ActionProxy createActionProxy(ActionInvocation inv, String namespace, String actionName, String methodName, boolean executeResult, boolean cleanupContext) { - + StrutsActionProxy proxy = new StrutsActionProxy(inv, namespace, actionName, methodName, executeResult, cleanupContext); container.inject(proxy); proxy.prepare(); diff --git a/core/src/main/java/com/opensymphony/xwork2/factory/StrutsConverterFactory.java b/core/src/main/java/org/apache/struts2/factory/StrutsConverterFactory.java similarity index 88% rename from core/src/main/java/com/opensymphony/xwork2/factory/StrutsConverterFactory.java rename to core/src/main/java/org/apache/struts2/factory/StrutsConverterFactory.java index 2c873e60b1..ef36df6e94 100644 --- a/core/src/main/java/com/opensymphony/xwork2/factory/StrutsConverterFactory.java +++ b/core/src/main/java/org/apache/struts2/factory/StrutsConverterFactory.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.factory; +package org.apache.struts2.factory; -import com.opensymphony.xwork2.conversion.TypeConverter; -import com.opensymphony.xwork2.inject.Container; -import com.opensymphony.xwork2.inject.Inject; +import org.apache.struts2.conversion.TypeConverter; +import org.apache.struts2.inject.Container; +import org.apache.struts2.inject.Inject; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; diff --git a/core/src/main/java/org/apache/struts2/factory/StrutsResultFactory.java b/core/src/main/java/org/apache/struts2/factory/StrutsResultFactory.java index 513ce5284f..3f5930d65e 100644 --- a/core/src/main/java/org/apache/struts2/factory/StrutsResultFactory.java +++ b/core/src/main/java/org/apache/struts2/factory/StrutsResultFactory.java @@ -18,20 +18,19 @@ */ package org.apache.struts2.factory; -import com.opensymphony.xwork2.ObjectFactory; -import com.opensymphony.xwork2.Result; -import com.opensymphony.xwork2.config.entities.ResultConfig; -import com.opensymphony.xwork2.factory.ResultFactory; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.result.ParamNameAwareResult; -import com.opensymphony.xwork2.util.reflection.ReflectionException; -import com.opensymphony.xwork2.util.reflection.ReflectionExceptionHandler; -import com.opensymphony.xwork2.util.reflection.ReflectionProvider; +import org.apache.struts2.ObjectFactory; +import org.apache.struts2.Result; +import org.apache.struts2.config.entities.ResultConfig; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.result.ParamNameAwareResult; +import org.apache.struts2.util.reflection.ReflectionException; +import org.apache.struts2.util.reflection.ReflectionExceptionHandler; +import org.apache.struts2.util.reflection.ReflectionProvider; import java.util.Map; /** - * Default implementation which uses {@link com.opensymphony.xwork2.result.ParamNameAwareResult} to accept or throw away parameters + * Default implementation which uses {@link ParamNameAwareResult} to accept or throw away parameters */ public class StrutsResultFactory implements ResultFactory { diff --git a/core/src/main/java/com/opensymphony/xwork2/factory/UnknownHandlerFactory.java b/core/src/main/java/org/apache/struts2/factory/UnknownHandlerFactory.java similarity index 79% rename from core/src/main/java/com/opensymphony/xwork2/factory/UnknownHandlerFactory.java rename to core/src/main/java/org/apache/struts2/factory/UnknownHandlerFactory.java index 07deb682af..11ce9dbc9b 100644 --- a/core/src/main/java/com/opensymphony/xwork2/factory/UnknownHandlerFactory.java +++ b/core/src/main/java/org/apache/struts2/factory/UnknownHandlerFactory.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.factory; +package org.apache.struts2.factory; -import com.opensymphony.xwork2.UnknownHandler; +import org.apache.struts2.UnknownHandler; import java.util.Map; /** - * Dedicated interface used by {@link com.opensymphony.xwork2.ObjectFactory} to build {@link com.opensymphony.xwork2.UnknownHandler} + * Dedicated interface used by {@link org.apache.struts2.ObjectFactory} to build {@link org.apache.struts2.UnknownHandler} */ public interface UnknownHandlerFactory { @@ -33,7 +33,7 @@ public interface UnknownHandlerFactory { * @param unknownHandlerName name of unknown handler defined in struts.xml * @param extraContext extra params * - * @return instance of {@link com.opensymphony.xwork2.UnknownHandler} with injected dependencies + * @return instance of {@link org.apache.struts2.UnknownHandler} with injected dependencies * * @throws Exception in case of any errors */ diff --git a/core/src/main/java/com/opensymphony/xwork2/factory/ValidatorFactory.java b/core/src/main/java/org/apache/struts2/factory/ValidatorFactory.java similarity index 84% rename from core/src/main/java/com/opensymphony/xwork2/factory/ValidatorFactory.java rename to core/src/main/java/org/apache/struts2/factory/ValidatorFactory.java index 51dc0fee0f..3660de5dc2 100644 --- a/core/src/main/java/com/opensymphony/xwork2/factory/ValidatorFactory.java +++ b/core/src/main/java/org/apache/struts2/factory/ValidatorFactory.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.factory; +package org.apache.struts2.factory; -import com.opensymphony.xwork2.validator.Validator; +import org.apache.struts2.validator.Validator; import java.util.Map; /** - * Dedicated interface used by {@link com.opensymphony.xwork2.ObjectFactory} to build {@link Validator} + * Dedicated interface used by {@link org.apache.struts2.ObjectFactory} to build {@link Validator} */ public interface ValidatorFactory { @@ -32,7 +32,7 @@ public interface ValidatorFactory { * * @param className the type of Validator to build * @param params property name -> value Map to set onto the Validator instance - * @param extraContext a Map of extra context which uses the same keys as the {@link com.opensymphony.xwork2.ActionContext} + * @param extraContext a Map of extra context which uses the same keys as the {@link org.apache.struts2.ActionContext} * * @return a validator instance * diff --git a/core/src/main/java/com/opensymphony/xwork2/inject/ConstructionContext.java b/core/src/main/java/org/apache/struts2/inject/ConstructionContext.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/inject/ConstructionContext.java rename to core/src/main/java/org/apache/struts2/inject/ConstructionContext.java index 5975e9561e..e2df08ed12 100644 --- a/core/src/main/java/com/opensymphony/xwork2/inject/ConstructionContext.java +++ b/core/src/main/java/org/apache/struts2/inject/ConstructionContext.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.opensymphony.xwork2.inject; +package org.apache.struts2.inject; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; diff --git a/core/src/main/java/com/opensymphony/xwork2/inject/Container.java b/core/src/main/java/org/apache/struts2/inject/Container.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/inject/Container.java rename to core/src/main/java/org/apache/struts2/inject/Container.java index 3411e522e8..cc20cf17bf 100644 --- a/core/src/main/java/com/opensymphony/xwork2/inject/Container.java +++ b/core/src/main/java/org/apache/struts2/inject/Container.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.opensymphony.xwork2.inject; +package org.apache.struts2.inject; import java.io.Serializable; import java.util.Set; @@ -93,7 +93,7 @@ public interface Container extends Serializable { /** * Gets an instance of the given dependency which was declared in - * {@link com.opensymphony.xwork2.inject.ContainerBuilder}. + * {@link ContainerBuilder}. * * @param type * @param type of dependency @@ -111,7 +111,7 @@ public interface Container extends Serializable { * @return instance */ T getInstance(Class type); - + /** * Gets a set of all registered names for the given type * @param type The instance type diff --git a/core/src/main/java/com/opensymphony/xwork2/inject/ContainerBuilder.java b/core/src/main/java/org/apache/struts2/inject/ContainerBuilder.java similarity index 99% rename from core/src/main/java/com/opensymphony/xwork2/inject/ContainerBuilder.java rename to core/src/main/java/org/apache/struts2/inject/ContainerBuilder.java index 93ff30588d..3d5f7f6b4f 100644 --- a/core/src/main/java/com/opensymphony/xwork2/inject/ContainerBuilder.java +++ b/core/src/main/java/org/apache/struts2/inject/ContainerBuilder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.opensymphony.xwork2.inject; +package org.apache.struts2.inject; import java.lang.reflect.Member; import java.util.ArrayList; diff --git a/core/src/main/java/com/opensymphony/xwork2/inject/ContainerImpl.java b/core/src/main/java/org/apache/struts2/inject/ContainerImpl.java similarity index 99% rename from core/src/main/java/com/opensymphony/xwork2/inject/ContainerImpl.java rename to core/src/main/java/org/apache/struts2/inject/ContainerImpl.java index 0306424b95..f6bb102803 100644 --- a/core/src/main/java/com/opensymphony/xwork2/inject/ContainerImpl.java +++ b/core/src/main/java/org/apache/struts2/inject/ContainerImpl.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.opensymphony.xwork2.inject; +package org.apache.struts2.inject; -import com.opensymphony.xwork2.inject.util.ReferenceCache; +import org.apache.struts2.inject.util.ReferenceCache; import java.io.Serializable; import java.lang.annotation.Annotation; diff --git a/core/src/main/java/com/opensymphony/xwork2/inject/Context.java b/core/src/main/java/org/apache/struts2/inject/Context.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/inject/Context.java rename to core/src/main/java/org/apache/struts2/inject/Context.java index 2f03778146..4269b16288 100644 --- a/core/src/main/java/com/opensymphony/xwork2/inject/Context.java +++ b/core/src/main/java/org/apache/struts2/inject/Context.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.opensymphony.xwork2.inject; +package org.apache.struts2.inject; import java.lang.reflect.Member; diff --git a/core/src/main/java/com/opensymphony/xwork2/inject/DependencyException.java b/core/src/main/java/org/apache/struts2/inject/DependencyException.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/inject/DependencyException.java rename to core/src/main/java/org/apache/struts2/inject/DependencyException.java index 097476aa29..9a5dcbbfaa 100644 --- a/core/src/main/java/com/opensymphony/xwork2/inject/DependencyException.java +++ b/core/src/main/java/org/apache/struts2/inject/DependencyException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.opensymphony.xwork2.inject; +package org.apache.struts2.inject; /** * Thrown when a dependency is misconfigured. diff --git a/core/src/main/java/com/opensymphony/xwork2/inject/EarlyInitializable.java b/core/src/main/java/org/apache/struts2/inject/EarlyInitializable.java similarity index 95% rename from core/src/main/java/com/opensymphony/xwork2/inject/EarlyInitializable.java rename to core/src/main/java/org/apache/struts2/inject/EarlyInitializable.java index bf5d5f4124..35e471d604 100644 --- a/core/src/main/java/com/opensymphony/xwork2/inject/EarlyInitializable.java +++ b/core/src/main/java/org/apache/struts2/inject/EarlyInitializable.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.opensymphony.xwork2.inject; +package org.apache.struts2.inject; /** * A marking interface that will tell CI to initialise the bean when instating the whole objects' graph diff --git a/core/src/main/java/com/opensymphony/xwork2/inject/ExternalContext.java b/core/src/main/java/org/apache/struts2/inject/ExternalContext.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/inject/ExternalContext.java rename to core/src/main/java/org/apache/struts2/inject/ExternalContext.java index 07c549f2f6..c00e1120d6 100644 --- a/core/src/main/java/com/opensymphony/xwork2/inject/ExternalContext.java +++ b/core/src/main/java/org/apache/struts2/inject/ExternalContext.java @@ -18,7 +18,7 @@ *

    */ -package com.opensymphony.xwork2.inject; +package org.apache.struts2.inject; import java.lang.reflect.Member; import java.util.Map; diff --git a/core/src/main/java/com/opensymphony/xwork2/inject/Factory.java b/core/src/main/java/org/apache/struts2/inject/Factory.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/inject/Factory.java rename to core/src/main/java/org/apache/struts2/inject/Factory.java index 479384ddbc..c84ac6f287 100644 --- a/core/src/main/java/com/opensymphony/xwork2/inject/Factory.java +++ b/core/src/main/java/org/apache/struts2/inject/Factory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.opensymphony.xwork2.inject; +package org.apache.struts2.inject; /** * A custom factory. Creates objects which will be injected. diff --git a/core/src/main/java/com/opensymphony/xwork2/inject/Initializable.java b/core/src/main/java/org/apache/struts2/inject/Initializable.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/inject/Initializable.java rename to core/src/main/java/org/apache/struts2/inject/Initializable.java index fbbed28aa6..6774d11d92 100644 --- a/core/src/main/java/com/opensymphony/xwork2/inject/Initializable.java +++ b/core/src/main/java/org/apache/struts2/inject/Initializable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.opensymphony.xwork2.inject; +package org.apache.struts2.inject; /** * Beans marked with this interface will be always initialised diff --git a/core/src/main/java/com/opensymphony/xwork2/inject/InitializableFactory.java b/core/src/main/java/org/apache/struts2/inject/InitializableFactory.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/inject/InitializableFactory.java rename to core/src/main/java/org/apache/struts2/inject/InitializableFactory.java index 26191b3d93..e7734df427 100644 --- a/core/src/main/java/com/opensymphony/xwork2/inject/InitializableFactory.java +++ b/core/src/main/java/org/apache/struts2/inject/InitializableFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.inject; +package org.apache.struts2.inject; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/opensymphony/xwork2/inject/Inject.java b/core/src/main/java/org/apache/struts2/inject/Inject.java similarity index 90% rename from core/src/main/java/com/opensymphony/xwork2/inject/Inject.java rename to core/src/main/java/org/apache/struts2/inject/Inject.java index c661882c70..b8e50814f0 100644 --- a/core/src/main/java/com/opensymphony/xwork2/inject/Inject.java +++ b/core/src/main/java/org/apache/struts2/inject/Inject.java @@ -14,12 +14,11 @@ * limitations under the License. */ -package com.opensymphony.xwork2.inject; +package org.apache.struts2.inject; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static com.opensymphony.xwork2.inject.Container.DEFAULT_NAME; import static java.lang.annotation.ElementType.CONSTRUCTOR; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; @@ -40,7 +39,7 @@ /** * @return Dependency name. Defaults to {@link Container#DEFAULT_NAME}. */ - String value() default DEFAULT_NAME; + String value() default Container.DEFAULT_NAME; /** * @return Whether or not injection is required. Applicable only to methods and diff --git a/core/src/main/java/com/opensymphony/xwork2/inject/InternalContext.java b/core/src/main/java/org/apache/struts2/inject/InternalContext.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/inject/InternalContext.java rename to core/src/main/java/org/apache/struts2/inject/InternalContext.java index 8a85f5705e..ef2d070fa5 100644 --- a/core/src/main/java/com/opensymphony/xwork2/inject/InternalContext.java +++ b/core/src/main/java/org/apache/struts2/inject/InternalContext.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.opensymphony.xwork2.inject; +package org.apache.struts2.inject; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/com/opensymphony/xwork2/inject/InternalFactory.java b/core/src/main/java/org/apache/struts2/inject/InternalFactory.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/inject/InternalFactory.java rename to core/src/main/java/org/apache/struts2/inject/InternalFactory.java index 5cd8fb0fec..9b69407f92 100644 --- a/core/src/main/java/com/opensymphony/xwork2/inject/InternalFactory.java +++ b/core/src/main/java/org/apache/struts2/inject/InternalFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.opensymphony.xwork2.inject; +package org.apache.struts2.inject; import java.io.Serializable; diff --git a/core/src/main/java/com/opensymphony/xwork2/inject/Key.java b/core/src/main/java/org/apache/struts2/inject/Key.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/inject/Key.java rename to core/src/main/java/org/apache/struts2/inject/Key.java index 6aff2a5bdb..8a0f66ec82 100644 --- a/core/src/main/java/com/opensymphony/xwork2/inject/Key.java +++ b/core/src/main/java/org/apache/struts2/inject/Key.java @@ -18,7 +18,7 @@ *

    */ -package com.opensymphony.xwork2.inject; +package org.apache.struts2.inject; /** * Dependency mapping key. Uniquely identified by the required type and name. diff --git a/core/src/main/java/com/opensymphony/xwork2/inject/Scope.java b/core/src/main/java/org/apache/struts2/inject/Scope.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/inject/Scope.java rename to core/src/main/java/org/apache/struts2/inject/Scope.java index 3b354cb986..1473a3daf6 100644 --- a/core/src/main/java/com/opensymphony/xwork2/inject/Scope.java +++ b/core/src/main/java/org/apache/struts2/inject/Scope.java @@ -15,7 +15,7 @@ *

    */ -package com.opensymphony.xwork2.inject; +package org.apache.struts2.inject; import java.util.concurrent.Callable; @@ -231,7 +231,7 @@ abstract InternalFactory scopeFactory( * Pluggable scoping strategy. Enables users to provide custom * implementations of request, session, and wizard scopes. Implement and * pass to {@link - * Container#setScopeStrategy(com.opensymphony.xwork2.inject.Scope.Strategy)}. + * Container#setScopeStrategy(Scope.Strategy)}. */ public interface Strategy { diff --git a/core/src/main/java/com/opensymphony/xwork2/inject/Scoped.java b/core/src/main/java/org/apache/struts2/inject/Scoped.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/inject/Scoped.java rename to core/src/main/java/org/apache/struts2/inject/Scoped.java index 9a72d1aa84..66006d8d6e 100644 --- a/core/src/main/java/com/opensymphony/xwork2/inject/Scoped.java +++ b/core/src/main/java/org/apache/struts2/inject/Scoped.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.opensymphony.xwork2.inject; +package org.apache.struts2.inject; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core/src/main/java/com/opensymphony/xwork2/inject/package-info.java b/core/src/main/java/org/apache/struts2/inject/package-info.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/inject/package-info.java rename to core/src/main/java/org/apache/struts2/inject/package-info.java index b60be547dd..a5ee629eb4 100644 --- a/core/src/main/java/com/opensymphony/xwork2/inject/package-info.java +++ b/core/src/main/java/org/apache/struts2/inject/package-info.java @@ -27,4 +27,4 @@ *
  • externalize what needs to be and no more
    • *
*/ -package com.opensymphony.xwork2.inject; +package org.apache.struts2.inject; diff --git a/core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizablePhantomReference.java b/core/src/main/java/org/apache/struts2/inject/util/FinalizablePhantomReference.java similarity index 85% rename from core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizablePhantomReference.java rename to core/src/main/java/org/apache/struts2/inject/util/FinalizablePhantomReference.java index 039a977bda..da7251638e 100644 --- a/core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizablePhantomReference.java +++ b/core/src/main/java/org/apache/struts2/inject/util/FinalizablePhantomReference.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.opensymphony.xwork2.inject.util; +package org.apache.struts2.inject.util; import java.lang.ref.PhantomReference; /** - * Phantom reference with a {@link com.opensymphony.xwork2.inject.util.FinalizableReference#finalizeReferent() finalizeReferent()} method which a + * Phantom reference with a {@link FinalizableReference#finalizeReferent() finalizeReferent()} method which a * background thread invokes after the garbage collector reclaims the * referent. This is a simpler alternative to using a {@link * java.lang.ref.ReferenceQueue}. diff --git a/core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableReference.java b/core/src/main/java/org/apache/struts2/inject/util/FinalizableReference.java similarity index 95% rename from core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableReference.java rename to core/src/main/java/org/apache/struts2/inject/util/FinalizableReference.java index a31fd217e6..5f181c4bb6 100644 --- a/core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableReference.java +++ b/core/src/main/java/org/apache/struts2/inject/util/FinalizableReference.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.opensymphony.xwork2.inject.util; +package org.apache.struts2.inject.util; /** * Package-private interface implemented by references that have code to run diff --git a/core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableReferenceQueue.java b/core/src/main/java/org/apache/struts2/inject/util/FinalizableReferenceQueue.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableReferenceQueue.java rename to core/src/main/java/org/apache/struts2/inject/util/FinalizableReferenceQueue.java index 2335b2722a..6556000f76 100644 --- a/core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableReferenceQueue.java +++ b/core/src/main/java/org/apache/struts2/inject/util/FinalizableReferenceQueue.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.opensymphony.xwork2.inject.util; +package org.apache.struts2.inject.util; import java.lang.ref.Reference; import java.lang.ref.ReferenceQueue; diff --git a/core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableSoftReference.java b/core/src/main/java/org/apache/struts2/inject/util/FinalizableSoftReference.java similarity index 84% rename from core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableSoftReference.java rename to core/src/main/java/org/apache/struts2/inject/util/FinalizableSoftReference.java index 0601f9d519..411a8cb13b 100644 --- a/core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableSoftReference.java +++ b/core/src/main/java/org/apache/struts2/inject/util/FinalizableSoftReference.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.opensymphony.xwork2.inject.util; +package org.apache.struts2.inject.util; import java.lang.ref.SoftReference; /** - * Soft reference with a {@link com.opensymphony.xwork2.inject.util.FinalizableReference#finalizeReferent() finalizeReferent()} method which a background + * Soft reference with a {@link FinalizableReference#finalizeReferent() finalizeReferent()} method which a background * thread invokes after the garbage collector reclaims the referent. This is a * simpler alternative to using a {@link java.lang.ref.ReferenceQueue}. * diff --git a/core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableWeakReference.java b/core/src/main/java/org/apache/struts2/inject/util/FinalizableWeakReference.java similarity index 84% rename from core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableWeakReference.java rename to core/src/main/java/org/apache/struts2/inject/util/FinalizableWeakReference.java index 7ec98aad9d..e969f82d06 100644 --- a/core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableWeakReference.java +++ b/core/src/main/java/org/apache/struts2/inject/util/FinalizableWeakReference.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.opensymphony.xwork2.inject.util; +package org.apache.struts2.inject.util; import java.lang.ref.WeakReference; /** - * Weak reference with a {@link com.opensymphony.xwork2.inject.util.FinalizableReference#finalizeReferent() finalizeReferent()} method which a background + * Weak reference with a {@link FinalizableReference#finalizeReferent() finalizeReferent()} method which a background * thread invokes after the garbage collector reclaims the referent. This is a * simpler alternative to using a {@link java.lang.ref.ReferenceQueue}. * diff --git a/core/src/main/java/com/opensymphony/xwork2/inject/util/Function.java b/core/src/main/java/org/apache/struts2/inject/util/Function.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/inject/util/Function.java rename to core/src/main/java/org/apache/struts2/inject/util/Function.java index 2dfcf94b64..92118d6570 100644 --- a/core/src/main/java/com/opensymphony/xwork2/inject/util/Function.java +++ b/core/src/main/java/org/apache/struts2/inject/util/Function.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.opensymphony.xwork2.inject.util; +package org.apache.struts2.inject.util; /** * A Function provides a transformation on an object and returns the resulting diff --git a/core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceCache.java b/core/src/main/java/org/apache/struts2/inject/util/ReferenceCache.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceCache.java rename to core/src/main/java/org/apache/struts2/inject/util/ReferenceCache.java index 212e735ecb..6e7aaadf92 100644 --- a/core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceCache.java +++ b/core/src/main/java/org/apache/struts2/inject/util/ReferenceCache.java @@ -18,7 +18,7 @@ *

*/ -package com.opensymphony.xwork2.inject.util; +package org.apache.struts2.inject.util; import java.io.IOException; import java.io.ObjectInputStream; @@ -30,7 +30,7 @@ import java.util.concurrent.Future; import java.util.concurrent.FutureTask; -import static com.opensymphony.xwork2.inject.util.ReferenceType.STRONG; +import static org.apache.struts2.inject.util.ReferenceType.STRONG; /** * Extends {@link ReferenceMap} to support lazy loading values by overriding diff --git a/core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceMap.java b/core/src/main/java/org/apache/struts2/inject/util/ReferenceMap.java similarity index 99% rename from core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceMap.java rename to core/src/main/java/org/apache/struts2/inject/util/ReferenceMap.java index ce37624254..eed90d00b5 100644 --- a/core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceMap.java +++ b/core/src/main/java/org/apache/struts2/inject/util/ReferenceMap.java @@ -18,7 +18,7 @@ *

*/ -package com.opensymphony.xwork2.inject.util; +package org.apache.struts2.inject.util; import java.io.IOException; import java.io.ObjectInputStream; @@ -35,7 +35,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import static com.opensymphony.xwork2.inject.util.ReferenceType.STRONG; +import static org.apache.struts2.inject.util.ReferenceType.STRONG; /** * Concurrent hash map that wraps keys and/or values in soft or weak diff --git a/core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceType.java b/core/src/main/java/org/apache/struts2/inject/util/ReferenceType.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceType.java rename to core/src/main/java/org/apache/struts2/inject/util/ReferenceType.java index b9662732ce..111dc2981f 100644 --- a/core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceType.java +++ b/core/src/main/java/org/apache/struts2/inject/util/ReferenceType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.opensymphony.xwork2.inject.util; +package org.apache.struts2.inject.util; /** * Reference type. Used to specify what type of reference to keep to a diff --git a/core/src/main/java/com/opensymphony/xwork2/inject/util/package.html b/core/src/main/java/org/apache/struts2/inject/util/package.html similarity index 100% rename from core/src/main/java/com/opensymphony/xwork2/inject/util/package.html rename to core/src/main/java/org/apache/struts2/inject/util/package.html diff --git a/core/src/main/java/org/apache/struts2/interceptor/AbstractFileUploadInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/AbstractFileUploadInterceptor.java index 1113f44916..87c1d32f35 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/AbstractFileUploadInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/AbstractFileUploadInterceptor.java @@ -18,15 +18,15 @@ */ package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.LocaleProvider; -import com.opensymphony.xwork2.LocaleProviderFactory; -import com.opensymphony.xwork2.TextProvider; -import com.opensymphony.xwork2.TextProviderFactory; -import com.opensymphony.xwork2.inject.Container; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.interceptor.AbstractInterceptor; -import com.opensymphony.xwork2.interceptor.ValidationAware; -import com.opensymphony.xwork2.util.TextParseUtil; +import org.apache.struts2.LocaleProvider; +import org.apache.struts2.LocaleProviderFactory; +import org.apache.struts2.TextProvider; +import org.apache.struts2.TextProviderFactory; +import org.apache.struts2.inject.Container; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.interceptor.AbstractInterceptor; +import org.apache.struts2.interceptor.ValidationAware; +import org.apache.struts2.util.TextParseUtil; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.dispatcher.LocalizedMessage; diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/AbstractInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/AbstractInterceptor.java similarity index 95% rename from core/src/main/java/com/opensymphony/xwork2/interceptor/AbstractInterceptor.java rename to core/src/main/java/org/apache/struts2/interceptor/AbstractInterceptor.java index 13bf646d47..103cd85a02 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/AbstractInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/AbstractInterceptor.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.interceptor; +package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionInvocation; +import org.apache.struts2.ActionInvocation; /** * Provides default implementations of optional lifecycle methods diff --git a/core/src/main/java/org/apache/struts2/interceptor/ActionFileUploadInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ActionFileUploadInterceptor.java index a0197e6c39..32ba1f623c 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/ActionFileUploadInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ActionFileUploadInterceptor.java @@ -18,9 +18,9 @@ */ package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.ActionProxy; -import com.opensymphony.xwork2.interceptor.ValidationAware; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.ActionProxy; +import org.apache.struts2.interceptor.ValidationAware; import jakarta.servlet.http.HttpServletRequest; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -99,7 +99,7 @@ * package com.example; * * import java.io.File; - * import com.opensymphony.xwork2.ActionSupport; + * import org.apache.struts2.ActionSupport; * import org.apache.struts2.action.UploadedFilesAware; * * public UploadAction extends ActionSupport implements UploadedFilesAware { @@ -129,9 +129,6 @@ public class ActionFileUploadInterceptor extends AbstractFileUploadInterceptor { protected static final Logger LOG = LogManager.getLogger(ActionFileUploadInterceptor.class); - /* (non-Javadoc) - * @see com.opensymphony.xwork2.interceptor.Interceptor#intercept(com.opensymphony.xwork2.ActionInvocation) - */ @Override public String intercept(ActionInvocation invocation) throws Exception { HttpServletRequest request = invocation.getInvocationContext().getServletRequest(); diff --git a/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInterceptor.java index 3cf53e0a26..b567ea7d72 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInterceptor.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionContext; +import org.apache.struts2.ActionContext; import org.apache.struts2.action.ParameterNameAware; import org.apache.struts2.dispatcher.HttpParameters; import org.apache.struts2.dispatcher.mapper.ActionMapping; diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/AliasInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/AliasInterceptor.java similarity index 93% rename from core/src/main/java/com/opensymphony/xwork2/interceptor/AliasInterceptor.java rename to core/src/main/java/org/apache/struts2/interceptor/AliasInterceptor.java index 28109cbf9a..3ebf0fc678 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/AliasInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/AliasInterceptor.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.interceptor; - -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.LocalizedTextProvider; -import com.opensymphony.xwork2.config.entities.ActionConfig; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.security.AcceptedPatternsChecker; -import com.opensymphony.xwork2.security.ExcludedPatternsChecker; -import com.opensymphony.xwork2.util.ClearableValueStack; -import com.opensymphony.xwork2.util.Evaluated; -import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.ValueStackFactory; -import com.opensymphony.xwork2.util.reflection.ReflectionContextState; +package org.apache.struts2.interceptor; + +import org.apache.struts2.ActionContext; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.LocalizedTextProvider; +import org.apache.struts2.config.entities.ActionConfig; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.security.AcceptedPatternsChecker; +import org.apache.struts2.security.ExcludedPatternsChecker; +import org.apache.struts2.util.ClearableValueStack; +import org.apache.struts2.util.Evaluated; +import org.apache.struts2.util.ValueStack; +import org.apache.struts2.util.ValueStackFactory; +import org.apache.struts2.util.reflection.ReflectionContextState; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.StrutsConstants; diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/ChainingInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ChainingInterceptor.java similarity index 94% rename from core/src/main/java/com/opensymphony/xwork2/interceptor/ChainingInterceptor.java rename to core/src/main/java/org/apache/struts2/interceptor/ChainingInterceptor.java index 7e7d132f6e..f16bdc8828 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/ChainingInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ChainingInterceptor.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.interceptor; +package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionChainResult; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.Result; -import com.opensymphony.xwork2.Unchainable; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.CompoundRoot; -import com.opensymphony.xwork2.util.ProxyUtil; -import com.opensymphony.xwork2.util.TextParseUtil; -import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.reflection.ReflectionProvider; +import org.apache.struts2.ActionChainResult; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.Result; +import org.apache.struts2.Unchainable; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.CompoundRoot; +import org.apache.struts2.util.ProxyUtil; +import org.apache.struts2.util.TextParseUtil; +import org.apache.struts2.util.ValueStack; +import org.apache.struts2.util.reflection.ReflectionProvider; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.StrutsConstants; @@ -117,7 +117,7 @@ * * @author mrdon * @author tm_jee ( tm_jee(at)yahoo.co.uk ) - * @see com.opensymphony.xwork2.ActionChainResult + * @see org.apache.struts2.ActionChainResult */ public class ChainingInterceptor extends AbstractInterceptor { diff --git a/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java index 9085ac5c00..58f273456b 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.interceptor.AbstractInterceptor; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.interceptor.AbstractInterceptor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.dispatcher.HttpParameters; diff --git a/core/src/main/java/org/apache/struts2/interceptor/ClearSessionInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ClearSessionInterceptor.java index c8b8021b37..9dcd1824c0 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/ClearSessionInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ClearSessionInterceptor.java @@ -18,9 +18,9 @@ */ package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.interceptor.AbstractInterceptor; +import org.apache.struts2.ActionContext; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.interceptor.AbstractInterceptor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -76,7 +76,7 @@ public class ClearSessionInterceptor extends AbstractInterceptor { private static final Logger LOG = LogManager.getLogger(ClearSessionInterceptor.class); /* (non-Javadoc) - * @see com.opensymphony.xwork2.interceptor.Interceptor#intercept(com.opensymphony.xwork2.ActionInvocation) + * @see org.apache.struts2.interceptor.Interceptor#intercept(org.apache.struts2.ActionInvocation) */ @Override public String intercept(ActionInvocation invocation) throws Exception { diff --git a/core/src/main/java/org/apache/struts2/interceptor/CoepInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/CoepInterceptor.java index bb6294493b..935f568740 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/CoepInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/CoepInterceptor.java @@ -18,10 +18,10 @@ */ package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.interceptor.AbstractInterceptor; -import com.opensymphony.xwork2.interceptor.PreResultListener; -import com.opensymphony.xwork2.util.TextParseUtil; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.interceptor.AbstractInterceptor; +import org.apache.struts2.interceptor.PreResultListener; +import org.apache.struts2.util.TextParseUtil; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/ConditionalInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ConditionalInterceptor.java similarity index 93% rename from core/src/main/java/com/opensymphony/xwork2/interceptor/ConditionalInterceptor.java rename to core/src/main/java/org/apache/struts2/interceptor/ConditionalInterceptor.java index 12752fce82..716b581957 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/ConditionalInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ConditionalInterceptor.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.interceptor; +package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionInvocation; +import org.apache.struts2.ActionInvocation; /** * A marking interface, when implemented allows to conditionally execute a given interceptor diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ConversionErrorInterceptor.java similarity index 94% rename from core/src/main/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptor.java rename to core/src/main/java/org/apache/struts2/interceptor/ConversionErrorInterceptor.java index a30d81a004..272e503e0b 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ConversionErrorInterceptor.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.interceptor; +package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.conversion.impl.ConversionData; -import com.opensymphony.xwork2.conversion.impl.XWorkConverter; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.ActionContext; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.conversion.impl.ConversionData; +import org.apache.struts2.conversion.impl.XWorkConverter; +import org.apache.struts2.util.ValueStack; import org.apache.commons.text.StringEscapeUtils; import java.util.HashMap; diff --git a/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java index bc1b270184..e0093c5b77 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java @@ -18,14 +18,14 @@ */ package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.interceptor.AbstractInterceptor; -import com.opensymphony.xwork2.security.AcceptedPatternsChecker; -import com.opensymphony.xwork2.security.ExcludedPatternsChecker; -import com.opensymphony.xwork2.util.TextParseUtil; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.ActionContext; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.interceptor.AbstractInterceptor; +import org.apache.struts2.security.AcceptedPatternsChecker; +import org.apache.struts2.security.ExcludedPatternsChecker; +import org.apache.struts2.util.TextParseUtil; +import org.apache.struts2.util.ValueStack; import jakarta.servlet.http.Cookie; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/org/apache/struts2/interceptor/CookieProviderInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/CookieProviderInterceptor.java index 202686006d..569a3429ec 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/CookieProviderInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/CookieProviderInterceptor.java @@ -18,10 +18,10 @@ */ package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.interceptor.AbstractInterceptor; -import com.opensymphony.xwork2.interceptor.PreResultListener; +import org.apache.struts2.ActionContext; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.interceptor.AbstractInterceptor; +import org.apache.struts2.interceptor.PreResultListener; import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletResponse; import org.apache.logging.log4j.LogManager; diff --git a/core/src/main/java/org/apache/struts2/interceptor/CoopInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/CoopInterceptor.java index 9cf9fe9f1f..794064f0cc 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/CoopInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/CoopInterceptor.java @@ -18,10 +18,10 @@ */ package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.interceptor.AbstractInterceptor; -import com.opensymphony.xwork2.interceptor.PreResultListener; -import com.opensymphony.xwork2.util.TextParseUtil; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.interceptor.AbstractInterceptor; +import org.apache.struts2.interceptor.PreResultListener; +import org.apache.struts2.util.TextParseUtil; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/org/apache/struts2/interceptor/CreateSessionInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/CreateSessionInterceptor.java index f732431327..028f7caf20 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/CreateSessionInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/CreateSessionInterceptor.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.interceptor.AbstractInterceptor; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.interceptor.AbstractInterceptor; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; @@ -85,7 +85,7 @@ public class CreateSessionInterceptor extends AbstractInterceptor { /* (non-Javadoc) - * @see com.opensymphony.xwork2.interceptor.Interceptor#intercept(com.opensymphony.xwork2.ActionInvocation) + * @see org.apache.struts2.interceptor.Interceptor#intercept(org.apache.struts2.ActionInvocation) */ public String intercept(ActionInvocation invocation) throws Exception { HttpServletRequest servletRequest = invocation.getInvocationContext().getServletRequest(); diff --git a/core/src/main/java/org/apache/struts2/interceptor/DateTextFieldInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/DateTextFieldInterceptor.java index af8574a8c3..c9bada69dc 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/DateTextFieldInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/DateTextFieldInterceptor.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.interceptor.AbstractInterceptor; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.interceptor.AbstractInterceptor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.dispatcher.HttpParameters; diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/DefaultWorkflowInterceptor.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java rename to core/src/main/java/org/apache/struts2/interceptor/DefaultWorkflowInterceptor.java index 118811a59a..1effae6c53 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/DefaultWorkflowInterceptor.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.interceptor; +package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.Action; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.interceptor.annotations.InputConfig; +import org.apache.struts2.Action; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.interceptor.annotations.InputConfig; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.reflect.MethodUtils; import org.apache.logging.log4j.LogManager; diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/ExceptionHolder.java b/core/src/main/java/org/apache/struts2/interceptor/ExceptionHolder.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/interceptor/ExceptionHolder.java rename to core/src/main/java/org/apache/struts2/interceptor/ExceptionHolder.java index ff813dbca5..2980e8c861 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/ExceptionHolder.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ExceptionHolder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.interceptor; +package org.apache.struts2.interceptor; import java.io.IOException; import java.io.PrintWriter; diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/ExceptionMappingInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ExceptionMappingInterceptor.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/interceptor/ExceptionMappingInterceptor.java rename to core/src/main/java/org/apache/struts2/interceptor/ExceptionMappingInterceptor.java index db6dadec93..1643da3c4a 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/ExceptionMappingInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ExceptionMappingInterceptor.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.interceptor; +package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.config.entities.ExceptionMappingConfig; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.config.entities.ExceptionMappingConfig; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.dispatcher.HttpParameters; @@ -56,7 +56,7 @@ *
  • logLevel (optional) - what log level should we use (trace, debug, info, warn, error, fatal)? - defaut is debug
    • * *
  • logCategory (optional) - If provided we would use this category (eg. com.mycompany.app). - * Default is to use com.opensymphony.xwork2.interceptor.ExceptionMappingInterceptor.
    • + * Default is to use org.apache.struts2.interceptor.ExceptionMappingInterceptor. * * * @@ -72,7 +72,7 @@ * *

    * If you want to add custom handling for publishing the Exception, you may override - * {@link #publishException(com.opensymphony.xwork2.ActionInvocation, ExceptionHolder)}. The default implementation + * {@link #publishException(org.apache.struts2.ActionInvocation, ExceptionHolder)}. The default implementation * pushes the given ExceptionHolder on value stack. A custom implementation could add additional logging etc. *

    * diff --git a/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java index 822995b8d0..54fa9c1138 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java @@ -18,14 +18,14 @@ */ package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.Action; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.ActionProxy; -import com.opensymphony.xwork2.config.entities.ResultConfig; -import com.opensymphony.xwork2.inject.Container; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.interceptor.MethodFilterInterceptor; +import org.apache.struts2.Action; +import org.apache.struts2.ActionContext; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.ActionProxy; +import org.apache.struts2.config.entities.ResultConfig; +import org.apache.struts2.inject.Container; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.interceptor.MethodFilterInterceptor; import jakarta.servlet.http.HttpSession; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -228,7 +228,7 @@ protected String getBackgroundProcessName(ActionProxy proxy) { } /* (non-Javadoc) - * @see com.opensymphony.xwork2.interceptor.MethodFilterInterceptor#doIntercept(com.opensymphony.xwork2.ActionInvocation) + * @see org.apache.struts2.interceptor.MethodFilterInterceptor#doIntercept(org.apache.struts2.ActionInvocation) */ @Override protected String doIntercept(ActionInvocation actionInvocation) throws Exception { diff --git a/core/src/main/java/org/apache/struts2/interceptor/FetchMetadataInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/FetchMetadataInterceptor.java index e57a6a8ff8..570b1fa972 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/FetchMetadataInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/FetchMetadataInterceptor.java @@ -18,11 +18,11 @@ */ package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.interceptor.AbstractInterceptor; -import com.opensymphony.xwork2.util.TextParseUtil; +import org.apache.struts2.ActionContext; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.interceptor.AbstractInterceptor; +import org.apache.struts2.util.TextParseUtil; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java index 6f4bae0e82..63f0d9b460 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java @@ -18,12 +18,12 @@ */ package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.LocaleProvider; -import com.opensymphony.xwork2.LocaleProviderFactory; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.interceptor.AbstractInterceptor; -import com.opensymphony.xwork2.util.TextParseUtil; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.LocaleProvider; +import org.apache.struts2.LocaleProviderFactory; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.interceptor.AbstractInterceptor; +import org.apache.struts2.util.TextParseUtil; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/Interceptor.java b/core/src/main/java/org/apache/struts2/interceptor/Interceptor.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/interceptor/Interceptor.java rename to core/src/main/java/org/apache/struts2/interceptor/Interceptor.java index eb7f6850ea..d9acc32ec1 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/Interceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/Interceptor.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.interceptor; +package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionInvocation; +import org.apache.struts2.ActionInvocation; import java.io.Serializable; @@ -42,7 +42,7 @@ *

    * Interceptors must be stateless and not assume that a new instance will be created for each request or Action. * Interceptors may choose to either short-circuit the {@link ActionInvocation} execution and return a return code - * (such as {@link com.opensymphony.xwork2.Action#SUCCESS}), or it may choose to do some processing before + * (such as {@link org.apache.struts2.Action#SUCCESS}), or it may choose to do some processing before * and/or after delegating the rest of the procesing using {@link ActionInvocation#invoke()}. *

    * @@ -204,7 +204,7 @@ public interface Interceptor extends Serializable { /** * Called after an interceptor is created, but before any requests are processed using - * {@link #intercept(com.opensymphony.xwork2.ActionInvocation) intercept} , giving + * {@link #intercept(org.apache.struts2.ActionInvocation) intercept} , giving * the Interceptor a chance to initialize any needed resources. */ void init(); @@ -215,7 +215,7 @@ public interface Interceptor extends Serializable { * * @param invocation the action invocation * @return the return code, either returned from {@link ActionInvocation#invoke()}, or from the interceptor itself. - * @throws Exception any system-level error, as defined in {@link com.opensymphony.xwork2.Action#execute()}. + * @throws Exception any system-level error, as defined in {@link org.apache.struts2.Action#execute()}. */ String intercept(ActionInvocation invocation) throws Exception; diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/LoggingInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/LoggingInterceptor.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/interceptor/LoggingInterceptor.java rename to core/src/main/java/org/apache/struts2/interceptor/LoggingInterceptor.java index 271ed05bed..50f9021424 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/LoggingInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/LoggingInterceptor.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.interceptor; +package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionInvocation; +import org.apache.struts2.ActionInvocation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java index 0cf3747d56..73fe737542 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java @@ -18,9 +18,9 @@ */ package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.interceptor.AbstractInterceptor; -import com.opensymphony.xwork2.interceptor.ValidationAware; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.interceptor.AbstractInterceptor; +import org.apache.struts2.interceptor.ValidationAware; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.dispatcher.HttpParameters; @@ -58,7 +58,7 @@ *

    * In the 'AUTOMATIC' mode, the interceptor will always retrieve the stored action's message / errors * and field errors and put them back into the {@link ValidationAware} action, and after Action execution, - * if the {@link com.opensymphony.xwork2.Result} is an instance of {@link ServletRedirectResult}, the action's message / errors + * if the {@link org.apache.struts2.Result} is an instance of {@link ServletRedirectResult}, the action's message / errors * and field errors into automatically be stored in the HTTP session.. *

    * diff --git a/core/src/main/java/org/apache/struts2/interceptor/MessageStorePreResultListener.java b/core/src/main/java/org/apache/struts2/interceptor/MessageStorePreResultListener.java index 84abcccf7b..3a7fc7dfaf 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/MessageStorePreResultListener.java +++ b/core/src/main/java/org/apache/struts2/interceptor/MessageStorePreResultListener.java @@ -18,10 +18,10 @@ */ package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.config.entities.ResultConfig; -import com.opensymphony.xwork2.interceptor.PreResultListener; -import com.opensymphony.xwork2.interceptor.ValidationAware; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.config.entities.ResultConfig; +import org.apache.struts2.interceptor.PreResultListener; +import org.apache.struts2.interceptor.ValidationAware; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.ServletActionContext; diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/MethodFilterInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/MethodFilterInterceptor.java similarity index 89% rename from core/src/main/java/com/opensymphony/xwork2/interceptor/MethodFilterInterceptor.java rename to core/src/main/java/org/apache/struts2/interceptor/MethodFilterInterceptor.java index e96951cfa1..1749722bd2 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/MethodFilterInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/MethodFilterInterceptor.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.interceptor; +package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.util.TextParseUtil; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.util.TextParseUtil; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -31,56 +31,56 @@ * *

    * MethodFilterInterceptor is an abstract Interceptor used as - * a base class for interceptors that will filter execution based on method + * a base class for interceptors that will filter execution based on method * names according to specified included/excluded method lists. - * + * *

    - * + * * Settable parameters are as follows: - * + * *
      *
    • excludeMethods - method names to be excluded from interceptor processing
      • *
    • includeMethods - method names to be included in interceptor processing
      • *
    - * + * *

    - * - * NOTE: If method name are available in both includeMethods and - * excludeMethods, it will be considered as an included method: + * + * NOTE: If method name are available in both includeMethods and + * excludeMethods, it will be considered as an included method: * includeMethods takes precedence over excludeMethods. - * + * *

    - * + * * Interceptors that extends this capability include: - * + * *
      *
    • TokenInterceptor
      • *
    • TokenSessionStoreInterceptor
      • *
    • DefaultWorkflowInterceptor
      • *
    • ValidationInterceptor
      • *
    - * + * * - * + * * @author Alexandru Popescu * @author Rainer Hermanns - * + * * @see org.apache.struts2.interceptor.TokenInterceptor * @see org.apache.struts2.interceptor.TokenSessionStoreInterceptor - * @see com.opensymphony.xwork2.interceptor.DefaultWorkflowInterceptor - * @see com.opensymphony.xwork2.validator.ValidationInterceptor + * @see org.apache.struts2.interceptor.DefaultWorkflowInterceptor + * @see org.apache.struts2.validator.ValidationInterceptor */ public abstract class MethodFilterInterceptor extends AbstractInterceptor { private static final Logger LOG = LogManager.getLogger(MethodFilterInterceptor.class); - + protected Set excludeMethods = Collections.emptySet(); protected Set includeMethods = Collections.emptySet(); public void setExcludeMethods(String excludeMethods) { this.excludeMethods = TextParseUtil.commaDelimitedStringToSet(excludeMethods); } - + public Set getExcludeMethodsSet() { return excludeMethods; } @@ -88,7 +88,7 @@ public Set getExcludeMethodsSet() { public void setIncludeMethods(String includeMethods) { this.includeMethods = TextParseUtil.commaDelimitedStringToSet(includeMethods); } - + public Set getIncludeMethodsSet() { return includeMethods; } @@ -97,7 +97,7 @@ public Set getIncludeMethodsSet() { public String intercept(ActionInvocation invocation) throws Exception { if (applyInterceptor(invocation)) { return doIntercept(invocation); - } + } return invocation.invoke(); } @@ -110,14 +110,14 @@ protected boolean applyInterceptor(ActionInvocation invocation) { } return applyMethod; } - + /** * Subclasses must override to implement the interceptor logic. - * + * * @param invocation the action invocation * @return the result of invocation * @throws Exception in case of any errors */ protected abstract String doIntercept(ActionInvocation invocation) throws Exception; - + } diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/MethodFilterInterceptorUtil.java b/core/src/main/java/org/apache/struts2/interceptor/MethodFilterInterceptorUtil.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/interceptor/MethodFilterInterceptorUtil.java rename to core/src/main/java/org/apache/struts2/interceptor/MethodFilterInterceptorUtil.java index ac5acee652..163b73a420 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/MethodFilterInterceptorUtil.java +++ b/core/src/main/java/org/apache/struts2/interceptor/MethodFilterInterceptorUtil.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.interceptor; +package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.util.TextParseUtil; -import com.opensymphony.xwork2.util.WildcardHelper; +import org.apache.struts2.util.TextParseUtil; +import org.apache.struts2.util.WildcardHelper; import java.util.HashMap; import java.util.Set; @@ -28,7 +28,7 @@ /** * Utility class contains common methods used by - * {@link com.opensymphony.xwork2.interceptor.MethodFilterInterceptor}. + * {@link org.apache.struts2.interceptor.MethodFilterInterceptor}. * * @author tm_jee */ diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/ModelDrivenInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ModelDrivenInterceptor.java similarity index 95% rename from core/src/main/java/com/opensymphony/xwork2/interceptor/ModelDrivenInterceptor.java rename to core/src/main/java/org/apache/struts2/interceptor/ModelDrivenInterceptor.java index d8c4a31439..fb8cb2dd56 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/ModelDrivenInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ModelDrivenInterceptor.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.interceptor; +package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.ModelDriven; -import com.opensymphony.xwork2.util.CompoundRoot; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.ModelDriven; +import org.apache.struts2.util.CompoundRoot; +import org.apache.struts2.util.ValueStack; /** * diff --git a/core/src/main/java/org/apache/struts2/interceptor/MultiselectInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/MultiselectInterceptor.java index 0d88b33923..c959c89c3b 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/MultiselectInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/MultiselectInterceptor.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.interceptor.AbstractInterceptor; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.interceptor.AbstractInterceptor; import org.apache.struts2.dispatcher.HttpParameters; import org.apache.struts2.dispatcher.Parameter; @@ -44,7 +44,7 @@ public class MultiselectInterceptor extends AbstractInterceptor { * @param ai ActionInvocation * @return the result of the action * @throws Exception if error - * @see com.opensymphony.xwork2.interceptor.Interceptor#intercept(com.opensymphony.xwork2.ActionInvocation) + * @see org.apache.struts2.interceptor.Interceptor#intercept(org.apache.struts2.ActionInvocation) */ public String intercept(ActionInvocation ai) throws Exception { HttpParameters parameters = ai.getInvocationContext().getParameters(); diff --git a/core/src/main/java/org/apache/struts2/interceptor/NoOpInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/NoOpInterceptor.java index 0cc101d3d8..79f5030385 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/NoOpInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/NoOpInterceptor.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.interceptor.AbstractInterceptor; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.interceptor.AbstractInterceptor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterRemoverInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ParameterRemoverInterceptor.java similarity index 94% rename from core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterRemoverInterceptor.java rename to core/src/main/java/org/apache/struts2/interceptor/ParameterRemoverInterceptor.java index c0f83765c2..fb10486afe 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterRemoverInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ParameterRemoverInterceptor.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.interceptor; +package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.util.TextParseUtil; +import org.apache.struts2.ActionContext; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.util.TextParseUtil; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.action.NoParameters; @@ -78,7 +78,7 @@ public class ParameterRemoverInterceptor extends AbstractInterceptor { * Decide if the parameter should be removed from the parameter map based on * paramNames and paramValues. * - * @see com.opensymphony.xwork2.interceptor.AbstractInterceptor + * @see org.apache.struts2.interceptor.AbstractInterceptor */ @Override public String intercept(ActionInvocation invocation) throws Exception { diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/PreResultListener.java b/core/src/main/java/org/apache/struts2/interceptor/PreResultListener.java similarity index 76% rename from core/src/main/java/com/opensymphony/xwork2/interceptor/PreResultListener.java rename to core/src/main/java/org/apache/struts2/interceptor/PreResultListener.java index f9faa23778..69745b925a 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/PreResultListener.java +++ b/core/src/main/java/org/apache/struts2/interceptor/PreResultListener.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.interceptor; +package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionInvocation; +import org.apache.struts2.ActionInvocation; /** * PreResultListeners may be registered with an {@link ActionInvocation} to get a callback after the - * {@link com.opensymphony.xwork2.Action} has been executed but before the {@link com.opensymphony.xwork2.Result} + * {@link org.apache.struts2.Action} has been executed but before the {@link org.apache.struts2.Result} * is executed. * * @author Jason Carreira @@ -30,8 +30,8 @@ public interface PreResultListener { /** - * This callback method will be called after the {@link com.opensymphony.xwork2.Action} execution and - * before the {@link com.opensymphony.xwork2.Result} execution. + * This callback method will be called after the {@link org.apache.struts2.Action} execution and + * before the {@link org.apache.struts2.Result} execution. * * @param invocation the action invocation * @param resultCode the result code returned by the action (eg. success). diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/PrefixMethodInvocationUtil.java b/core/src/main/java/org/apache/struts2/interceptor/PrefixMethodInvocationUtil.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/interceptor/PrefixMethodInvocationUtil.java rename to core/src/main/java/org/apache/struts2/interceptor/PrefixMethodInvocationUtil.java index b744ed1f68..3f6c8dc62a 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/PrefixMethodInvocationUtil.java +++ b/core/src/main/java/org/apache/struts2/interceptor/PrefixMethodInvocationUtil.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.interceptor; +package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionInvocation; +import org.apache.struts2.ActionInvocation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -37,7 +37,7 @@ * *

    * In DefaultWorkflowInterceptor - *

    applies only when action implements {@link com.opensymphony.xwork2.Validateable}

    + *

    applies only when action implements {@link org.apache.struts2.Validateable}

    *
      *
    1. if the action class have validate{MethodName}(), it will be invoked
      2. *
    2. else if the action class have validateDo{MethodName}(), it will be invoked
      3. diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/PrepareInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/PrepareInterceptor.java similarity index 95% rename from core/src/main/java/com/opensymphony/xwork2/interceptor/PrepareInterceptor.java rename to core/src/main/java/org/apache/struts2/interceptor/PrepareInterceptor.java index 78b3b9c952..2d78865244 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/PrepareInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/PrepareInterceptor.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.interceptor; +package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.Preparable; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.Preparable; import java.io.Serial; import java.lang.reflect.InvocationTargetException; @@ -51,7 +51,7 @@ * Update: Added logic to execute a prepare{MethodName} and conditionally * the a general prepare() Method, depending on the 'alwaysInvokePrepare' parameter/property * which is by default true. This allows us to run some logic based on the method - * name we specify in the {@link com.opensymphony.xwork2.ActionProxy}. For example, you can specify a + * name we specify in the {@link org.apache.struts2.ActionProxy}. For example, you can specify a * prepareInput() method that will be run before the invocation of the input method. *

      * @@ -96,7 +96,7 @@ * @author Jason Carreira * @author Philip Luppens * @author tm_jee - * @see com.opensymphony.xwork2.Preparable + * @see org.apache.struts2.Preparable */ public class PrepareInterceptor extends MethodFilterInterceptor { diff --git a/core/src/main/java/org/apache/struts2/interceptor/RolesInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/RolesInterceptor.java index 5e0d31e45e..722a7f7835 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/RolesInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/RolesInterceptor.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.interceptor.AbstractInterceptor; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.interceptor.AbstractInterceptor; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.logging.log4j.LogManager; diff --git a/core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java index f3e6a5cb6e..b899b7f84a 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java @@ -18,12 +18,12 @@ */ package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.ActionProxy; -import com.opensymphony.xwork2.interceptor.AbstractInterceptor; -import com.opensymphony.xwork2.interceptor.PreResultListener; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.ActionContext; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.ActionProxy; +import org.apache.struts2.interceptor.AbstractInterceptor; +import org.apache.struts2.interceptor.PreResultListener; +import org.apache.struts2.util.ValueStack; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; @@ -327,7 +327,7 @@ public void setKey(String key) { } /* (non-Javadoc) - * @see com.opensymphony.xwork2.interceptor.PreResultListener#beforeResult(com.opensymphony.xwork2.ActionInvocation, java.lang.String) + * @see org.apache.struts2.interceptor.PreResultListener#beforeResult(org.apache.struts2.ActionInvocation, java.lang.String) */ public void beforeResult(ActionInvocation invocation, String resultCode) { String key = getKey(invocation); @@ -405,7 +405,7 @@ public void setSessionReset(String sessionReset) { } /* (non-Javadoc) - * @see com.opensymphony.xwork2.interceptor.Interceptor#intercept(com.opensymphony.xwork2.ActionInvocation) + * @see org.apache.struts2.interceptor.Interceptor#intercept(org.apache.struts2.ActionInvocation) */ public String intercept(ActionInvocation invocation) throws Exception { String result; diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/ScopedModelDriven.java b/core/src/main/java/org/apache/struts2/interceptor/ScopedModelDriven.java similarity index 92% rename from core/src/main/java/com/opensymphony/xwork2/interceptor/ScopedModelDriven.java rename to core/src/main/java/org/apache/struts2/interceptor/ScopedModelDriven.java index 42ddb09b32..d18ef08801 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/ScopedModelDriven.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ScopedModelDriven.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.interceptor; +package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ModelDriven; +import org.apache.struts2.ModelDriven; /** * Adds the ability to set a model, probably retrieved from a given state. @@ -29,13 +29,13 @@ public interface ScopedModelDriven extends ModelDriven { * @param model sets the model */ void setModel(T model); - + /** * Sets the key under which the model is stored * @param key The model key */ void setScopeKey(String key); - + /** * @return the key under which the model is stored */ diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/ScopedModelDrivenInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ScopedModelDrivenInterceptor.java similarity index 94% rename from core/src/main/java/com/opensymphony/xwork2/interceptor/ScopedModelDrivenInterceptor.java rename to core/src/main/java/org/apache/struts2/interceptor/ScopedModelDrivenInterceptor.java index c6daee0281..0b42d0ea75 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/ScopedModelDrivenInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ScopedModelDrivenInterceptor.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.interceptor; +package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.ObjectFactory; -import com.opensymphony.xwork2.config.entities.ActionConfig; -import com.opensymphony.xwork2.inject.Inject; +import org.apache.struts2.ActionContext; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.ObjectFactory; +import org.apache.struts2.config.entities.ActionConfig; +import org.apache.struts2.inject.Inject; import org.apache.struts2.StrutsException; import java.lang.reflect.Method; diff --git a/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java index d2cd5ab437..ccfd496dc6 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java @@ -18,9 +18,9 @@ */ package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.interceptor.AbstractInterceptor; +import org.apache.struts2.ActionContext; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.interceptor.AbstractInterceptor; import jakarta.servlet.ServletContext; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/StaticParametersInterceptor.java similarity index 93% rename from core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java rename to core/src/main/java/org/apache/struts2/interceptor/StaticParametersInterceptor.java index b95a0e6e60..f900c818a1 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/StaticParametersInterceptor.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.interceptor; - -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.LocalizedTextProvider; -import com.opensymphony.xwork2.config.entities.ActionConfig; -import com.opensymphony.xwork2.config.entities.Parameterizable; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.ClearableValueStack; -import com.opensymphony.xwork2.util.TextParseUtil; -import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.ValueStackFactory; -import com.opensymphony.xwork2.util.reflection.ReflectionContextState; +package org.apache.struts2.interceptor; + +import org.apache.struts2.ActionContext; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.LocalizedTextProvider; +import org.apache.struts2.config.entities.ActionConfig; +import org.apache.struts2.config.entities.Parameterizable; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.ClearableValueStack; +import org.apache.struts2.util.TextParseUtil; +import org.apache.struts2.util.ValueStack; +import org.apache.struts2.util.ValueStackFactory; +import org.apache.struts2.util.reflection.ReflectionContextState; import org.apache.commons.lang3.BooleanUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptor.java index b7a345429d..b3f88c9a4e 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptor.java @@ -18,9 +18,9 @@ */ package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.interceptor.ConversionErrorInterceptor; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.interceptor.ConversionErrorInterceptor; +import org.apache.struts2.util.ValueStack; import java.io.Serial; @@ -63,7 +63,7 @@ * * * - * @see com.opensymphony.xwork2.ActionContext#getConversionErrors() + * @see org.apache.struts2.ActionContext#getConversionErrors() * @see ConversionErrorInterceptor */ public class StrutsConversionErrorInterceptor extends ConversionErrorInterceptor { diff --git a/core/src/main/java/org/apache/struts2/interceptor/TokenInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/TokenInterceptor.java index 753d99d1d0..83d344474d 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/TokenInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/TokenInterceptor.java @@ -18,12 +18,12 @@ */ package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.TextProvider; -import com.opensymphony.xwork2.TextProviderFactory; -import com.opensymphony.xwork2.interceptor.ValidationAware; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.interceptor.MethodFilterInterceptor; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.TextProvider; +import org.apache.struts2.TextProviderFactory; +import org.apache.struts2.interceptor.ValidationAware; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.interceptor.MethodFilterInterceptor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.ServletActionContext; @@ -131,7 +131,7 @@ public void setTextProviderFactory(TextProviderFactory textProviderFactory) { } /** - * @see com.opensymphony.xwork2.interceptor.MethodFilterInterceptor#doIntercept(com.opensymphony.xwork2.ActionInvocation) + * @see org.apache.struts2.interceptor.MethodFilterInterceptor#doIntercept(org.apache.struts2.ActionInvocation) */ @Override protected String doIntercept(ActionInvocation invocation) throws Exception { diff --git a/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java index cdcb0f2f85..331f8e6c79 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java @@ -18,10 +18,10 @@ */ package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.Result; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.ActionContext; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.Result; +import org.apache.struts2.util.ValueStack; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationAware.java b/core/src/main/java/org/apache/struts2/interceptor/ValidationAware.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationAware.java rename to core/src/main/java/org/apache/struts2/interceptor/ValidationAware.java index 485cb42fb6..a1e611a1cc 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationAware.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ValidationAware.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.interceptor; +package org.apache.struts2.interceptor; import java.util.Collection; import java.util.List; diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationErrorAware.java b/core/src/main/java/org/apache/struts2/interceptor/ValidationErrorAware.java similarity index 89% rename from core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationErrorAware.java rename to core/src/main/java/org/apache/struts2/interceptor/ValidationErrorAware.java index 4d04fa6dc6..3ba8f08f1d 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationErrorAware.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ValidationErrorAware.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.interceptor; +package org.apache.struts2.interceptor; /** * ValidationErrorAware classes can be notified about validation errors - * before {@link com.opensymphony.xwork2.interceptor.DefaultWorkflowInterceptor} will return 'inputResultName' result + * before {@link org.apache.struts2.interceptor.DefaultWorkflowInterceptor} will return 'inputResultName' result * to allow change or not the result name * * This interface can be only applied to action which already implements {@link ValidationAware} interface! diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationWorkflowAware.java b/core/src/main/java/org/apache/struts2/interceptor/ValidationWorkflowAware.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationWorkflowAware.java rename to core/src/main/java/org/apache/struts2/interceptor/ValidationWorkflowAware.java index b6c25ed318..e3f4a43850 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationWorkflowAware.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ValidationWorkflowAware.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.interceptor; +package org.apache.struts2.interceptor; /** * ValidationWorkflowAware classes can programmatically change result name when errors occurred diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/WithLazyParams.java b/core/src/main/java/org/apache/struts2/interceptor/WithLazyParams.java similarity index 86% rename from core/src/main/java/com/opensymphony/xwork2/interceptor/WithLazyParams.java rename to core/src/main/java/org/apache/struts2/interceptor/WithLazyParams.java index 750d23af1d..60b8e0fc62 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/WithLazyParams.java +++ b/core/src/main/java/org/apache/struts2/interceptor/WithLazyParams.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.interceptor; +package org.apache.struts2.interceptor; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.ognl.OgnlUtil; -import com.opensymphony.xwork2.util.TextParseUtil; -import com.opensymphony.xwork2.util.TextParser; -import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.reflection.ReflectionProvider; +import org.apache.struts2.ActionContext; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.ognl.OgnlUtil; +import org.apache.struts2.util.TextParseUtil; +import org.apache.struts2.util.TextParser; +import org.apache.struts2.util.ValueStack; +import org.apache.struts2.util.reflection.ReflectionProvider; import java.util.Map; diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/After.java b/core/src/main/java/org/apache/struts2/interceptor/annotations/After.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/After.java rename to core/src/main/java/org/apache/struts2/interceptor/annotations/After.java index 4df5b57d8d..2cbedc0d44 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/After.java +++ b/core/src/main/java/org/apache/struts2/interceptor/annotations/After.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.interceptor.annotations; +package org.apache.struts2.interceptor.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -80,5 +80,5 @@ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.METHOD}) public @interface After { - int priority() default 10; + int priority() default 10; } diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationWorkflowInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/annotations/AnnotationWorkflowInterceptor.java similarity index 93% rename from core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationWorkflowInterceptor.java rename to core/src/main/java/org/apache/struts2/interceptor/annotations/AnnotationWorkflowInterceptor.java index 6f0a936999..223e997750 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationWorkflowInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/annotations/AnnotationWorkflowInterceptor.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.interceptor.annotations; +package org.apache.struts2.interceptor.annotations; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.interceptor.AbstractInterceptor; -import com.opensymphony.xwork2.interceptor.PreResultListener; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.interceptor.AbstractInterceptor; +import org.apache.struts2.interceptor.PreResultListener; import org.apache.commons.lang3.reflect.MethodUtils; import org.apache.struts2.StrutsException; @@ -108,7 +108,7 @@ public class AnnotationWorkflowInterceptor extends AbstractInterceptor implement /** * Discovers annotated methods on the action and calls them according to the workflow * - * @see com.opensymphony.xwork2.interceptor.Interceptor#intercept(com.opensymphony.xwork2.ActionInvocation) + * @see org.apache.struts2.interceptor.Interceptor#intercept(ActionInvocation) */ public String intercept(ActionInvocation invocation) throws Exception { final Object action = invocation.getAction(); @@ -154,7 +154,7 @@ protected static int comparePriorities(int val1, int val2) { /** * Invokes any @BeforeResult annotated methods * - * @see com.opensymphony.xwork2.interceptor.PreResultListener#beforeResult(com.opensymphony.xwork2.ActionInvocation,String) + * @see org.apache.struts2.interceptor.PreResultListener#beforeResult(org.apache.struts2.ActionInvocation,String) */ public void beforeResult(ActionInvocation invocation, String resultCode) { Object action = invocation.getAction(); diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/Before.java b/core/src/main/java/org/apache/struts2/interceptor/annotations/Before.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/Before.java rename to core/src/main/java/org/apache/struts2/interceptor/annotations/Before.java index d8fc163f93..c2202b5bff 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/Before.java +++ b/core/src/main/java/org/apache/struts2/interceptor/annotations/Before.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.interceptor.annotations; +package org.apache.struts2.interceptor.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -79,5 +79,5 @@ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.METHOD}) public @interface Before { - int priority() default 10; + int priority() default 10; } diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/BeforeResult.java b/core/src/main/java/org/apache/struts2/interceptor/annotations/BeforeResult.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/BeforeResult.java rename to core/src/main/java/org/apache/struts2/interceptor/annotations/BeforeResult.java index 90665932f0..ce1a674659 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/BeforeResult.java +++ b/core/src/main/java/org/apache/struts2/interceptor/annotations/BeforeResult.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.interceptor.annotations; +package org.apache.struts2.interceptor.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -79,5 +79,5 @@ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.METHOD}) public @interface BeforeResult { - int priority() default 10; + int priority() default 10; } diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/InputConfig.java b/core/src/main/java/org/apache/struts2/interceptor/annotations/InputConfig.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/InputConfig.java rename to core/src/main/java/org/apache/struts2/interceptor/annotations/InputConfig.java index 2d4dc1f660..695f4f7509 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/InputConfig.java +++ b/core/src/main/java/org/apache/struts2/interceptor/annotations/InputConfig.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.interceptor.annotations; +package org.apache.struts2.interceptor.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.opensymphony.xwork2.Action; +import org.apache.struts2.Action; /** * diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/package.html b/core/src/main/java/org/apache/struts2/interceptor/annotations/package.html similarity index 100% rename from core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/package.html rename to core/src/main/java/org/apache/struts2/interceptor/annotations/package.html diff --git a/core/src/main/java/org/apache/struts2/interceptor/csp/CspInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/csp/CspInterceptor.java index 2210b970d3..1d944ef770 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/csp/CspInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/csp/CspInterceptor.java @@ -18,10 +18,10 @@ */ package org.apache.struts2.interceptor.csp; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.config.ConfigurationException; -import com.opensymphony.xwork2.interceptor.AbstractInterceptor; -import com.opensymphony.xwork2.util.ClassLoaderUtil; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.config.ConfigurationException; +import org.apache.struts2.interceptor.AbstractInterceptor; +import org.apache.struts2.util.ClassLoaderUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.logging.log4j.LogManager; diff --git a/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java index f51eb18230..156fcc47a7 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java @@ -18,12 +18,12 @@ */ package org.apache.struts2.interceptor.debugging; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.interceptor.AbstractInterceptor; -import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.reflection.ReflectionProvider; +import org.apache.struts2.ActionContext; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.interceptor.AbstractInterceptor; +import org.apache.struts2.util.ValueStack; +import org.apache.struts2.util.reflection.ReflectionProvider; import jakarta.servlet.http.HttpServletResponse; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -99,7 +99,7 @@ public class DebuggingInterceptor extends AbstractInterceptor { private final static Logger LOG = LogManager.getLogger(DebuggingInterceptor.class); - private final String[] ignorePrefixes = new String[]{"org.apache.struts.", "com.opensymphony.xwork2.", "xwork."}; + private final String[] ignorePrefixes = new String[]{"org.apache.struts.", "org.apache.struts2.", "xwork."}; private final Set ignoreKeys = Set.of( DispatcherConstants.APPLICATION, DispatcherConstants.SESSION, @@ -145,7 +145,7 @@ public void setReflectionProvider(ReflectionProvider reflectionProvider) { /* * (non-Javadoc) * - * @see com.opensymphony.xwork2.interceptor.Interceptor#invoke(com.opensymphony.xwork2.ActionInvocation) + * @see org.apache.struts2.interceptor.Interceptor#invoke(org.apache.struts2.ActionInvocation) */ public String intercept(ActionInvocation inv) throws Exception { boolean actionOnly = false; diff --git a/core/src/main/java/org/apache/struts2/interceptor/debugging/ObjectToHTMLWriter.java b/core/src/main/java/org/apache/struts2/interceptor/debugging/ObjectToHTMLWriter.java index 1839e624a4..6b1a975edf 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/debugging/ObjectToHTMLWriter.java +++ b/core/src/main/java/org/apache/struts2/interceptor/debugging/ObjectToHTMLWriter.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.interceptor.debugging; -import com.opensymphony.xwork2.util.reflection.ReflectionException; -import com.opensymphony.xwork2.util.reflection.ReflectionProvider; +import org.apache.struts2.util.reflection.ReflectionException; +import org.apache.struts2.util.reflection.ReflectionProvider; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/org/apache/struts2/interceptor/exec/BackgroundProcess.java b/core/src/main/java/org/apache/struts2/interceptor/exec/BackgroundProcess.java index 732c3d0af8..a9ca48d20c 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/exec/BackgroundProcess.java +++ b/core/src/main/java/org/apache/struts2/interceptor/exec/BackgroundProcess.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.interceptor.exec; -import com.opensymphony.xwork2.ActionInvocation; +import org.apache.struts2.ActionInvocation; import org.apache.struts2.interceptor.ExecuteAndWaitInterceptor; /** diff --git a/core/src/main/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcess.java b/core/src/main/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcess.java index 2ffef7e9aa..adab43dc6e 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcess.java +++ b/core/src/main/java/org/apache/struts2/interceptor/exec/StrutsBackgroundProcess.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.interceptor.exec; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; +import org.apache.struts2.ActionContext; +import org.apache.struts2.ActionInvocation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/org/apache/struts2/interceptor/httpmethod/HttpMethodInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/httpmethod/HttpMethodInterceptor.java index c3af555139..cc2dd4cc8f 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/httpmethod/HttpMethodInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/httpmethod/HttpMethodInterceptor.java @@ -18,9 +18,9 @@ */ package org.apache.struts2.interceptor.httpmethod; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.interceptor.AbstractInterceptor; -import com.opensymphony.xwork2.util.AnnotationUtils; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.interceptor.AbstractInterceptor; +import org.apache.struts2.util.AnnotationUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/package.html b/core/src/main/java/org/apache/struts2/interceptor/package.html similarity index 100% rename from core/src/main/java/com/opensymphony/xwork2/interceptor/package.html rename to core/src/main/java/org/apache/struts2/interceptor/package.html diff --git a/core/src/main/java/org/apache/struts2/interceptor/parameter/ParametersInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/parameter/ParametersInterceptor.java index 353f3cb82c..e89935c000 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/parameter/ParametersInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/parameter/ParametersInterceptor.java @@ -18,19 +18,19 @@ */ package org.apache.struts2.interceptor.parameter; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.interceptor.MethodFilterInterceptor; -import com.opensymphony.xwork2.security.AcceptedPatternsChecker; -import com.opensymphony.xwork2.security.DefaultAcceptedPatternsChecker; -import com.opensymphony.xwork2.security.ExcludedPatternsChecker; -import com.opensymphony.xwork2.util.ClearableValueStack; -import com.opensymphony.xwork2.util.MemberAccessValueStack; -import com.opensymphony.xwork2.util.TextParseUtil; -import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.ValueStackFactory; -import com.opensymphony.xwork2.util.reflection.ReflectionContextState; +import org.apache.struts2.ActionContext; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.interceptor.MethodFilterInterceptor; +import org.apache.struts2.security.AcceptedPatternsChecker; +import org.apache.struts2.security.DefaultAcceptedPatternsChecker; +import org.apache.struts2.security.ExcludedPatternsChecker; +import org.apache.struts2.util.ClearableValueStack; +import org.apache.struts2.util.MemberAccessValueStack; +import org.apache.struts2.util.TextParseUtil; +import org.apache.struts2.util.ValueStack; +import org.apache.struts2.util.ValueStackFactory; +import org.apache.struts2.util.reflection.ReflectionContextState; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.ClassUtils; import org.apache.logging.log4j.LogManager; @@ -62,10 +62,10 @@ import java.util.TreeMap; import java.util.regex.Pattern; -import static com.opensymphony.xwork2.security.DefaultAcceptedPatternsChecker.NESTING_CHARS; -import static com.opensymphony.xwork2.security.DefaultAcceptedPatternsChecker.NESTING_CHARS_STR; -import static com.opensymphony.xwork2.util.DebugUtils.logWarningForFirstOccurrence; -import static com.opensymphony.xwork2.util.DebugUtils.notifyDeveloperOfError; +import static org.apache.struts2.security.DefaultAcceptedPatternsChecker.NESTING_CHARS; +import static org.apache.struts2.security.DefaultAcceptedPatternsChecker.NESTING_CHARS_STR; +import static org.apache.struts2.util.DebugUtils.logWarningForFirstOccurrence; +import static org.apache.struts2.util.DebugUtils.notifyDeveloperOfError; import static java.lang.String.format; import static java.util.Collections.unmodifiableSet; import static java.util.stream.Collectors.joining; diff --git a/core/src/main/java/org/apache/struts2/interceptor/parameter/StrutsParameter.java b/core/src/main/java/org/apache/struts2/interceptor/parameter/StrutsParameter.java index 2a19aa83fa..99de060ff8 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/parameter/StrutsParameter.java +++ b/core/src/main/java/org/apache/struts2/interceptor/parameter/StrutsParameter.java @@ -24,7 +24,7 @@ import java.lang.annotation.Target; /** - * Used to annotate public getter/setter methods or fields on {@link com.opensymphony.xwork2.Action} classes that are + * Used to annotate public getter/setter methods or fields on {@link org.apache.struts2.Action} classes that are * intended for parameter injection by the {@link ParametersInterceptor}. * * @since 6.4.0 diff --git a/core/src/main/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptor.java index 9b4e6d7e96..f82d35555b 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptor.java @@ -18,9 +18,9 @@ */ package org.apache.struts2.interceptor.validation; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.config.ConfigurationException; -import com.opensymphony.xwork2.validator.ValidationInterceptor; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.config.ConfigurationException; +import org.apache.struts2.validator.ValidationInterceptor; import org.apache.commons.lang3.reflect.MethodUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/opensymphony/xwork2/mock/MockActionInvocation.java b/core/src/main/java/org/apache/struts2/mock/MockActionInvocation.java similarity index 94% rename from core/src/main/java/com/opensymphony/xwork2/mock/MockActionInvocation.java rename to core/src/main/java/org/apache/struts2/mock/MockActionInvocation.java index f37e8a6ae0..1515ec4b98 100644 --- a/core/src/main/java/com/opensymphony/xwork2/mock/MockActionInvocation.java +++ b/core/src/main/java/org/apache/struts2/mock/MockActionInvocation.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.mock; +package org.apache.struts2.mock; -import com.opensymphony.xwork2.*; -import com.opensymphony.xwork2.interceptor.PreResultListener; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.*; +import org.apache.struts2.interceptor.PreResultListener; +import org.apache.struts2.util.ValueStack; import java.util.ArrayList; import java.util.List; @@ -116,7 +116,7 @@ public String invokeActionOnly() throws Exception { public void setActionEventListener(ActionEventListener listener) { this.actionEventListener = listener; } - + public ActionEventListener getActionEventListener() { return this.actionEventListener; } diff --git a/core/src/main/java/com/opensymphony/xwork2/mock/MockActionProxy.java b/core/src/main/java/org/apache/struts2/mock/MockActionProxy.java similarity index 92% rename from core/src/main/java/com/opensymphony/xwork2/mock/MockActionProxy.java rename to core/src/main/java/org/apache/struts2/mock/MockActionProxy.java index 454fdea87c..9ad52ed837 100644 --- a/core/src/main/java/com/opensymphony/xwork2/mock/MockActionProxy.java +++ b/core/src/main/java/org/apache/struts2/mock/MockActionProxy.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.mock; +package org.apache.struts2.mock; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.ActionProxy; -import com.opensymphony.xwork2.config.Configuration; -import com.opensymphony.xwork2.config.entities.ActionConfig; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.ActionProxy; +import org.apache.struts2.config.Configuration; +import org.apache.struts2.config.entities.ActionConfig; import org.apache.commons.lang3.StringUtils; /** * Mock for an {@link ActionProxy}. - * + * * @author Patrick Lightbody (plightbo at gmail dot com) */ public class MockActionProxy implements ActionProxy { - + Object action; String actionName; ActionConfig config; @@ -44,7 +44,7 @@ public class MockActionProxy implements ActionProxy { boolean methodSpecified; public void prepare() throws Exception {} - + public String execute() throws Exception { executedCalled = true; diff --git a/core/src/main/java/com/opensymphony/xwork2/mock/MockContainer.java b/core/src/main/java/org/apache/struts2/mock/MockContainer.java similarity index 91% rename from core/src/main/java/com/opensymphony/xwork2/mock/MockContainer.java rename to core/src/main/java/org/apache/struts2/mock/MockContainer.java index ae153b5cb9..41fab15fe9 100644 --- a/core/src/main/java/com/opensymphony/xwork2/mock/MockContainer.java +++ b/core/src/main/java/org/apache/struts2/mock/MockContainer.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.mock; +package org.apache.struts2.mock; -import com.opensymphony.xwork2.inject.Container; -import com.opensymphony.xwork2.inject.Scope; +import org.apache.struts2.inject.Container; +import org.apache.struts2.inject.Scope; import java.util.Set; diff --git a/core/src/main/java/com/opensymphony/xwork2/mock/MockInterceptor.java b/core/src/main/java/org/apache/struts2/mock/MockInterceptor.java similarity index 93% rename from core/src/main/java/com/opensymphony/xwork2/mock/MockInterceptor.java rename to core/src/main/java/org/apache/struts2/mock/MockInterceptor.java index 58c60a288e..fc7bf86869 100644 --- a/core/src/main/java/com/opensymphony/xwork2/mock/MockInterceptor.java +++ b/core/src/main/java/org/apache/struts2/mock/MockInterceptor.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.mock; +package org.apache.struts2.mock; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.interceptor.AbstractInterceptor; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.interceptor.AbstractInterceptor; import org.junit.Assert; /** - * Mock for an {@link com.opensymphony.xwork2.interceptor.Interceptor}. + * Mock for an {@link org.apache.struts2.interceptor.Interceptor}. * * @author Jason Carreira */ public class MockInterceptor extends AbstractInterceptor { private static final long serialVersionUID = 2692551676567227756L; - + public static final String DEFAULT_FOO_VALUE = "fooDefault"; diff --git a/core/src/main/java/com/opensymphony/xwork2/mock/MockObjectTypeDeterminer.java b/core/src/main/java/org/apache/struts2/mock/MockObjectTypeDeterminer.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/mock/MockObjectTypeDeterminer.java rename to core/src/main/java/org/apache/struts2/mock/MockObjectTypeDeterminer.java index 4c8eef88d2..6c5f243800 100644 --- a/core/src/main/java/com/opensymphony/xwork2/mock/MockObjectTypeDeterminer.java +++ b/core/src/main/java/org/apache/struts2/mock/MockObjectTypeDeterminer.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.mock; +package org.apache.struts2.mock; -import com.opensymphony.xwork2.conversion.ObjectTypeDeterminer; +import org.apache.struts2.conversion.ObjectTypeDeterminer; import ognl.OgnlException; import ognl.OgnlRuntime; import org.apache.logging.log4j.LogManager; diff --git a/core/src/main/java/com/opensymphony/xwork2/mock/MockResult.java b/core/src/main/java/org/apache/struts2/mock/MockResult.java similarity index 92% rename from core/src/main/java/com/opensymphony/xwork2/mock/MockResult.java rename to core/src/main/java/org/apache/struts2/mock/MockResult.java index 6d3debec37..4993d8deb2 100644 --- a/core/src/main/java/com/opensymphony/xwork2/mock/MockResult.java +++ b/core/src/main/java/org/apache/struts2/mock/MockResult.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.mock; +package org.apache.struts2.mock; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.Result; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.Result; /** * Mock for a {@link Result}. diff --git a/core/src/main/java/com/opensymphony/xwork2/mock/package.html b/core/src/main/java/org/apache/struts2/mock/package.html similarity index 100% rename from core/src/main/java/com/opensymphony/xwork2/mock/package.html rename to core/src/main/java/org/apache/struts2/mock/package.html diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/BeanInfoCacheFactory.java b/core/src/main/java/org/apache/struts2/ognl/BeanInfoCacheFactory.java similarity index 95% rename from core/src/main/java/com/opensymphony/xwork2/ognl/BeanInfoCacheFactory.java rename to core/src/main/java/org/apache/struts2/ognl/BeanInfoCacheFactory.java index 58d03f5a14..82f5059c08 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/BeanInfoCacheFactory.java +++ b/core/src/main/java/org/apache/struts2/ognl/BeanInfoCacheFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.opensymphony.xwork2.ognl; +package org.apache.struts2.ognl; /** * A proxy interface to be used with Struts DI mechanism diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/DefaultOgnlBeanInfoCacheFactory.java b/core/src/main/java/org/apache/struts2/ognl/DefaultOgnlBeanInfoCacheFactory.java similarity index 94% rename from core/src/main/java/com/opensymphony/xwork2/ognl/DefaultOgnlBeanInfoCacheFactory.java rename to core/src/main/java/org/apache/struts2/ognl/DefaultOgnlBeanInfoCacheFactory.java index 3513e6a818..6c4bb5ec96 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/DefaultOgnlBeanInfoCacheFactory.java +++ b/core/src/main/java/org/apache/struts2/ognl/DefaultOgnlBeanInfoCacheFactory.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.opensymphony.xwork2.ognl; +package org.apache.struts2.ognl; -import com.opensymphony.xwork2.inject.Inject; +import org.apache.struts2.inject.Inject; import org.apache.commons.lang3.EnumUtils; import org.apache.struts2.StrutsConstants; diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/DefaultOgnlCacheFactory.java b/core/src/main/java/org/apache/struts2/ognl/DefaultOgnlCacheFactory.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/ognl/DefaultOgnlCacheFactory.java rename to core/src/main/java/org/apache/struts2/ognl/DefaultOgnlCacheFactory.java index 889591b69f..3bae815488 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/DefaultOgnlCacheFactory.java +++ b/core/src/main/java/org/apache/struts2/ognl/DefaultOgnlCacheFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.opensymphony.xwork2.ognl; +package org.apache.struts2.ognl; /** *

      Default OGNL Cache factory implementation.

      diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/DefaultOgnlExpressionCacheFactory.java b/core/src/main/java/org/apache/struts2/ognl/DefaultOgnlExpressionCacheFactory.java similarity index 94% rename from core/src/main/java/com/opensymphony/xwork2/ognl/DefaultOgnlExpressionCacheFactory.java rename to core/src/main/java/org/apache/struts2/ognl/DefaultOgnlExpressionCacheFactory.java index 9a8555f912..b39ce7d0fd 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/DefaultOgnlExpressionCacheFactory.java +++ b/core/src/main/java/org/apache/struts2/ognl/DefaultOgnlExpressionCacheFactory.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.opensymphony.xwork2.ognl; +package org.apache.struts2.ognl; -import com.opensymphony.xwork2.inject.Inject; +import org.apache.struts2.inject.Inject; import org.apache.commons.lang3.EnumUtils; import org.apache.struts2.StrutsConstants; diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/ErrorMessageBuilder.java b/core/src/main/java/org/apache/struts2/ognl/ErrorMessageBuilder.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/ognl/ErrorMessageBuilder.java rename to core/src/main/java/org/apache/struts2/ognl/ErrorMessageBuilder.java index ad54b2015d..81c4bc373f 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/ErrorMessageBuilder.java +++ b/core/src/main/java/org/apache/struts2/ognl/ErrorMessageBuilder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.ognl; +package org.apache.struts2.ognl; /** * Helper class to build error messages. diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/ExpressionCacheFactory.java b/core/src/main/java/org/apache/struts2/ognl/ExpressionCacheFactory.java similarity index 95% rename from core/src/main/java/com/opensymphony/xwork2/ognl/ExpressionCacheFactory.java rename to core/src/main/java/org/apache/struts2/ognl/ExpressionCacheFactory.java index 182a31b88a..a983b5de33 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/ExpressionCacheFactory.java +++ b/core/src/main/java/org/apache/struts2/ognl/ExpressionCacheFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.opensymphony.xwork2.ognl; +package org.apache.struts2.ognl; /** * A proxy interface to be used with Struts DI mechanism diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/ObjectProxy.java b/core/src/main/java/org/apache/struts2/ognl/ObjectProxy.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/ognl/ObjectProxy.java rename to core/src/main/java/org/apache/struts2/ognl/ObjectProxy.java index dac3ea65f8..759a8c5b7b 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/ObjectProxy.java +++ b/core/src/main/java/org/apache/struts2/ognl/ObjectProxy.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.ognl; +package org.apache.struts2.ognl; /** * An Object to use within OGNL to proxy other Objects diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlCache.java b/core/src/main/java/org/apache/struts2/ognl/OgnlCache.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/ognl/OgnlCache.java rename to core/src/main/java/org/apache/struts2/ognl/OgnlCache.java index fc83666991..ec2d002e97 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlCache.java +++ b/core/src/main/java/org/apache/struts2/ognl/OgnlCache.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.opensymphony.xwork2.ognl; +package org.apache.struts2.ognl; /** * A basic cache interface for use with OGNL processing (such as Expression, BeanInfo). diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlCacheFactory.java b/core/src/main/java/org/apache/struts2/ognl/OgnlCacheFactory.java similarity index 92% rename from core/src/main/java/com/opensymphony/xwork2/ognl/OgnlCacheFactory.java rename to core/src/main/java/org/apache/struts2/ognl/OgnlCacheFactory.java index 708c6728d9..5b28ccadf2 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlCacheFactory.java +++ b/core/src/main/java/org/apache/struts2/ognl/OgnlCacheFactory.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.opensymphony.xwork2.ognl; +package org.apache.struts2.ognl; /** - * Used by {@link com.opensymphony.xwork2.ognl.OgnlUtil} to create appropriate OGNL + * Used by {@link org.apache.struts2.ognl.OgnlUtil} to create appropriate OGNL * caches based on configuration. * * @param The type for the cache key entries diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlCaffeineCache.java b/core/src/main/java/org/apache/struts2/ognl/OgnlCaffeineCache.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/ognl/OgnlCaffeineCache.java rename to core/src/main/java/org/apache/struts2/ognl/OgnlCaffeineCache.java index b7a0241e39..22ba4c62ec 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlCaffeineCache.java +++ b/core/src/main/java/org/apache/struts2/ognl/OgnlCaffeineCache.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.opensymphony.xwork2.ognl; +package org.apache.struts2.ognl; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlDefaultCache.java b/core/src/main/java/org/apache/struts2/ognl/OgnlDefaultCache.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/ognl/OgnlDefaultCache.java rename to core/src/main/java/org/apache/struts2/ognl/OgnlDefaultCache.java index 920403a5d2..727c2177d1 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlDefaultCache.java +++ b/core/src/main/java/org/apache/struts2/ognl/OgnlDefaultCache.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.opensymphony.xwork2.ognl; +package org.apache.struts2.ognl; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; diff --git a/core/src/main/java/org/apache/struts2/ognl/OgnlGuard.java b/core/src/main/java/org/apache/struts2/ognl/OgnlGuard.java index 8924c4684c..922b2b91bc 100644 --- a/core/src/main/java/org/apache/struts2/ognl/OgnlGuard.java +++ b/core/src/main/java/org/apache/struts2/ognl/OgnlGuard.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.ognl; -import com.opensymphony.xwork2.ognl.OgnlUtil; +import org.apache.struts2.ognl.OgnlUtil; import ognl.Ognl; import ognl.OgnlException; diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlLRUCache.java b/core/src/main/java/org/apache/struts2/ognl/OgnlLRUCache.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/ognl/OgnlLRUCache.java rename to core/src/main/java/org/apache/struts2/ognl/OgnlLRUCache.java index 9de52f686d..6b43d71f23 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlLRUCache.java +++ b/core/src/main/java/org/apache/struts2/ognl/OgnlLRUCache.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.opensymphony.xwork2.ognl; +package org.apache.struts2.ognl; import java.util.Collections; import java.util.LinkedHashMap; diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlNullHandlerWrapper.java b/core/src/main/java/org/apache/struts2/ognl/OgnlNullHandlerWrapper.java similarity index 93% rename from core/src/main/java/com/opensymphony/xwork2/ognl/OgnlNullHandlerWrapper.java rename to core/src/main/java/org/apache/struts2/ognl/OgnlNullHandlerWrapper.java index d05d4636db..aac6a478a0 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlNullHandlerWrapper.java +++ b/core/src/main/java/org/apache/struts2/ognl/OgnlNullHandlerWrapper.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.ognl; +package org.apache.struts2.ognl; -import com.opensymphony.xwork2.conversion.NullHandler; +import org.apache.struts2.conversion.NullHandler; import java.util.Map; diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlReflectionContextFactory.java b/core/src/main/java/org/apache/struts2/ognl/OgnlReflectionContextFactory.java similarity index 90% rename from core/src/main/java/com/opensymphony/xwork2/ognl/OgnlReflectionContextFactory.java rename to core/src/main/java/org/apache/struts2/ognl/OgnlReflectionContextFactory.java index b1821ccf5f..92f079335d 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlReflectionContextFactory.java +++ b/core/src/main/java/org/apache/struts2/ognl/OgnlReflectionContextFactory.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.ognl; +package org.apache.struts2.ognl; -import com.opensymphony.xwork2.util.reflection.ReflectionContextFactory; +import org.apache.struts2.util.reflection.ReflectionContextFactory; import ognl.Ognl; import java.util.Map; diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlReflectionProvider.java b/core/src/main/java/org/apache/struts2/ognl/OgnlReflectionProvider.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/ognl/OgnlReflectionProvider.java rename to core/src/main/java/org/apache/struts2/ognl/OgnlReflectionProvider.java index 23dec6343e..9df38d9ae6 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlReflectionProvider.java +++ b/core/src/main/java/org/apache/struts2/ognl/OgnlReflectionProvider.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.ognl; +package org.apache.struts2.ognl; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.reflection.ReflectionException; -import com.opensymphony.xwork2.util.reflection.ReflectionProvider; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.reflection.ReflectionException; +import org.apache.struts2.util.reflection.ReflectionProvider; import ognl.OgnlException; import ognl.OgnlRuntime; diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlTypeConverterWrapper.java b/core/src/main/java/org/apache/struts2/ognl/OgnlTypeConverterWrapper.java similarity index 94% rename from core/src/main/java/com/opensymphony/xwork2/ognl/OgnlTypeConverterWrapper.java rename to core/src/main/java/org/apache/struts2/ognl/OgnlTypeConverterWrapper.java index 65e614afe8..100fc61b92 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlTypeConverterWrapper.java +++ b/core/src/main/java/org/apache/struts2/ognl/OgnlTypeConverterWrapper.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.ognl; +package org.apache.struts2.ognl; -import com.opensymphony.xwork2.conversion.TypeConverter; +import org.apache.struts2.conversion.TypeConverter; import java.lang.reflect.Member; import java.util.Map; diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java b/core/src/main/java/org/apache/struts2/ognl/OgnlUtil.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java rename to core/src/main/java/org/apache/struts2/ognl/OgnlUtil.java index 043f602046..95bee5f430 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java +++ b/core/src/main/java/org/apache/struts2/ognl/OgnlUtil.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.ognl; - -import com.opensymphony.xwork2.conversion.impl.XWorkConverter; -import com.opensymphony.xwork2.inject.Container; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.ognl.accessor.RootAccessor; -import com.opensymphony.xwork2.util.CompoundRoot; -import com.opensymphony.xwork2.util.reflection.ReflectionException; +package org.apache.struts2.ognl; + +import org.apache.struts2.conversion.impl.XWorkConverter; +import org.apache.struts2.inject.Container; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.ognl.accessor.RootAccessor; +import org.apache.struts2.util.CompoundRoot; +import org.apache.struts2.util.reflection.ReflectionException; import ognl.ClassResolver; import ognl.Ognl; import ognl.OgnlContext; @@ -495,7 +495,7 @@ private void checkArithmeticExpression(Object tree, Map context) /** * Copies the properties in the object "from" and sets them in the object "to" - * using specified type converter, or {@link com.opensymphony.xwork2.conversion.impl.XWorkConverter} if none + * using specified type converter, or {@link XWorkConverter} if none * is specified. * * @param from the source object @@ -512,7 +512,7 @@ public void copy(final Object from, final Object to, final Map c /** * Copies the properties in the object "from" and sets them in the object "to" * only setting properties defined in the given "editable" class (or interface) - * using specified type converter, or {@link com.opensymphony.xwork2.conversion.impl.XWorkConverter} if none + * using specified type converter, or {@link XWorkConverter} if none * is specified. * * @param from the source object @@ -591,7 +591,7 @@ public void copy(final Object from, /** * Copies the properties in the object "from" and sets them in the object "to" - * using specified type converter, or {@link com.opensymphony.xwork2.conversion.impl.XWorkConverter} if none + * using specified type converter, or {@link XWorkConverter} if none * is specified. * * @param from the source object diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java b/core/src/main/java/org/apache/struts2/ognl/OgnlValueStack.java similarity index 88% rename from core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java rename to core/src/main/java/org/apache/struts2/ognl/OgnlValueStack.java index 50de36d48d..a155c1cbc4 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java +++ b/core/src/main/java/org/apache/struts2/ognl/OgnlValueStack.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.ognl; - -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.TextProvider; -import com.opensymphony.xwork2.conversion.impl.XWorkConverter; -import com.opensymphony.xwork2.inject.Container; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.ognl.accessor.RootAccessor; -import com.opensymphony.xwork2.util.ClearableValueStack; -import com.opensymphony.xwork2.util.CompoundRoot; -import com.opensymphony.xwork2.util.MemberAccessValueStack; -import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.reflection.ReflectionContextState; +package org.apache.struts2.ognl; + +import org.apache.struts2.ActionContext; +import org.apache.struts2.TextProvider; +import org.apache.struts2.conversion.impl.XWorkConverter; +import org.apache.struts2.inject.Container; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.ognl.accessor.RootAccessor; +import org.apache.struts2.util.ClearableValueStack; +import org.apache.struts2.util.CompoundRoot; +import org.apache.struts2.util.MemberAccessValueStack; +import org.apache.struts2.util.ValueStack; +import org.apache.struts2.util.reflection.ReflectionContextState; import ognl.MethodFailedException; import ognl.NoSuchPropertyException; import ognl.Ognl; @@ -65,7 +65,7 @@ public class OgnlValueStack implements Serializable, ValueStack, ClearableValueS @Serial private static final long serialVersionUID = 370737852934925530L; - private static final String MAP_IDENTIFIER_KEY = "com.opensymphony.xwork2.util.OgnlValueStack.MAP_IDENTIFIER_KEY"; + private static final String MAP_IDENTIFIER_KEY = "org.apache.struts2.util.OgnlValueStack.MAP_IDENTIFIER_KEY"; protected CompoundRoot root; protected transient Map context; @@ -144,7 +144,7 @@ protected void setShouldFallbackToContext(String shouldFallbackToContext) { } /** - * @see com.opensymphony.xwork2.util.ValueStack#getContext() + * @see org.apache.struts2.util.ValueStack#getContext() */ @Override public Map getContext() { @@ -157,7 +157,7 @@ public ActionContext getActionContext() { } /** - * @see com.opensymphony.xwork2.util.ValueStack#setDefaultType(java.lang.Class) + * @see org.apache.struts2.util.ValueStack#setDefaultType(java.lang.Class) */ @Override public void setDefaultType(Class defaultType) { @@ -165,7 +165,7 @@ public void setDefaultType(Class defaultType) { } /** - * @see com.opensymphony.xwork2.util.ValueStack#setExprOverrides(java.util.Map) + * @see org.apache.struts2.util.ValueStack#setExprOverrides(java.util.Map) */ public void setExprOverrides(Map overrides) { if (this.overrides == null) { @@ -176,7 +176,7 @@ public void setExprOverrides(Map overrides) { } /** - * @see com.opensymphony.xwork2.util.ValueStack#getExprOverrides() + * @see org.apache.struts2.util.ValueStack#getExprOverrides() */ @Override public Map getExprOverrides() { @@ -184,7 +184,7 @@ public Map getExprOverrides() { } /** - * @see com.opensymphony.xwork2.util.ValueStack#getRoot() + * @see org.apache.struts2.util.ValueStack#getRoot() */ @Override public CompoundRoot getRoot() { @@ -192,7 +192,7 @@ public CompoundRoot getRoot() { } /** - * @see com.opensymphony.xwork2.util.ValueStack#setParameter(String, Object) + * @see org.apache.struts2.util.ValueStack#setParameter(String, Object) */ @Override public void setParameter(String expr, Object value) { @@ -200,7 +200,7 @@ public void setParameter(String expr, Object value) { } /** - * @see com.opensymphony.xwork2.util.ValueStack#setValue(java.lang.String, java.lang.Object) + * @see org.apache.struts2.util.ValueStack#setValue(java.lang.String, java.lang.Object) */ @Override public void setValue(String expr, Object value) { @@ -208,7 +208,7 @@ public void setValue(String expr, Object value) { } /** - * @see com.opensymphony.xwork2.util.ValueStack#setValue(java.lang.String, java.lang.Object, boolean) + * @see org.apache.struts2.util.ValueStack#setValue(java.lang.String, java.lang.Object, boolean) */ @Override public void setValue(String expr, Object value, boolean throwExceptionOnFailure) { @@ -266,7 +266,7 @@ protected void handleOgnlException(String expr, Object value, boolean throwExcep } /** - * @see com.opensymphony.xwork2.util.ValueStack#findString(java.lang.String) + * @see org.apache.struts2.util.ValueStack#findString(java.lang.String) */ @Override public String findString(String expr) { @@ -279,7 +279,7 @@ public String findString(String expr, boolean throwExceptionOnFailure) { } /** - * @see com.opensymphony.xwork2.util.ValueStack#findValue(java.lang.String) + * @see org.apache.struts2.util.ValueStack#findValue(java.lang.String) */ @Override public Object findValue(String expr, boolean throwExceptionOnFailure) { @@ -334,7 +334,7 @@ public Object findValue(String expr) { } /** - * @see com.opensymphony.xwork2.util.ValueStack#findValue(java.lang.String, java.lang.Class) + * @see org.apache.struts2.util.ValueStack#findValue(java.lang.String, java.lang.Class) */ @Override public Object findValue(String expr, Class asType, boolean throwExceptionOnFailure) { @@ -427,7 +427,7 @@ private void logLookupFailure(String expr, Exception e) { } /** - * @see com.opensymphony.xwork2.util.ValueStack#peek() + * @see org.apache.struts2.util.ValueStack#peek() */ @Override public Object peek() { @@ -435,7 +435,7 @@ public Object peek() { } /** - * @see com.opensymphony.xwork2.util.ValueStack#pop() + * @see org.apache.struts2.util.ValueStack#pop() */ @Override public Object pop() { @@ -443,7 +443,7 @@ public Object pop() { } /** - * @see com.opensymphony.xwork2.util.ValueStack#push(java.lang.Object) + * @see org.apache.struts2.util.ValueStack#push(java.lang.Object) */ @Override public void push(Object o) { @@ -451,7 +451,7 @@ public void push(Object o) { } /** - * @see com.opensymphony.xwork2.util.ValueStack#set(java.lang.String, java.lang.Object) + * @see org.apache.struts2.util.ValueStack#set(java.lang.String, java.lang.Object) */ @Override public void set(String key, Object o) { @@ -481,7 +481,7 @@ private boolean shouldUseOldMap(Object topObj) { } /** - * @see com.opensymphony.xwork2.util.ValueStack#size() + * @see org.apache.struts2.util.ValueStack#size() */ @Override public int size() { @@ -489,7 +489,7 @@ public int size() { } /** - * Retained for serializability - see {@link com.opensymphony.xwork2.ognl.OgnlValueStackTest#testSerializable} + * Retained for serializability - see {@link org.apache.struts2.ognl.OgnlValueStackTest#testSerializable} */ private Object readResolve() { // TODO: this should be done better diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStackFactory.java b/core/src/main/java/org/apache/struts2/ognl/OgnlValueStackFactory.java similarity index 92% rename from core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStackFactory.java rename to core/src/main/java/org/apache/struts2/ognl/OgnlValueStackFactory.java index 137889110a..ec32f89860 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStackFactory.java +++ b/core/src/main/java/org/apache/struts2/ognl/OgnlValueStackFactory.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.ognl; - -import com.opensymphony.xwork2.TextProvider; -import com.opensymphony.xwork2.conversion.NullHandler; -import com.opensymphony.xwork2.conversion.impl.XWorkConverter; -import com.opensymphony.xwork2.inject.Container; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.ognl.accessor.RootAccessor; -import com.opensymphony.xwork2.util.CompoundRoot; -import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.ValueStackFactory; +package org.apache.struts2.ognl; + +import org.apache.struts2.TextProvider; +import org.apache.struts2.conversion.NullHandler; +import org.apache.struts2.conversion.impl.XWorkConverter; +import org.apache.struts2.inject.Container; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.ognl.accessor.RootAccessor; +import org.apache.struts2.util.CompoundRoot; +import org.apache.struts2.util.ValueStack; +import org.apache.struts2.util.ValueStackFactory; import ognl.MethodAccessor; import ognl.OgnlRuntime; import ognl.PropertyAccessor; diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java b/core/src/main/java/org/apache/struts2/ognl/SecurityMemberAccess.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java rename to core/src/main/java/org/apache/struts2/ognl/SecurityMemberAccess.java index 4cd62292d7..45a291d2f8 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java +++ b/core/src/main/java/org/apache/struts2/ognl/SecurityMemberAccess.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.ognl; +package org.apache.struts2.ognl; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.ProxyUtil; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.ProxyUtil; import ognl.MemberAccess; import org.apache.commons.lang3.BooleanUtils; import org.apache.logging.log4j.LogManager; @@ -40,13 +40,13 @@ import java.util.regex.Pattern; import java.util.stream.IntStream; -import static com.opensymphony.xwork2.util.ConfigParseUtil.toClassObjectsSet; -import static com.opensymphony.xwork2.util.ConfigParseUtil.toClassesSet; -import static com.opensymphony.xwork2.util.ConfigParseUtil.toNewClassesSet; -import static com.opensymphony.xwork2.util.ConfigParseUtil.toNewPackageNamesSet; -import static com.opensymphony.xwork2.util.ConfigParseUtil.toNewPatternsSet; -import static com.opensymphony.xwork2.util.ConfigParseUtil.toPackageNamesSet; -import static com.opensymphony.xwork2.util.DebugUtils.logWarningForFirstOccurrence; +import static org.apache.struts2.util.ConfigParseUtil.toClassObjectsSet; +import static org.apache.struts2.util.ConfigParseUtil.toClassesSet; +import static org.apache.struts2.util.ConfigParseUtil.toNewClassesSet; +import static org.apache.struts2.util.ConfigParseUtil.toNewPackageNamesSet; +import static org.apache.struts2.util.ConfigParseUtil.toNewPatternsSet; +import static org.apache.struts2.util.ConfigParseUtil.toPackageNamesSet; +import static org.apache.struts2.util.DebugUtils.logWarningForFirstOccurrence; import static java.text.MessageFormat.format; import static java.util.Collections.emptySet; import static org.apache.struts2.StrutsConstants.STRUTS_ALLOWLIST_CLASSES; @@ -61,7 +61,7 @@ public class SecurityMemberAccess implements MemberAccess { private static final Logger LOG = LogManager.getLogger(SecurityMemberAccess.class); private static final Set ALLOWLIST_REQUIRED_PACKAGES = Set.of( - "com.opensymphony.xwork2.validator.validators", + "org.apache.struts2.validator.validators", "org.apache.struts2.components", "org.apache.struts2.views.jsp" ); diff --git a/core/src/main/java/org/apache/struts2/ognl/StrutsOgnlGuard.java b/core/src/main/java/org/apache/struts2/ognl/StrutsOgnlGuard.java index 0cb4d1d930..f46246d3b9 100644 --- a/core/src/main/java/org/apache/struts2/ognl/StrutsOgnlGuard.java +++ b/core/src/main/java/org/apache/struts2/ognl/StrutsOgnlGuard.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.ognl; -import com.opensymphony.xwork2.config.ConfigurationException; -import com.opensymphony.xwork2.inject.Inject; +import org.apache.struts2.config.ConfigurationException; +import org.apache.struts2.inject.Inject; import ognl.Node; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -28,7 +28,7 @@ import java.util.HashSet; import java.util.Set; -import static com.opensymphony.xwork2.util.TextParseUtil.commaDelimitedStringToSet; +import static org.apache.struts2.util.TextParseUtil.commaDelimitedStringToSet; import static java.util.Collections.emptySet; import static java.util.Collections.unmodifiableSet; diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/XWorkTypeConverterWrapper.java b/core/src/main/java/org/apache/struts2/ognl/XWorkTypeConverterWrapper.java similarity index 93% rename from core/src/main/java/com/opensymphony/xwork2/ognl/XWorkTypeConverterWrapper.java rename to core/src/main/java/org/apache/struts2/ognl/XWorkTypeConverterWrapper.java index e3abca8013..21eef09e72 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/XWorkTypeConverterWrapper.java +++ b/core/src/main/java/org/apache/struts2/ognl/XWorkTypeConverterWrapper.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.ognl; +package org.apache.struts2.ognl; -import com.opensymphony.xwork2.conversion.TypeConverter; +import org.apache.struts2.conversion.TypeConverter; import java.lang.reflect.Member; import java.util.Map; diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/CompoundRootAccessor.java b/core/src/main/java/org/apache/struts2/ognl/accessor/CompoundRootAccessor.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/ognl/accessor/CompoundRootAccessor.java rename to core/src/main/java/org/apache/struts2/ognl/accessor/CompoundRootAccessor.java index 2f9333069c..b40ff02193 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/CompoundRootAccessor.java +++ b/core/src/main/java/org/apache/struts2/ognl/accessor/CompoundRootAccessor.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.ognl.accessor; +package org.apache.struts2.ognl.accessor; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.ognl.OgnlValueStack; -import com.opensymphony.xwork2.util.CompoundRoot; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.ognl.OgnlValueStack; +import org.apache.struts2.util.CompoundRoot; +import org.apache.struts2.util.ValueStack; import ognl.MethodFailedException; import ognl.NoSuchPropertyException; import ognl.Ognl; diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/HttpParametersPropertyAccessor.java b/core/src/main/java/org/apache/struts2/ognl/accessor/HttpParametersPropertyAccessor.java similarity index 94% rename from core/src/main/java/com/opensymphony/xwork2/ognl/accessor/HttpParametersPropertyAccessor.java rename to core/src/main/java/org/apache/struts2/ognl/accessor/HttpParametersPropertyAccessor.java index 40fe62a0bb..6f1216b8cd 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/HttpParametersPropertyAccessor.java +++ b/core/src/main/java/org/apache/struts2/ognl/accessor/HttpParametersPropertyAccessor.java @@ -16,12 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.ognl.accessor; +package org.apache.struts2.ognl.accessor; import ognl.ObjectPropertyAccessor; import ognl.OgnlException; import org.apache.struts2.dispatcher.HttpParameters; -import org.apache.struts2.dispatcher.Parameter; import java.util.Map; diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/ObjectAccessor.java b/core/src/main/java/org/apache/struts2/ognl/accessor/ObjectAccessor.java similarity index 86% rename from core/src/main/java/com/opensymphony/xwork2/ognl/accessor/ObjectAccessor.java rename to core/src/main/java/org/apache/struts2/ognl/accessor/ObjectAccessor.java index 2edf89f296..a8cabd7e10 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/ObjectAccessor.java +++ b/core/src/main/java/org/apache/struts2/ognl/accessor/ObjectAccessor.java @@ -16,11 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.ognl.accessor; +package org.apache.struts2.ognl.accessor; -import com.opensymphony.xwork2.conversion.impl.XWorkConverter; -import com.opensymphony.xwork2.ognl.OgnlValueStack; -import com.opensymphony.xwork2.util.reflection.ReflectionContextState; +import org.apache.struts2.conversion.impl.XWorkConverter; +import org.apache.struts2.util.reflection.ReflectionContextState; import ognl.ObjectPropertyAccessor; import ognl.OgnlException; diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/ObjectProxyPropertyAccessor.java b/core/src/main/java/org/apache/struts2/ognl/accessor/ObjectProxyPropertyAccessor.java similarity index 94% rename from core/src/main/java/com/opensymphony/xwork2/ognl/accessor/ObjectProxyPropertyAccessor.java rename to core/src/main/java/org/apache/struts2/ognl/accessor/ObjectProxyPropertyAccessor.java index 5f5ccb7994..e57c55a84d 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/ObjectProxyPropertyAccessor.java +++ b/core/src/main/java/org/apache/struts2/ognl/accessor/ObjectProxyPropertyAccessor.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.ognl.accessor; +package org.apache.struts2.ognl.accessor; -import com.opensymphony.xwork2.ognl.ObjectProxy; -import com.opensymphony.xwork2.util.reflection.ReflectionContextState; +import org.apache.struts2.ognl.ObjectProxy; +import org.apache.struts2.util.reflection.ReflectionContextState; import ognl.OgnlContext; import ognl.OgnlException; import ognl.OgnlRuntime; diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/ParameterPropertyAccessor.java b/core/src/main/java/org/apache/struts2/ognl/accessor/ParameterPropertyAccessor.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/ognl/accessor/ParameterPropertyAccessor.java rename to core/src/main/java/org/apache/struts2/ognl/accessor/ParameterPropertyAccessor.java index 659b709833..f7e4fb102c 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/ParameterPropertyAccessor.java +++ b/core/src/main/java/org/apache/struts2/ognl/accessor/ParameterPropertyAccessor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.ognl.accessor; +package org.apache.struts2.ognl.accessor; import ognl.ObjectPropertyAccessor; import ognl.OgnlException; diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/RootAccessor.java b/core/src/main/java/org/apache/struts2/ognl/accessor/RootAccessor.java similarity index 95% rename from core/src/main/java/com/opensymphony/xwork2/ognl/accessor/RootAccessor.java rename to core/src/main/java/org/apache/struts2/ognl/accessor/RootAccessor.java index 481bf2f751..50e9feea00 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/RootAccessor.java +++ b/core/src/main/java/org/apache/struts2/ognl/accessor/RootAccessor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.ognl.accessor; +package org.apache.struts2.ognl.accessor; import ognl.ClassResolver; import ognl.MethodAccessor; diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkCollectionPropertyAccessor.java b/core/src/main/java/org/apache/struts2/ognl/accessor/XWorkCollectionPropertyAccessor.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkCollectionPropertyAccessor.java rename to core/src/main/java/org/apache/struts2/ognl/accessor/XWorkCollectionPropertyAccessor.java index 2d3581e143..d416785a5d 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkCollectionPropertyAccessor.java +++ b/core/src/main/java/org/apache/struts2/ognl/accessor/XWorkCollectionPropertyAccessor.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.ognl.accessor; - -import com.opensymphony.xwork2.ObjectFactory; -import com.opensymphony.xwork2.conversion.ObjectTypeDeterminer; -import com.opensymphony.xwork2.conversion.impl.XWorkConverter; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.ognl.OgnlUtil; -import com.opensymphony.xwork2.util.reflection.ReflectionContextState; +package org.apache.struts2.ognl.accessor; + +import org.apache.struts2.ObjectFactory; +import org.apache.struts2.conversion.ObjectTypeDeterminer; +import org.apache.struts2.conversion.impl.XWorkConverter; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.ognl.OgnlUtil; +import org.apache.struts2.util.reflection.ReflectionContextState; import ognl.ObjectPropertyAccessor; import ognl.OgnlException; import ognl.OgnlRuntime; diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkEnumerationAccessor.java b/core/src/main/java/org/apache/struts2/ognl/accessor/XWorkEnumerationAccessor.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkEnumerationAccessor.java rename to core/src/main/java/org/apache/struts2/ognl/accessor/XWorkEnumerationAccessor.java index d0d713aa30..cad0c7cd88 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkEnumerationAccessor.java +++ b/core/src/main/java/org/apache/struts2/ognl/accessor/XWorkEnumerationAccessor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.ognl.accessor; +package org.apache.struts2.ognl.accessor; import ognl.EnumerationPropertyAccessor; import ognl.ObjectPropertyAccessor; diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkIteratorPropertyAccessor.java b/core/src/main/java/org/apache/struts2/ognl/accessor/XWorkIteratorPropertyAccessor.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkIteratorPropertyAccessor.java rename to core/src/main/java/org/apache/struts2/ognl/accessor/XWorkIteratorPropertyAccessor.java index 89796080c5..acd7c52d21 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkIteratorPropertyAccessor.java +++ b/core/src/main/java/org/apache/struts2/ognl/accessor/XWorkIteratorPropertyAccessor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.ognl.accessor; +package org.apache.struts2.ognl.accessor; import ognl.IteratorPropertyAccessor; import ognl.ObjectPropertyAccessor; diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkListPropertyAccessor.java b/core/src/main/java/org/apache/struts2/ognl/accessor/XWorkListPropertyAccessor.java similarity index 94% rename from core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkListPropertyAccessor.java rename to core/src/main/java/org/apache/struts2/ognl/accessor/XWorkListPropertyAccessor.java index 9bc0df14a3..1ec2a2d7c2 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkListPropertyAccessor.java +++ b/core/src/main/java/org/apache/struts2/ognl/accessor/XWorkListPropertyAccessor.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.ognl.accessor; - -import com.opensymphony.xwork2.ObjectFactory; -import com.opensymphony.xwork2.conversion.ObjectTypeDeterminer; -import com.opensymphony.xwork2.conversion.impl.XWorkConverter; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.ognl.OgnlUtil; -import com.opensymphony.xwork2.util.reflection.ReflectionContextState; +package org.apache.struts2.ognl.accessor; + +import org.apache.struts2.ObjectFactory; +import org.apache.struts2.conversion.ObjectTypeDeterminer; +import org.apache.struts2.conversion.impl.XWorkConverter; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.ognl.OgnlUtil; +import org.apache.struts2.util.reflection.ReflectionContextState; import ognl.ListPropertyAccessor; import ognl.OgnlException; import ognl.PropertyAccessor; diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkMapPropertyAccessor.java b/core/src/main/java/org/apache/struts2/ognl/accessor/XWorkMapPropertyAccessor.java similarity index 94% rename from core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkMapPropertyAccessor.java rename to core/src/main/java/org/apache/struts2/ognl/accessor/XWorkMapPropertyAccessor.java index db8ec65491..6c1cf0419b 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkMapPropertyAccessor.java +++ b/core/src/main/java/org/apache/struts2/ognl/accessor/XWorkMapPropertyAccessor.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.ognl.accessor; +package org.apache.struts2.ognl.accessor; -import com.opensymphony.xwork2.ObjectFactory; -import com.opensymphony.xwork2.conversion.ObjectTypeDeterminer; -import com.opensymphony.xwork2.conversion.impl.XWorkConverter; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.reflection.ReflectionContextState; +import org.apache.struts2.ObjectFactory; +import org.apache.struts2.conversion.ObjectTypeDeterminer; +import org.apache.struts2.conversion.impl.XWorkConverter; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.reflection.ReflectionContextState; import ognl.MapPropertyAccessor; import ognl.OgnlException; import org.apache.logging.log4j.LogManager; diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkMethodAccessor.java b/core/src/main/java/org/apache/struts2/ognl/accessor/XWorkMethodAccessor.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkMethodAccessor.java rename to core/src/main/java/org/apache/struts2/ognl/accessor/XWorkMethodAccessor.java index f6e51d4fc1..70730c4cad 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkMethodAccessor.java +++ b/core/src/main/java/org/apache/struts2/ognl/accessor/XWorkMethodAccessor.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.ognl.accessor; +package org.apache.struts2.ognl.accessor; -import com.opensymphony.xwork2.util.reflection.ReflectionContextState; +import org.apache.struts2.util.reflection.ReflectionContextState; import ognl.MethodFailedException; import ognl.ObjectMethodAccessor; import ognl.OgnlContext; diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkObjectPropertyAccessor.java b/core/src/main/java/org/apache/struts2/ognl/accessor/XWorkObjectPropertyAccessor.java similarity index 89% rename from core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkObjectPropertyAccessor.java rename to core/src/main/java/org/apache/struts2/ognl/accessor/XWorkObjectPropertyAccessor.java index e719b1e4e6..0d364bf540 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkObjectPropertyAccessor.java +++ b/core/src/main/java/org/apache/struts2/ognl/accessor/XWorkObjectPropertyAccessor.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.ognl.accessor; +package org.apache.struts2.ognl.accessor; -import com.opensymphony.xwork2.conversion.impl.XWorkConverter; -import com.opensymphony.xwork2.util.reflection.ReflectionContextState; +import org.apache.struts2.conversion.impl.XWorkConverter; +import org.apache.struts2.util.reflection.ReflectionContextState; import ognl.ObjectPropertyAccessor; import ognl.OgnlException; diff --git a/core/src/main/java/com/opensymphony/xwork2/package.html b/core/src/main/java/org/apache/struts2/package.html similarity index 100% rename from core/src/main/java/com/opensymphony/xwork2/package.html rename to core/src/main/java/org/apache/struts2/package.html diff --git a/core/src/main/java/org/apache/struts2/result/HttpHeaderResult.java b/core/src/main/java/org/apache/struts2/result/HttpHeaderResult.java index 4251ec3dc6..4895bbc908 100644 --- a/core/src/main/java/org/apache/struts2/result/HttpHeaderResult.java +++ b/core/src/main/java/org/apache/struts2/result/HttpHeaderResult.java @@ -18,10 +18,10 @@ */ package org.apache.struts2.result; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.Result; -import com.opensymphony.xwork2.util.TextParseUtil; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.Result; +import org.apache.struts2.util.TextParseUtil; +import org.apache.struts2.util.ValueStack; import jakarta.servlet.http.HttpServletResponse; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/opensymphony/xwork2/result/ParamNameAwareResult.java b/core/src/main/java/org/apache/struts2/result/ParamNameAwareResult.java similarity index 88% rename from core/src/main/java/com/opensymphony/xwork2/result/ParamNameAwareResult.java rename to core/src/main/java/org/apache/struts2/result/ParamNameAwareResult.java index 0b80312d06..d3438e6dfa 100644 --- a/core/src/main/java/com/opensymphony/xwork2/result/ParamNameAwareResult.java +++ b/core/src/main/java/org/apache/struts2/result/ParamNameAwareResult.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.result; +package org.apache.struts2.result; /** - * Accept parameter name/value to be set on {@link com.opensymphony.xwork2.Result} + * Accept parameter name/value to be set on {@link org.apache.struts2.Result} */ public interface ParamNameAwareResult { diff --git a/core/src/main/java/org/apache/struts2/result/PlainResult.java b/core/src/main/java/org/apache/struts2/result/PlainResult.java index fba2cc2e7c..160e97ba83 100644 --- a/core/src/main/java/org/apache/struts2/result/PlainResult.java +++ b/core/src/main/java/org/apache/struts2/result/PlainResult.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.result; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.Result; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.Result; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; diff --git a/core/src/main/java/org/apache/struts2/result/PlainTextResult.java b/core/src/main/java/org/apache/struts2/result/PlainTextResult.java index d15d46bdf5..30d1500a55 100644 --- a/core/src/main/java/org/apache/struts2/result/PlainTextResult.java +++ b/core/src/main/java/org/apache/struts2/result/PlainTextResult.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.result; -import com.opensymphony.xwork2.ActionInvocation; +import org.apache.struts2.ActionInvocation; import jakarta.servlet.ServletContext; import jakarta.servlet.http.HttpServletResponse; import org.apache.logging.log4j.LogManager; @@ -92,9 +92,6 @@ public void setCharSet(String charSet) { this.charSet = charSet; } - /* (non-Javadoc) - * @see org.apache.struts2.result.StrutsResultSupport#doExecute(java.lang.String, com.opensymphony.xwork2.ActionInvocation) - */ protected void doExecute(String finalLocation, ActionInvocation invocation) throws Exception { // verify charset Charset charset = readCharset(); diff --git a/core/src/main/java/org/apache/struts2/result/PostbackResult.java b/core/src/main/java/org/apache/struts2/result/PostbackResult.java index 44f9abf383..f46f7c52c3 100644 --- a/core/src/main/java/org/apache/struts2/result/PostbackResult.java +++ b/core/src/main/java/org/apache/struts2/result/PostbackResult.java @@ -18,9 +18,9 @@ */ package org.apache.struts2.result; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.inject.Inject; +import org.apache.struts2.ActionContext; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.inject.Inject; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.dispatcher.mapper.ActionMapper; diff --git a/core/src/main/java/org/apache/struts2/result/ServletActionRedirectResult.java b/core/src/main/java/org/apache/struts2/result/ServletActionRedirectResult.java index e20ba8342d..5de96b1308 100644 --- a/core/src/main/java/org/apache/struts2/result/ServletActionRedirectResult.java +++ b/core/src/main/java/org/apache/struts2/result/ServletActionRedirectResult.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.result; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.util.reflection.ReflectionExceptionHandler; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.util.reflection.ReflectionExceptionHandler; import org.apache.struts2.dispatcher.mapper.ActionMapper; import org.apache.struts2.dispatcher.mapper.ActionMapping; @@ -156,7 +156,7 @@ public ServletActionRedirectResult(String namespace, String actionName, String m } /** - * @see com.opensymphony.xwork2.Result#execute(com.opensymphony.xwork2.ActionInvocation) + * @see org.apache.struts2.Result#execute(org.apache.struts2.ActionInvocation) */ public void execute(ActionInvocation invocation) throws Exception { if (invocation == null) { diff --git a/core/src/main/java/org/apache/struts2/result/ServletDispatcherResult.java b/core/src/main/java/org/apache/struts2/result/ServletDispatcherResult.java index df0896cf41..d50ebadf57 100644 --- a/core/src/main/java/org/apache/struts2/result/ServletDispatcherResult.java +++ b/core/src/main/java/org/apache/struts2/result/ServletDispatcherResult.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.result; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.inject.Inject; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.inject.Inject; import jakarta.servlet.RequestDispatcher; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/core/src/main/java/org/apache/struts2/result/ServletRedirectResult.java b/core/src/main/java/org/apache/struts2/result/ServletRedirectResult.java index cb050b8cde..7bc8ab616d 100644 --- a/core/src/main/java/org/apache/struts2/result/ServletRedirectResult.java +++ b/core/src/main/java/org/apache/struts2/result/ServletRedirectResult.java @@ -18,12 +18,12 @@ */ package org.apache.struts2.result; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.config.entities.ResultConfig; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.reflection.ReflectionException; -import com.opensymphony.xwork2.util.reflection.ReflectionExceptionHandler; +import org.apache.struts2.ActionContext; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.config.entities.ResultConfig; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.reflection.ReflectionException; +import org.apache.struts2.util.reflection.ReflectionExceptionHandler; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.logging.log4j.LogManager; diff --git a/core/src/main/java/org/apache/struts2/result/StreamResult.java b/core/src/main/java/org/apache/struts2/result/StreamResult.java index 3ee2b659e2..2a6611ec77 100644 --- a/core/src/main/java/org/apache/struts2/result/StreamResult.java +++ b/core/src/main/java/org/apache/struts2/result/StreamResult.java @@ -18,9 +18,9 @@ */ package org.apache.struts2.result; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.security.NotExcludedAcceptedPatternsChecker; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.security.NotExcludedAcceptedPatternsChecker; import jakarta.servlet.http.HttpServletResponse; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -207,7 +207,7 @@ public void setInputName(String inputName) { } /** - * @see StrutsResultSupport#doExecute(java.lang.String, com.opensymphony.xwork2.ActionInvocation) + * @see StrutsResultSupport#doExecute(java.lang.String, ActionInvocation) */ protected void doExecute(String finalLocation, ActionInvocation invocation) throws Exception { LOG.debug("Find the Response in context"); diff --git a/core/src/main/java/org/apache/struts2/result/StrutsResultSupport.java b/core/src/main/java/org/apache/struts2/result/StrutsResultSupport.java index d5307d2797..f37542877f 100644 --- a/core/src/main/java/org/apache/struts2/result/StrutsResultSupport.java +++ b/core/src/main/java/org/apache/struts2/result/StrutsResultSupport.java @@ -18,9 +18,9 @@ */ package org.apache.struts2.result; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.Result; -import com.opensymphony.xwork2.util.TextParseUtil; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.Result; +import org.apache.struts2.util.TextParseUtil; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.StrutsStatics; @@ -44,7 +44,7 @@ *
        *
      • location - the location to go to after execution (could be a jsp page or another action). * It can be parsed as per the rules definied in the - * {@link TextParseUtil#translateVariables(java.lang.String, com.opensymphony.xwork2.util.ValueStack) translateVariables} + * {@link TextParseUtil#translateVariables(java.lang.String, org.apache.struts2.util.ValueStack) translateVariables} * method
        • *
      • parse - true by default. If set to false, the location param will not be parsed for expressions
        • *
      • encode - false by default. If set to false, the location param will not be url encoded. This only have effect when parse is true
        • @@ -106,11 +106,11 @@ * * *

        - * Please see the {@link com.opensymphony.xwork2.Result} class for more info on Results in general. + * Please see the {@link org.apache.struts2.Result} class for more info on Results in general. *

        * * - * @see com.opensymphony.xwork2.Result + * @see org.apache.struts2.Result */ public abstract class StrutsResultSupport implements Result, StrutsStatics { @@ -154,7 +154,7 @@ public StrutsResultSupport(String location, boolean parse, boolean encode) { public void setLocation(String location) { this.location = location; } - + /** * Gets the location it was created with, mainly for testing * @@ -216,7 +216,7 @@ public void execute(ActionInvocation invocation) throws Exception { protected String conditionalParse(String param, ActionInvocation invocation) { if (parse && param != null && invocation != null) { return TextParseUtil.translateVariables( - param, + param, invocation.getStack(), new EncodingParsedValueEvaluator()); } else { @@ -228,7 +228,7 @@ protected String conditionalParse(String param, ActionInvocation invocation) { * As {@link #conditionalParse(String, ActionInvocation)} but does not * convert found object into String. If found object is a collection it is * returned if found object is not a collection it is wrapped in one. - * + * * @param param parameter * @param invocation action invocation * @param excludeEmptyElements 'true' for excluding empty elements @@ -237,7 +237,7 @@ protected String conditionalParse(String param, ActionInvocation invocation) { protected Collection conditionalParseCollection(String param, ActionInvocation invocation, boolean excludeEmptyElements) { if (parse && param != null && invocation != null) { return TextParseUtil.translateVariablesCollection( - param, + param, invocation.getStack(), excludeEmptyElements, new EncodingParsedValueEvaluator()); @@ -249,9 +249,9 @@ protected Collection conditionalParseCollection(String param, ActionInvo } /** - * {@link com.opensymphony.xwork2.util.TextParseUtil.ParsedValueEvaluator} to do URL encoding for found values. To be + * {@link org.apache.struts2.util.TextParseUtil.ParsedValueEvaluator} to do URL encoding for found values. To be * used for single strings or collections. - * + * */ private final class EncodingParsedValueEvaluator implements TextParseUtil.ParsedValueEvaluator { public Object evaluate(String parsedValue) { diff --git a/core/src/main/java/com/opensymphony/xwork2/security/AcceptedPatternsChecker.java b/core/src/main/java/org/apache/struts2/security/AcceptedPatternsChecker.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/security/AcceptedPatternsChecker.java rename to core/src/main/java/org/apache/struts2/security/AcceptedPatternsChecker.java index 4af56ff9e1..874c665570 100644 --- a/core/src/main/java/com/opensymphony/xwork2/security/AcceptedPatternsChecker.java +++ b/core/src/main/java/org/apache/struts2/security/AcceptedPatternsChecker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.security; +package org.apache.struts2.security; import java.util.Set; import java.util.regex.Pattern; diff --git a/core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java b/core/src/main/java/org/apache/struts2/security/DefaultAcceptedPatternsChecker.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java rename to core/src/main/java/org/apache/struts2/security/DefaultAcceptedPatternsChecker.java index 82cc4af877..f6e2ad4870 100644 --- a/core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java +++ b/core/src/main/java/org/apache/struts2/security/DefaultAcceptedPatternsChecker.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.security; +package org.apache.struts2.security; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.TextParseUtil; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.TextParseUtil; import org.apache.commons.lang3.BooleanUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java b/core/src/main/java/org/apache/struts2/security/DefaultExcludedPatternsChecker.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java rename to core/src/main/java/org/apache/struts2/security/DefaultExcludedPatternsChecker.java index cf425d67cb..824d98c58a 100644 --- a/core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java +++ b/core/src/main/java/org/apache/struts2/security/DefaultExcludedPatternsChecker.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.security; +package org.apache.struts2.security; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.TextParseUtil; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.TextParseUtil; import org.apache.commons.lang3.BooleanUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/opensymphony/xwork2/security/DefaultNotExcludedAcceptedPatternsChecker.java b/core/src/main/java/org/apache/struts2/security/DefaultNotExcludedAcceptedPatternsChecker.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/security/DefaultNotExcludedAcceptedPatternsChecker.java rename to core/src/main/java/org/apache/struts2/security/DefaultNotExcludedAcceptedPatternsChecker.java index b475da1d06..f9e48237fe 100644 --- a/core/src/main/java/com/opensymphony/xwork2/security/DefaultNotExcludedAcceptedPatternsChecker.java +++ b/core/src/main/java/org/apache/struts2/security/DefaultNotExcludedAcceptedPatternsChecker.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.security; +package org.apache.struts2.security; -import com.opensymphony.xwork2.inject.Inject; +import org.apache.struts2.inject.Inject; import java.util.Set; import java.util.regex.Pattern; diff --git a/core/src/main/java/com/opensymphony/xwork2/security/ExcludedPatternsChecker.java b/core/src/main/java/org/apache/struts2/security/ExcludedPatternsChecker.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/security/ExcludedPatternsChecker.java rename to core/src/main/java/org/apache/struts2/security/ExcludedPatternsChecker.java index 086c75d0b6..d44156c18a 100644 --- a/core/src/main/java/com/opensymphony/xwork2/security/ExcludedPatternsChecker.java +++ b/core/src/main/java/org/apache/struts2/security/ExcludedPatternsChecker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.security; +package org.apache.struts2.security; import java.util.Set; import java.util.regex.Pattern; diff --git a/core/src/main/java/com/opensymphony/xwork2/security/NotExcludedAcceptedPatternsChecker.java b/core/src/main/java/org/apache/struts2/security/NotExcludedAcceptedPatternsChecker.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/security/NotExcludedAcceptedPatternsChecker.java rename to core/src/main/java/org/apache/struts2/security/NotExcludedAcceptedPatternsChecker.java index 48cd22caea..e610484318 100644 --- a/core/src/main/java/com/opensymphony/xwork2/security/NotExcludedAcceptedPatternsChecker.java +++ b/core/src/main/java/org/apache/struts2/security/NotExcludedAcceptedPatternsChecker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.security; +package org.apache.struts2.security; /** * Used across different places to check if given string is not excluded and is accepted diff --git a/core/src/main/java/com/opensymphony/xwork2/test/StubConfigurationProvider.java b/core/src/main/java/org/apache/struts2/test/StubConfigurationProvider.java similarity index 82% rename from core/src/main/java/com/opensymphony/xwork2/test/StubConfigurationProvider.java rename to core/src/main/java/org/apache/struts2/test/StubConfigurationProvider.java index 73ef890dbe..47cd0c5b7c 100644 --- a/core/src/main/java/com/opensymphony/xwork2/test/StubConfigurationProvider.java +++ b/core/src/main/java/org/apache/struts2/test/StubConfigurationProvider.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.test; +package org.apache.struts2.test; -import com.opensymphony.xwork2.config.Configuration; -import com.opensymphony.xwork2.config.ConfigurationException; -import com.opensymphony.xwork2.config.ConfigurationProvider; -import com.opensymphony.xwork2.inject.ContainerBuilder; -import com.opensymphony.xwork2.util.location.LocatableProperties; +import org.apache.struts2.config.Configuration; +import org.apache.struts2.config.ConfigurationException; +import org.apache.struts2.config.ConfigurationProvider; +import org.apache.struts2.inject.ContainerBuilder; +import org.apache.struts2.util.location.LocatableProperties; public class StubConfigurationProvider implements ConfigurationProvider { diff --git a/core/src/main/java/org/apache/struts2/url/StrutsQueryStringBuilder.java b/core/src/main/java/org/apache/struts2/url/StrutsQueryStringBuilder.java index 72a0cb5207..8885ae1b9a 100644 --- a/core/src/main/java/org/apache/struts2/url/StrutsQueryStringBuilder.java +++ b/core/src/main/java/org/apache/struts2/url/StrutsQueryStringBuilder.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.url; -import com.opensymphony.xwork2.inject.Inject; +import org.apache.struts2.inject.Inject; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/org/apache/struts2/url/StrutsQueryStringParser.java b/core/src/main/java/org/apache/struts2/url/StrutsQueryStringParser.java index 792ddb0d56..9d697630af 100644 --- a/core/src/main/java/org/apache/struts2/url/StrutsQueryStringParser.java +++ b/core/src/main/java/org/apache/struts2/url/StrutsQueryStringParser.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.url; -import com.opensymphony.xwork2.inject.Inject; +import org.apache.struts2.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/org/apache/struts2/url/StrutsUrlDecoder.java b/core/src/main/java/org/apache/struts2/url/StrutsUrlDecoder.java index 656a2b85fa..384cd63a62 100644 --- a/core/src/main/java/org/apache/struts2/url/StrutsUrlDecoder.java +++ b/core/src/main/java/org/apache/struts2/url/StrutsUrlDecoder.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.url; -import com.opensymphony.xwork2.inject.Inject; +import org.apache.struts2.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/org/apache/struts2/url/StrutsUrlEncoder.java b/core/src/main/java/org/apache/struts2/url/StrutsUrlEncoder.java index 12b5a0104b..143daca627 100644 --- a/core/src/main/java/org/apache/struts2/url/StrutsUrlEncoder.java +++ b/core/src/main/java/org/apache/struts2/url/StrutsUrlEncoder.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.url; -import com.opensymphony.xwork2.inject.Inject; +import org.apache.struts2.inject.Inject; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/AbstractLocalizedTextProvider.java b/core/src/main/java/org/apache/struts2/util/AbstractLocalizedTextProvider.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/util/AbstractLocalizedTextProvider.java rename to core/src/main/java/org/apache/struts2/util/AbstractLocalizedTextProvider.java index 9eb978a049..316cbb99ed 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/AbstractLocalizedTextProvider.java +++ b/core/src/main/java/org/apache/struts2/util/AbstractLocalizedTextProvider.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util; +package org.apache.struts2.util; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.LocalizedTextProvider; -import com.opensymphony.xwork2.inject.Inject; +import org.apache.struts2.ActionContext; +import org.apache.struts2.LocalizedTextProvider; +import org.apache.struts2.inject.Inject; import org.apache.commons.lang3.ObjectUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -47,14 +47,14 @@ abstract class AbstractLocalizedTextProvider implements LocalizedTextProvider { private static final Logger LOG = LogManager.getLogger(AbstractLocalizedTextProvider.class); - public static final String XWORK_MESSAGES_BUNDLE = "com/opensymphony/xwork2/xwork-messages"; + public static final String XWORK_MESSAGES_BUNDLE = "org/apache/struts2/xwork-messages"; public static final String STRUTS_MESSAGES_BUNDLE = "org/apache/struts2/struts-messages"; private static final String TOMCAT_RESOURCE_ENTRIES_FIELD = "resourceEntries"; private static final String TOMCAT_PARALLEL_WEBAPP_CLASSLOADER = "org.apache.catalina.loader.ParallelWebappClassLoader"; private static final String TOMCAT_WEBAPP_CLASSLOADER = "org.apache.catalina.loader.WebappClassLoader"; private static final String TOMCAT_WEBAPP_CLASSLOADER_BASE = "org.apache.catalina.loader.WebappClassLoaderBase"; - private static final String RELOADED = "com.opensymphony.xwork2.util.LocalizedTextProvider.reloaded"; + private static final String RELOADED = "org.apache.struts2.util.LocalizedTextProvider.reloaded"; protected final ConcurrentMap bundlesMap = new ConcurrentHashMap<>(); protected boolean devMode = false; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/AnnotationUtils.java b/core/src/main/java/org/apache/struts2/util/AnnotationUtils.java similarity index 99% rename from core/src/main/java/com/opensymphony/xwork2/util/AnnotationUtils.java rename to core/src/main/java/org/apache/struts2/util/AnnotationUtils.java index 2ab1f91922..0c607f2549 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/AnnotationUtils.java +++ b/core/src/main/java/org/apache/struts2/util/AnnotationUtils.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util; +package org.apache.struts2.util; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ClassUtils; diff --git a/core/src/main/java/org/apache/struts2/util/AppendIteratorFilter.java b/core/src/main/java/org/apache/struts2/util/AppendIteratorFilter.java index c873d33986..8aea6c63e9 100644 --- a/core/src/main/java/org/apache/struts2/util/AppendIteratorFilter.java +++ b/core/src/main/java/org/apache/struts2/util/AppendIteratorFilter.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.util; -import com.opensymphony.xwork2.Action; +import org.apache.struts2.Action; import java.util.ArrayList; import java.util.Iterator; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/ClassLoaderUtil.java b/core/src/main/java/org/apache/struts2/util/ClassLoaderUtil.java similarity index 99% rename from core/src/main/java/com/opensymphony/xwork2/util/ClassLoaderUtil.java rename to core/src/main/java/org/apache/struts2/util/ClassLoaderUtil.java index b1d132fa68..f18b0b6db7 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/ClassLoaderUtil.java +++ b/core/src/main/java/org/apache/struts2/util/ClassLoaderUtil.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util; +package org.apache.struts2.util; import java.io.IOException; import java.io.InputStream; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/ClassPathFinder.java b/core/src/main/java/org/apache/struts2/util/ClassPathFinder.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/util/ClassPathFinder.java rename to core/src/main/java/org/apache/struts2/util/ClassPathFinder.java index 1b97bf517c..3b5228ab23 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/ClassPathFinder.java +++ b/core/src/main/java/org/apache/struts2/util/ClassPathFinder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util; +package org.apache.struts2.util; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -38,8 +38,8 @@ /** * This class is an utility class that will search through the classpath * for files whose names match the given pattern. The filename is tested - * using the given implementation of {@link com.opensymphony.xwork2.util.PatternMatcher} by default it - * uses {@link com.opensymphony.xwork2.util.WildcardHelper} + * using the given implementation of {@link PatternMatcher} by default it + * uses {@link WildcardHelper} */ public class ClassPathFinder { diff --git a/core/src/main/java/com/opensymphony/xwork2/util/ClearableValueStack.java b/core/src/main/java/org/apache/struts2/util/ClearableValueStack.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/util/ClearableValueStack.java rename to core/src/main/java/org/apache/struts2/util/ClearableValueStack.java index 7cb09ce13f..4cc13b8134 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/ClearableValueStack.java +++ b/core/src/main/java/org/apache/struts2/util/ClearableValueStack.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util; +package org.apache.struts2.util; /** * ValueStacks implementing this interface provide a way to remove values from diff --git a/core/src/main/java/com/opensymphony/xwork2/util/CompoundRoot.java b/core/src/main/java/org/apache/struts2/util/CompoundRoot.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/util/CompoundRoot.java rename to core/src/main/java/org/apache/struts2/util/CompoundRoot.java index dbfd71fce8..aba7ed3be2 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/CompoundRoot.java +++ b/core/src/main/java/org/apache/struts2/util/CompoundRoot.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util; +package org.apache.struts2.util; import java.io.Serial; import java.util.List; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/ConfigParseUtil.java b/core/src/main/java/org/apache/struts2/util/ConfigParseUtil.java similarity index 95% rename from core/src/main/java/com/opensymphony/xwork2/util/ConfigParseUtil.java rename to core/src/main/java/org/apache/struts2/util/ConfigParseUtil.java index 4617286a2d..d6cdafabf3 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/ConfigParseUtil.java +++ b/core/src/main/java/org/apache/struts2/util/ConfigParseUtil.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util; +package org.apache.struts2.util; -import com.opensymphony.xwork2.config.ConfigurationException; -import com.opensymphony.xwork2.ognl.OgnlUtil; +import org.apache.struts2.config.ConfigurationException; +import org.apache.struts2.ognl.OgnlUtil; import java.util.Collection; import java.util.HashSet; @@ -27,7 +27,7 @@ import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -import static com.opensymphony.xwork2.util.TextParseUtil.commaDelimitedStringToSet; +import static org.apache.struts2.util.TextParseUtil.commaDelimitedStringToSet; import static java.util.Collections.unmodifiableSet; import static java.util.stream.Collectors.toSet; import static org.apache.commons.lang3.StringUtils.strip; diff --git a/core/src/main/java/org/apache/struts2/util/ContentTypeMatcher.java b/core/src/main/java/org/apache/struts2/util/ContentTypeMatcher.java index 15c4362d79..49ed1e844e 100644 --- a/core/src/main/java/org/apache/struts2/util/ContentTypeMatcher.java +++ b/core/src/main/java/org/apache/struts2/util/ContentTypeMatcher.java @@ -21,7 +21,7 @@ import java.util.Map; /** - * Matches content type of uploaded files, similar to {@link com.opensymphony.xwork2.util.PatternMatcher} + * Matches content type of uploaded files, similar to {@link org.apache.struts2.util.PatternMatcher} * * @since 2.3.22 */ diff --git a/core/src/main/java/com/opensymphony/xwork2/util/CreateIfNull.java b/core/src/main/java/org/apache/struts2/util/CreateIfNull.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/util/CreateIfNull.java rename to core/src/main/java/org/apache/struts2/util/CreateIfNull.java index 9d7d06d723..1913b4e927 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/CreateIfNull.java +++ b/core/src/main/java/org/apache/struts2/util/CreateIfNull.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util; +package org.apache.struts2.util; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/DebugUtils.java b/core/src/main/java/org/apache/struts2/util/DebugUtils.java similarity index 92% rename from core/src/main/java/com/opensymphony/xwork2/util/DebugUtils.java rename to core/src/main/java/org/apache/struts2/util/DebugUtils.java index d0f35af051..099f701710 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/DebugUtils.java +++ b/core/src/main/java/org/apache/struts2/util/DebugUtils.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util; +package org.apache.struts2.util; -import com.opensymphony.xwork2.TextProvider; -import com.opensymphony.xwork2.interceptor.ValidationAware; +import org.apache.struts2.TextProvider; +import org.apache.struts2.interceptor.ValidationAware; import org.apache.logging.log4j.Logger; import java.util.Set; diff --git a/core/src/main/java/org/apache/struts2/util/DefaultContentTypeMatcher.java b/core/src/main/java/org/apache/struts2/util/DefaultContentTypeMatcher.java index 78e4e8b260..df2fedac9f 100644 --- a/core/src/main/java/org/apache/struts2/util/DefaultContentTypeMatcher.java +++ b/core/src/main/java/org/apache/struts2/util/DefaultContentTypeMatcher.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.util; -import com.opensymphony.xwork2.util.PatternMatcher; -import com.opensymphony.xwork2.util.WildcardHelper; +import org.apache.struts2.util.PatternMatcher; +import org.apache.struts2.util.WildcardHelper; import java.util.Map; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/DomHelper.java b/core/src/main/java/org/apache/struts2/util/DomHelper.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/util/DomHelper.java rename to core/src/main/java/org/apache/struts2/util/DomHelper.java index f2d809fae5..751da93c09 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/DomHelper.java +++ b/core/src/main/java/org/apache/struts2/util/DomHelper.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util; +package org.apache.struts2.util; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ObjectFactory; -import com.opensymphony.xwork2.util.location.Location; -import com.opensymphony.xwork2.util.location.LocationAttributes; +import org.apache.struts2.ActionContext; +import org.apache.struts2.ObjectFactory; +import org.apache.struts2.util.location.Location; +import org.apache.struts2.util.location.LocationAttributes; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.StrutsException; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/Element.java b/core/src/main/java/org/apache/struts2/util/Element.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/util/Element.java rename to core/src/main/java/org/apache/struts2/util/Element.java index 50fd3a9acc..80ef7cb68a 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/Element.java +++ b/core/src/main/java/org/apache/struts2/util/Element.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util; +package org.apache.struts2.util; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/Evaluated.java b/core/src/main/java/org/apache/struts2/util/Evaluated.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/util/Evaluated.java rename to core/src/main/java/org/apache/struts2/util/Evaluated.java index 8ecb657336..a8baaa8224 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/Evaluated.java +++ b/core/src/main/java/org/apache/struts2/util/Evaluated.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util; +package org.apache.struts2.util; public class Evaluated { diff --git a/core/src/main/java/com/opensymphony/xwork2/util/GlobalLocalizedTextProvider.java b/core/src/main/java/org/apache/struts2/util/GlobalLocalizedTextProvider.java similarity index 99% rename from core/src/main/java/com/opensymphony/xwork2/util/GlobalLocalizedTextProvider.java rename to core/src/main/java/org/apache/struts2/util/GlobalLocalizedTextProvider.java index d86682fd12..620aa29120 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/GlobalLocalizedTextProvider.java +++ b/core/src/main/java/org/apache/struts2/util/GlobalLocalizedTextProvider.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util; +package org.apache.struts2.util; -import com.opensymphony.xwork2.ActionContext; +import org.apache.struts2.ActionContext; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -27,7 +27,7 @@ /** * Provides support for localization in the framework, it can be used to read only default bundles. - * + * * Note that unlike {@link StrutsLocalizedTextProvider}, this class {@link GlobalLocalizedTextProvider} will * only search the default bundles for localized text. */ diff --git a/core/src/main/java/org/apache/struts2/util/InvocationSessionStore.java b/core/src/main/java/org/apache/struts2/util/InvocationSessionStore.java index 4a1c36fbfb..62dd9e185e 100644 --- a/core/src/main/java/org/apache/struts2/util/InvocationSessionStore.java +++ b/core/src/main/java/org/apache/struts2/util/InvocationSessionStore.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.util; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; +import org.apache.struts2.ActionContext; +import org.apache.struts2.ActionInvocation; import java.io.Serial; import java.io.Serializable; diff --git a/core/src/main/java/org/apache/struts2/util/IteratorGenerator.java b/core/src/main/java/org/apache/struts2/util/IteratorGenerator.java index 493980e64a..b193d6ad1b 100644 --- a/core/src/main/java/org/apache/struts2/util/IteratorGenerator.java +++ b/core/src/main/java/org/apache/struts2/util/IteratorGenerator.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.util; -import com.opensymphony.xwork2.Action; +import org.apache.struts2.Action; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/Key.java b/core/src/main/java/org/apache/struts2/util/Key.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/util/Key.java rename to core/src/main/java/org/apache/struts2/util/Key.java index 23559ea5f3..e704038494 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/Key.java +++ b/core/src/main/java/org/apache/struts2/util/Key.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util; +package org.apache.struts2.util; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/KeyProperty.java b/core/src/main/java/org/apache/struts2/util/KeyProperty.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/util/KeyProperty.java rename to core/src/main/java/org/apache/struts2/util/KeyProperty.java index 88fb006aed..62b24ee520 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/KeyProperty.java +++ b/core/src/main/java/org/apache/struts2/util/KeyProperty.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util; +package org.apache.struts2.util; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/MemberAccessValueStack.java b/core/src/main/java/org/apache/struts2/util/MemberAccessValueStack.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/util/MemberAccessValueStack.java rename to core/src/main/java/org/apache/struts2/util/MemberAccessValueStack.java index 95606b1d52..d1de8dc765 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/MemberAccessValueStack.java +++ b/core/src/main/java/org/apache/struts2/util/MemberAccessValueStack.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util; +package org.apache.struts2.util; import java.util.Set; import java.util.regex.Pattern; diff --git a/core/src/main/java/org/apache/struts2/util/MergeIteratorFilter.java b/core/src/main/java/org/apache/struts2/util/MergeIteratorFilter.java index 0d8ea28f43..0f00ec56b3 100644 --- a/core/src/main/java/org/apache/struts2/util/MergeIteratorFilter.java +++ b/core/src/main/java/org/apache/struts2/util/MergeIteratorFilter.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.util; -import com.opensymphony.xwork2.Action; +import org.apache.struts2.Action; import java.util.ArrayList; import java.util.Iterator; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/NamedVariablePatternMatcher.java b/core/src/main/java/org/apache/struts2/util/NamedVariablePatternMatcher.java similarity index 99% rename from core/src/main/java/com/opensymphony/xwork2/util/NamedVariablePatternMatcher.java rename to core/src/main/java/org/apache/struts2/util/NamedVariablePatternMatcher.java index 16ac9a2fbd..03a56ee3b7 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/NamedVariablePatternMatcher.java +++ b/core/src/main/java/org/apache/struts2/util/NamedVariablePatternMatcher.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util; +package org.apache.struts2.util; import org.apache.commons.lang3.StringUtils; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/OgnlTextParser.java b/core/src/main/java/org/apache/struts2/util/OgnlTextParser.java similarity index 99% rename from core/src/main/java/com/opensymphony/xwork2/util/OgnlTextParser.java rename to core/src/main/java/org/apache/struts2/util/OgnlTextParser.java index e4708cddb6..9d83dddfac 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/OgnlTextParser.java +++ b/core/src/main/java/org/apache/struts2/util/OgnlTextParser.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util; +package org.apache.struts2.util; import org.apache.commons.lang3.StringUtils; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/PatternMatcher.java b/core/src/main/java/org/apache/struts2/util/PatternMatcher.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/util/PatternMatcher.java rename to core/src/main/java/org/apache/struts2/util/PatternMatcher.java index e57a74b36f..788d40101f 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/PatternMatcher.java +++ b/core/src/main/java/org/apache/struts2/util/PatternMatcher.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util; +package org.apache.struts2.util; import java.util.Map; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/PropertiesReader.java b/core/src/main/java/org/apache/struts2/util/PropertiesReader.java similarity index 99% rename from core/src/main/java/com/opensymphony/xwork2/util/PropertiesReader.java rename to core/src/main/java/org/apache/struts2/util/PropertiesReader.java index bc1ef413f9..d135bea62e 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/PropertiesReader.java +++ b/core/src/main/java/org/apache/struts2/util/PropertiesReader.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util; +package org.apache.struts2.util; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/ProxyUtil.java b/core/src/main/java/org/apache/struts2/util/ProxyUtil.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/util/ProxyUtil.java rename to core/src/main/java/org/apache/struts2/util/ProxyUtil.java index 895cfb7eec..392bb9a0b2 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/ProxyUtil.java +++ b/core/src/main/java/org/apache/struts2/util/ProxyUtil.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util; +package org.apache.struts2.util; -import com.opensymphony.xwork2.ognl.DefaultOgnlCacheFactory; -import com.opensymphony.xwork2.ognl.OgnlCache; -import com.opensymphony.xwork2.ognl.OgnlCacheFactory; +import org.apache.struts2.ognl.DefaultOgnlCacheFactory; +import org.apache.struts2.ognl.OgnlCache; +import org.apache.struts2.ognl.OgnlCacheFactory; import org.apache.commons.lang3.reflect.ConstructorUtils; import org.apache.commons.lang3.reflect.FieldUtils; import org.apache.commons.lang3.reflect.MethodUtils; diff --git a/core/src/main/java/org/apache/struts2/util/RegexPatternMatcher.java b/core/src/main/java/org/apache/struts2/util/RegexPatternMatcher.java index cafb6dfca4..e1e9c2401b 100644 --- a/core/src/main/java/org/apache/struts2/util/RegexPatternMatcher.java +++ b/core/src/main/java/org/apache/struts2/util/RegexPatternMatcher.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.util; -import com.opensymphony.xwork2.util.PatternMatcher; +import org.apache.struts2.util.PatternMatcher; import org.apache.commons.lang3.StringUtils; import java.util.HashMap; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/ResolverUtil.java b/core/src/main/java/org/apache/struts2/util/ResolverUtil.java similarity index 99% rename from core/src/main/java/com/opensymphony/xwork2/util/ResolverUtil.java rename to core/src/main/java/org/apache/struts2/util/ResolverUtil.java index 3b7e3716f0..bfe98ff6f9 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/ResolverUtil.java +++ b/core/src/main/java/org/apache/struts2/util/ResolverUtil.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util; +package org.apache.struts2.util; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -48,7 +48,7 @@ * methods.

        * *

        General searches are initiated by calling the - * {@link #find(com.opensymphony.xwork2.util.ResolverUtil.Test, String...)} ()} method and supplying + * {@link #find(ResolverUtil.Test, String...)} ()} method and supplying * a package name and a Test instance. This will cause the named package and all sub-packages * to be scanned for classes that meet the test. There are also utility methods for the common * use cases of scanning multiple packages for extensions of particular classes, or classes diff --git a/core/src/main/java/org/apache/struts2/util/SortIteratorFilter.java b/core/src/main/java/org/apache/struts2/util/SortIteratorFilter.java index b072afc525..e126c5c0d2 100644 --- a/core/src/main/java/org/apache/struts2/util/SortIteratorFilter.java +++ b/core/src/main/java/org/apache/struts2/util/SortIteratorFilter.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.util; -import com.opensymphony.xwork2.Action; +import org.apache.struts2.Action; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/StrutsLocalizedTextProvider.java b/core/src/main/java/org/apache/struts2/util/StrutsLocalizedTextProvider.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/util/StrutsLocalizedTextProvider.java rename to core/src/main/java/org/apache/struts2/util/StrutsLocalizedTextProvider.java index abe407866c..ea37726b91 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/StrutsLocalizedTextProvider.java +++ b/core/src/main/java/org/apache/struts2/util/StrutsLocalizedTextProvider.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util; - -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.ModelDriven; -import com.opensymphony.xwork2.conversion.impl.XWorkConverter; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.reflection.ReflectionProvider; +package org.apache.struts2.util; + +import org.apache.struts2.ActionContext; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.ModelDriven; +import org.apache.struts2.conversion.impl.XWorkConverter; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.reflection.ReflectionProvider; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java b/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java index 582dabff7c..6ee1469fe1 100644 --- a/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java +++ b/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java @@ -18,10 +18,10 @@ */ package org.apache.struts2.util; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.inject.Container; -import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.ValueStackFactory; +import org.apache.struts2.ActionContext; +import org.apache.struts2.inject.Container; +import org.apache.struts2.util.ValueStack; +import org.apache.struts2.util.ValueStackFactory; import jakarta.servlet.ServletContext; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/core/src/main/java/org/apache/struts2/util/StrutsTypeConverter.java b/core/src/main/java/org/apache/struts2/util/StrutsTypeConverter.java index 655eeab0e0..9ea59814b9 100644 --- a/core/src/main/java/org/apache/struts2/util/StrutsTypeConverter.java +++ b/core/src/main/java/org/apache/struts2/util/StrutsTypeConverter.java @@ -20,7 +20,7 @@ import java.util.Map; -import com.opensymphony.xwork2.conversion.impl.DefaultTypeConverter; +import org.apache.struts2.conversion.impl.DefaultTypeConverter; /** * diff --git a/core/src/main/java/org/apache/struts2/util/StrutsUtil.java b/core/src/main/java/org/apache/struts2/util/StrutsUtil.java index 234c492de8..532220582b 100644 --- a/core/src/main/java/org/apache/struts2/util/StrutsUtil.java +++ b/core/src/main/java/org/apache/struts2/util/StrutsUtil.java @@ -18,10 +18,10 @@ */ package org.apache.struts2.util; -import com.opensymphony.xwork2.ObjectFactory; -import com.opensymphony.xwork2.util.ClassLoaderUtil; -import com.opensymphony.xwork2.util.TextParseUtil; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.ObjectFactory; +import org.apache.struts2.util.ClassLoaderUtil; +import org.apache.struts2.util.TextParseUtil; +import org.apache.struts2.util.ValueStack; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.StrutsException; diff --git a/core/src/main/java/org/apache/struts2/util/SubsetIteratorFilter.java b/core/src/main/java/org/apache/struts2/util/SubsetIteratorFilter.java index 6745a625d2..41564409ea 100644 --- a/core/src/main/java/org/apache/struts2/util/SubsetIteratorFilter.java +++ b/core/src/main/java/org/apache/struts2/util/SubsetIteratorFilter.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.util; -import com.opensymphony.xwork2.Action; +import org.apache.struts2.Action; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/TextParseUtil.java b/core/src/main/java/org/apache/struts2/util/TextParseUtil.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/util/TextParseUtil.java rename to core/src/main/java/org/apache/struts2/util/TextParseUtil.java index ebe940e3f0..d332b14328 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/TextParseUtil.java +++ b/core/src/main/java/org/apache/struts2/util/TextParseUtil.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util; +package org.apache.struts2.util; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.conversion.impl.XWorkConverter; +import org.apache.struts2.ActionContext; +import org.apache.struts2.conversion.impl.XWorkConverter; import java.util.ArrayList; import java.util.Arrays; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/TextParser.java b/core/src/main/java/org/apache/struts2/util/TextParser.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/util/TextParser.java rename to core/src/main/java/org/apache/struts2/util/TextParser.java index 767b67d577..7221fb4046 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/TextParser.java +++ b/core/src/main/java/org/apache/struts2/util/TextParser.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util; +package org.apache.struts2.util; /** * Used to parse expressions like ${foo.bar} or %{bar.foo} but it is up tp the TextParser's diff --git a/core/src/main/java/org/apache/struts2/util/TextProviderHelper.java b/core/src/main/java/org/apache/struts2/util/TextProviderHelper.java index d7ad706817..7cda5d490c 100644 --- a/core/src/main/java/org/apache/struts2/util/TextProviderHelper.java +++ b/core/src/main/java/org/apache/struts2/util/TextProviderHelper.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.util; -import com.opensymphony.xwork2.TextProvider; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.TextProvider; +import org.apache.struts2.util.ValueStack; import org.apache.commons.text.StringEscapeUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/org/apache/struts2/util/TokenHelper.java b/core/src/main/java/org/apache/struts2/util/TokenHelper.java index c03a135141..985ad6580a 100644 --- a/core/src/main/java/org/apache/struts2/util/TokenHelper.java +++ b/core/src/main/java/org/apache/struts2/util/TokenHelper.java @@ -18,8 +18,8 @@ */ package org.apache.struts2.util; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.LocalizedTextProvider; +import org.apache.struts2.ActionContext; +import org.apache.struts2.LocalizedTextProvider; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.dispatcher.Parameter; diff --git a/core/src/main/java/org/apache/struts2/util/URLBean.java b/core/src/main/java/org/apache/struts2/util/URLBean.java index 7b0c21d76e..6802048070 100644 --- a/core/src/main/java/org/apache/struts2/util/URLBean.java +++ b/core/src/main/java/org/apache/struts2/util/URLBean.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.util; -import com.opensymphony.xwork2.ActionContext; +import org.apache.struts2.ActionContext; import org.apache.struts2.views.util.DefaultUrlHelper; import org.apache.struts2.views.util.UrlHelper; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/ValueStack.java b/core/src/main/java/org/apache/struts2/util/ValueStack.java similarity index 95% rename from core/src/main/java/com/opensymphony/xwork2/util/ValueStack.java rename to core/src/main/java/org/apache/struts2/util/ValueStack.java index 4d02b235fe..acdb38cb2b 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/ValueStack.java +++ b/core/src/main/java/org/apache/struts2/util/ValueStack.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util; +package org.apache.struts2.util; -import com.opensymphony.xwork2.ActionContext; +import org.apache.struts2.ActionContext; import java.util.Map; @@ -30,9 +30,9 @@ */ public interface ValueStack { - String VALUE_STACK = "com.opensymphony.xwork2.util.ValueStack.ValueStack"; + String VALUE_STACK = "org.apache.struts2.util.ValueStack.ValueStack"; - String REPORT_ERRORS_ON_NO_PROP = "com.opensymphony.xwork2.util.ValueStack.ReportErrorsOnNoProp"; + String REPORT_ERRORS_ON_NO_PROP = "org.apache.struts2.util.ValueStack.ReportErrorsOnNoProp"; /** * Gets the context for this value stack. The context holds all the information in the value stack and it's surroundings. diff --git a/core/src/main/java/com/opensymphony/xwork2/util/ValueStackFactory.java b/core/src/main/java/org/apache/struts2/util/ValueStackFactory.java similarity index 76% rename from core/src/main/java/com/opensymphony/xwork2/util/ValueStackFactory.java rename to core/src/main/java/org/apache/struts2/util/ValueStackFactory.java index 788c904534..6837007953 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/ValueStackFactory.java +++ b/core/src/main/java/org/apache/struts2/util/ValueStackFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util; +package org.apache.struts2.util; /** * Factory that creates a value stack, defaulting to the OgnlValueStackFactory @@ -24,18 +24,18 @@ public interface ValueStackFactory { /** - * Get a new instance of {@link com.opensymphony.xwork2.util.ValueStack} + * Get a new instance of {@link org.apache.struts2.util.ValueStack} * - * @return a new {@link com.opensymphony.xwork2.util.ValueStack}. + * @return a new {@link org.apache.struts2.util.ValueStack}. */ ValueStack createValueStack(); - + /** - * Get a new instance of {@link com.opensymphony.xwork2.util.ValueStack} + * Get a new instance of {@link org.apache.struts2.util.ValueStack} * * @param stack an existing stack to include. - * @return a new {@link com.opensymphony.xwork2.util.ValueStack}. + * @return a new {@link org.apache.struts2.util.ValueStack}. */ ValueStack createValueStack(ValueStack stack); - + } diff --git a/core/src/main/java/org/apache/struts2/util/ValueStackProvider.java b/core/src/main/java/org/apache/struts2/util/ValueStackProvider.java index 2a6d1bf0af..b43a0ad992 100644 --- a/core/src/main/java/org/apache/struts2/util/ValueStackProvider.java +++ b/core/src/main/java/org/apache/struts2/util/ValueStackProvider.java @@ -18,7 +18,7 @@ */ package org.apache.struts2.util; -import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.util.ValueStack; /** * @since 6.4.0 diff --git a/core/src/main/java/com/opensymphony/xwork2/util/WildcardHelper.java b/core/src/main/java/org/apache/struts2/util/WildcardHelper.java similarity index 99% rename from core/src/main/java/com/opensymphony/xwork2/util/WildcardHelper.java rename to core/src/main/java/org/apache/struts2/util/WildcardHelper.java index 8a61c63e97..aeffc47274 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/WildcardHelper.java +++ b/core/src/main/java/org/apache/struts2/util/WildcardHelper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util; +package org.apache.struts2.util; import java.util.Map; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/WildcardUtil.java b/core/src/main/java/org/apache/struts2/util/WildcardUtil.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/util/WildcardUtil.java rename to core/src/main/java/org/apache/struts2/util/WildcardUtil.java index 77d4880f9d..ad4fe7c49b 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/WildcardUtil.java +++ b/core/src/main/java/org/apache/struts2/util/WildcardUtil.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util; +package org.apache.struts2.util; import java.util.regex.Pattern; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/XWorkTestCaseHelper.java b/core/src/main/java/org/apache/struts2/util/XWorkTestCaseHelper.java similarity index 87% rename from core/src/main/java/com/opensymphony/xwork2/util/XWorkTestCaseHelper.java rename to core/src/main/java/org/apache/struts2/util/XWorkTestCaseHelper.java index e139f05356..0d2c390019 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/XWorkTestCaseHelper.java +++ b/core/src/main/java/org/apache/struts2/util/XWorkTestCaseHelper.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util; +package org.apache.struts2.util; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.config.*; -import com.opensymphony.xwork2.config.providers.StrutsDefaultConfigurationProvider; -import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider; -import com.opensymphony.xwork2.inject.Container; -import com.opensymphony.xwork2.inject.ContainerBuilder; -import com.opensymphony.xwork2.util.location.LocatableProperties; +import org.apache.struts2.ActionContext; +import org.apache.struts2.config.*; +import org.apache.struts2.config.providers.StrutsDefaultConfigurationProvider; +import org.apache.struts2.config.providers.XmlConfigurationProvider; +import org.apache.struts2.inject.Container; +import org.apache.struts2.inject.ContainerBuilder; +import org.apache.struts2.util.location.LocatableProperties; /** - * Generic test setup methods to be used with any unit testing framework. + * Generic test setup methods to be used with any unit testing framework. */ public class XWorkTestCaseHelper { @@ -36,7 +36,7 @@ public static ConfigurationManager setUp() throws Exception { configurationManager.addContainerProvider(new StrutsDefaultConfigurationProvider()); Configuration config = configurationManager.getConfiguration(); Container container = config.getContainer(); - + // Reset the value stack ValueStack stack = container.getInstance(ValueStackFactory.class).createValueStack(); stack.getActionContext().withContainer(container).withValueStack(stack).bind(); @@ -60,7 +60,7 @@ public void init(Configuration configuration) throws ConfigurationException {} public void register(ContainerBuilder builder, LocatableProperties props) throws ConfigurationException { builder.setAllowDuplicates(true); } - + }); configurationManager.addContainerProvider(new StrutsDefaultConfigurationProvider()); for (ConfigurationProvider prov : providers) { @@ -70,7 +70,7 @@ public void register(ContainerBuilder builder, LocatableProperties props) throws configurationManager.addContainerProvider(prov); } Container container = configurationManager.getConfiguration().getContainer(); - + // Reset the value stack ValueStack stack = container.getInstance(ValueStackFactory.class).createValueStack(); stack.getActionContext().withContainer(container).withValueStack(stack).bind(); diff --git a/core/src/main/java/com/opensymphony/xwork2/util/classloader/AbstractResourceStore.java b/core/src/main/java/org/apache/struts2/util/classloader/AbstractResourceStore.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/util/classloader/AbstractResourceStore.java rename to core/src/main/java/org/apache/struts2/util/classloader/AbstractResourceStore.java index 5fcdafd485..2415da361c 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/classloader/AbstractResourceStore.java +++ b/core/src/main/java/org/apache/struts2/util/classloader/AbstractResourceStore.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util.classloader; +package org.apache.struts2.util.classloader; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/classloader/FileResourceStore.java b/core/src/main/java/org/apache/struts2/util/classloader/FileResourceStore.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/util/classloader/FileResourceStore.java rename to core/src/main/java/org/apache/struts2/util/classloader/FileResourceStore.java index 204ee54261..0fbb75182f 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/classloader/FileResourceStore.java +++ b/core/src/main/java/org/apache/struts2/util/classloader/FileResourceStore.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util.classloader; +package org.apache.struts2.util.classloader; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/classloader/JarResourceStore.java b/core/src/main/java/org/apache/struts2/util/classloader/JarResourceStore.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/util/classloader/JarResourceStore.java rename to core/src/main/java/org/apache/struts2/util/classloader/JarResourceStore.java index fee136fad8..3b5c0c8f86 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/classloader/JarResourceStore.java +++ b/core/src/main/java/org/apache/struts2/util/classloader/JarResourceStore.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util.classloader; +package org.apache.struts2.util.classloader; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/classloader/ReloadingClassLoader.java b/core/src/main/java/org/apache/struts2/util/classloader/ReloadingClassLoader.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/util/classloader/ReloadingClassLoader.java rename to core/src/main/java/org/apache/struts2/util/classloader/ReloadingClassLoader.java index 14003ed4af..da75b88a55 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/classloader/ReloadingClassLoader.java +++ b/core/src/main/java/org/apache/struts2/util/classloader/ReloadingClassLoader.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util.classloader; +package org.apache.struts2.util.classloader; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.FileManager; -import com.opensymphony.xwork2.FileManagerFactory; +import org.apache.struts2.ActionContext; +import org.apache.struts2.FileManager; +import org.apache.struts2.FileManagerFactory; import org.apache.commons.lang3.ObjectUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/classloader/ResourceStore.java b/core/src/main/java/org/apache/struts2/util/classloader/ResourceStore.java similarity index 95% rename from core/src/main/java/com/opensymphony/xwork2/util/classloader/ResourceStore.java rename to core/src/main/java/org/apache/struts2/util/classloader/ResourceStore.java index c415b098db..d8035ee8be 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/classloader/ResourceStore.java +++ b/core/src/main/java/org/apache/struts2/util/classloader/ResourceStore.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util.classloader; +package org.apache.struts2.util.classloader; /** * *interface taken from Apache JCI diff --git a/core/src/main/java/com/opensymphony/xwork2/util/classloader/ResourceStoreClassLoader.java b/core/src/main/java/org/apache/struts2/util/classloader/ResourceStoreClassLoader.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/util/classloader/ResourceStoreClassLoader.java rename to core/src/main/java/org/apache/struts2/util/classloader/ResourceStoreClassLoader.java index 8a9301eed2..afe8146888 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/classloader/ResourceStoreClassLoader.java +++ b/core/src/main/java/org/apache/struts2/util/classloader/ResourceStoreClassLoader.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util.classloader; +package org.apache.struts2.util.classloader; /** * class taken from Apache JCI diff --git a/core/src/main/java/com/opensymphony/xwork2/util/finder/ClassFinder.java b/core/src/main/java/org/apache/struts2/util/finder/ClassFinder.java similarity index 99% rename from core/src/main/java/com/opensymphony/xwork2/util/finder/ClassFinder.java rename to core/src/main/java/org/apache/struts2/util/finder/ClassFinder.java index 92e2136557..3d43996903 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/finder/ClassFinder.java +++ b/core/src/main/java/org/apache/struts2/util/finder/ClassFinder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util.finder; +package org.apache.struts2.util.finder; import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/finder/ClassFinderFactory.java b/core/src/main/java/org/apache/struts2/util/finder/ClassFinderFactory.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/util/finder/ClassFinderFactory.java rename to core/src/main/java/org/apache/struts2/util/finder/ClassFinderFactory.java index ed71d9c7a4..b0658c34ec 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/finder/ClassFinderFactory.java +++ b/core/src/main/java/org/apache/struts2/util/finder/ClassFinderFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util.finder; +package org.apache.struts2.util.finder; import java.net.URL; import java.util.Collection; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/finder/ClassLoaderInterface.java b/core/src/main/java/org/apache/struts2/util/finder/ClassLoaderInterface.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/util/finder/ClassLoaderInterface.java rename to core/src/main/java/org/apache/struts2/util/finder/ClassLoaderInterface.java index b213e389b5..2d60676e28 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/finder/ClassLoaderInterface.java +++ b/core/src/main/java/org/apache/struts2/util/finder/ClassLoaderInterface.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util.finder; +package org.apache.struts2.util.finder; import java.io.IOException; import java.io.InputStream; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/finder/ClassLoaderInterfaceDelegate.java b/core/src/main/java/org/apache/struts2/util/finder/ClassLoaderInterfaceDelegate.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/util/finder/ClassLoaderInterfaceDelegate.java rename to core/src/main/java/org/apache/struts2/util/finder/ClassLoaderInterfaceDelegate.java index 74ab894f31..50283593f2 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/finder/ClassLoaderInterfaceDelegate.java +++ b/core/src/main/java/org/apache/struts2/util/finder/ClassLoaderInterfaceDelegate.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util.finder; +package org.apache.struts2.util.finder; import java.io.IOException; import java.io.InputStream; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/finder/ResourceFinder.java b/core/src/main/java/org/apache/struts2/util/finder/ResourceFinder.java similarity index 99% rename from core/src/main/java/com/opensymphony/xwork2/util/finder/ResourceFinder.java rename to core/src/main/java/org/apache/struts2/util/finder/ResourceFinder.java index a950f7411c..a7f9a0ab00 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/finder/ResourceFinder.java +++ b/core/src/main/java/org/apache/struts2/util/finder/ResourceFinder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util.finder; +package org.apache.struts2.util.finder; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/finder/Test.java b/core/src/main/java/org/apache/struts2/util/finder/Test.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/util/finder/Test.java rename to core/src/main/java/org/apache/struts2/util/finder/Test.java index 70476f97a6..51b828afb9 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/finder/Test.java +++ b/core/src/main/java/org/apache/struts2/util/finder/Test.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util.finder; +package org.apache.struts2.util.finder; /** * This is the testing interface that is used to accept or reject resources. diff --git a/core/src/main/java/com/opensymphony/xwork2/util/finder/UrlSet.java b/core/src/main/java/org/apache/struts2/util/finder/UrlSet.java similarity index 99% rename from core/src/main/java/com/opensymphony/xwork2/util/finder/UrlSet.java rename to core/src/main/java/org/apache/struts2/util/finder/UrlSet.java index 9d32415e77..16a8f7ef34 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/finder/UrlSet.java +++ b/core/src/main/java/org/apache/struts2/util/finder/UrlSet.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util.finder; +package org.apache.struts2.util.finder; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManager.java b/core/src/main/java/org/apache/struts2/util/fs/DefaultFileManager.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManager.java rename to core/src/main/java/org/apache/struts2/util/fs/DefaultFileManager.java index 0cc42cbeaf..82bf06348a 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManager.java +++ b/core/src/main/java/org/apache/struts2/util/fs/DefaultFileManager.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util.fs; +package org.apache.struts2.util.fs; -import com.opensymphony.xwork2.FileManager; +import org.apache.struts2.FileManager; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactory.java b/core/src/main/java/org/apache/struts2/util/fs/DefaultFileManagerFactory.java similarity index 94% rename from core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactory.java rename to core/src/main/java/org/apache/struts2/util/fs/DefaultFileManagerFactory.java index d5cf1b06c2..1b3b8cd7b5 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactory.java +++ b/core/src/main/java/org/apache/struts2/util/fs/DefaultFileManagerFactory.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util.fs; +package org.apache.struts2.util.fs; -import com.opensymphony.xwork2.FileManager; -import com.opensymphony.xwork2.FileManagerFactory; -import com.opensymphony.xwork2.inject.Container; -import com.opensymphony.xwork2.inject.Inject; +import org.apache.struts2.FileManager; +import org.apache.struts2.FileManagerFactory; +import org.apache.struts2.inject.Container; +import org.apache.struts2.inject.Inject; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.StrutsConstants; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/fs/FileRevision.java b/core/src/main/java/org/apache/struts2/util/fs/FileRevision.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/util/fs/FileRevision.java rename to core/src/main/java/org/apache/struts2/util/fs/FileRevision.java index 0c93724e9d..c20394c8f9 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/fs/FileRevision.java +++ b/core/src/main/java/org/apache/struts2/util/fs/FileRevision.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util.fs; +package org.apache.struts2.util.fs; import java.io.File; import java.net.URISyntaxException; diff --git a/core/src/main/java/org/apache/struts2/util/fs/JBossFileManager.java b/core/src/main/java/org/apache/struts2/util/fs/JBossFileManager.java index b8e4b1f6d0..365dd6988f 100644 --- a/core/src/main/java/org/apache/struts2/util/fs/JBossFileManager.java +++ b/core/src/main/java/org/apache/struts2/util/fs/JBossFileManager.java @@ -18,10 +18,6 @@ */ package org.apache.struts2.util.fs; -import com.opensymphony.xwork2.util.fs.DefaultFileManager; -import com.opensymphony.xwork2.util.fs.FileRevision; -import com.opensymphony.xwork2.util.fs.JarEntryRevision; -import com.opensymphony.xwork2.util.fs.Revision; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/fs/JarEntryRevision.java b/core/src/main/java/org/apache/struts2/util/fs/JarEntryRevision.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/util/fs/JarEntryRevision.java rename to core/src/main/java/org/apache/struts2/util/fs/JarEntryRevision.java index 130068ec57..f8953c01af 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/fs/JarEntryRevision.java +++ b/core/src/main/java/org/apache/struts2/util/fs/JarEntryRevision.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util.fs; +package org.apache.struts2.util.fs; -import com.opensymphony.xwork2.FileManager; +import org.apache.struts2.FileManager; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/fs/Revision.java b/core/src/main/java/org/apache/struts2/util/fs/Revision.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/util/fs/Revision.java rename to core/src/main/java/org/apache/struts2/util/fs/Revision.java index 95d579402d..becb71e7a9 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/fs/Revision.java +++ b/core/src/main/java/org/apache/struts2/util/fs/Revision.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util.fs; +package org.apache.struts2.util.fs; import java.net.URL; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/fs/StrutsJarURLConnection.java b/core/src/main/java/org/apache/struts2/util/fs/StrutsJarURLConnection.java similarity index 99% rename from core/src/main/java/com/opensymphony/xwork2/util/fs/StrutsJarURLConnection.java rename to core/src/main/java/org/apache/struts2/util/fs/StrutsJarURLConnection.java index 52ad48b05d..a98944086b 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/fs/StrutsJarURLConnection.java +++ b/core/src/main/java/org/apache/struts2/util/fs/StrutsJarURLConnection.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util.fs; +package org.apache.struts2.util.fs; import java.io.IOException; import java.io.InputStream; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/location/Locatable.java b/core/src/main/java/org/apache/struts2/util/location/Locatable.java similarity index 95% rename from core/src/main/java/com/opensymphony/xwork2/util/location/Locatable.java rename to core/src/main/java/org/apache/struts2/util/location/Locatable.java index 8d08b11a7a..ec088a4fdb 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/location/Locatable.java +++ b/core/src/main/java/org/apache/struts2/util/location/Locatable.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util.location; +package org.apache.struts2.util.location; /** * A interface that should be implemented by objects knowning their location (i.e. where they diff --git a/core/src/main/java/com/opensymphony/xwork2/util/location/LocatableProperties.java b/core/src/main/java/org/apache/struts2/util/location/LocatableProperties.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/util/location/LocatableProperties.java rename to core/src/main/java/org/apache/struts2/util/location/LocatableProperties.java index 008451fa7b..4b9ea22a38 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/location/LocatableProperties.java +++ b/core/src/main/java/org/apache/struts2/util/location/LocatableProperties.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util.location; +package org.apache.struts2.util.location; -import com.opensymphony.xwork2.util.PropertiesReader; +import org.apache.struts2.util.PropertiesReader; import java.io.IOException; import java.io.InputStream; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/location/Located.java b/core/src/main/java/org/apache/struts2/util/location/Located.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/util/location/Located.java rename to core/src/main/java/org/apache/struts2/util/location/Located.java index 8e268f71e0..4c4f125054 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/location/Located.java +++ b/core/src/main/java/org/apache/struts2/util/location/Located.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util.location; +package org.apache.struts2.util.location; /** * Base class for location aware objects diff --git a/core/src/main/java/com/opensymphony/xwork2/util/location/Location.java b/core/src/main/java/org/apache/struts2/util/location/Location.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/util/location/Location.java rename to core/src/main/java/org/apache/struts2/util/location/Location.java index 84f100f36f..131cab1a68 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/location/Location.java +++ b/core/src/main/java/org/apache/struts2/util/location/Location.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util.location; +package org.apache.struts2.util.location; import java.util.List; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/location/LocationAttributes.java b/core/src/main/java/org/apache/struts2/util/location/LocationAttributes.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/util/location/LocationAttributes.java rename to core/src/main/java/org/apache/struts2/util/location/LocationAttributes.java index 3bceb97368..2ef4a65b7c 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/location/LocationAttributes.java +++ b/core/src/main/java/org/apache/struts2/util/location/LocationAttributes.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util.location; +package org.apache.struts2.util.location; import org.w3c.dom.Attr; import org.w3c.dom.Element; @@ -31,7 +31,7 @@ /** *

        * A class to handle location information stored in attributes. - * These attributes are typically setup using {@link com.opensymphony.xwork2.util.location.LocationAttributes.Pipe} + * These attributes are typically setup using {@link org.apache.struts2.util.location.LocationAttributes.Pipe} * which augments the SAX stream with additional attributes, e.g.: *

        * @@ -42,8 +42,8 @@ * <foo loc:src="file://path/to/file.xml" loc:line="2" loc:column="3"/> * </root> * - * - * @see com.opensymphony.xwork2.util.location.LocationAttributes.Pipe + * + * @see org.apache.struts2.util.location.LocationAttributes.Pipe * @since 2.1.8 */ public class LocationAttributes { @@ -65,15 +65,15 @@ public class LocationAttributes { public static final String Q_LINE_ATTR = "loc:line"; /** Attribute qualified name for the column number */ public static final String Q_COL_ATTR = "loc:column"; - + // Private constructor, we only have static methods private LocationAttributes() { // Nothing } - + /** * Add location attributes to a set of SAX attributes. - * + * * @param locator the Locator (can be null) * @param attrs the Attributes where locator information should be added * @return Location enabled Attributes. @@ -83,7 +83,7 @@ public static Attributes addLocationAttributes(Locator locator, Attributes attrs // No location information known, or already has it return attrs; } - + // Get an AttributeImpl so that we can add new attributes. AttributesImpl newAttrs = attrs instanceof AttributesImpl ? (AttributesImpl)attrs : new AttributesImpl(attrs); @@ -91,13 +91,13 @@ public static Attributes addLocationAttributes(Locator locator, Attributes attrs newAttrs.addAttribute(URI, SRC_ATTR, Q_SRC_ATTR, "CDATA", locator.getSystemId()); newAttrs.addAttribute(URI, LINE_ATTR, Q_LINE_ATTR, "CDATA", Integer.toString(locator.getLineNumber())); newAttrs.addAttribute(URI, COL_ATTR, Q_COL_ATTR, "CDATA", Integer.toString(locator.getColumnNumber())); - + return newAttrs; } - + /** * Returns the {@link Location} of an element (SAX flavor). - * + * * @param attrs the element's attributes that hold the location information * @param description a description for the location (can be null) * @return a {@link Location} object @@ -107,7 +107,7 @@ public static Location getLocation(Attributes attrs, String description) { if (src == null) { return Location.UNKNOWN; } - + return new LocationImpl(description, src, getLine(attrs), getColumn(attrs)); } @@ -115,7 +115,7 @@ public static Location getLocation(Attributes attrs, String description) { * Returns the location of an element (SAX flavor). If the location is to be kept * into an object built from this element, consider using {@link #getLocation(Attributes, String)} * and the {@link Locatable} interface. - * + * * @param attrs the element's attributes that hold the location information * @return a location string as defined by {@link Location}. */ @@ -124,13 +124,13 @@ public static String getLocationString(Attributes attrs) { if (src == null) { return LocationUtils.UNKNOWN_STRING; } - + return src + ":" + attrs.getValue(URI, LINE_ATTR) + ":" + attrs.getValue(URI, COL_ATTR); } - + /** * Returns the URI of an element (SAX flavor) - * + * * @param attrs the element's attributes that hold the location information * @return the element's URI or "[unknown location]" if attrs * has no location information. @@ -139,10 +139,10 @@ public static String getURI(Attributes attrs) { String src = attrs.getValue(URI, SRC_ATTR); return src != null ? src : LocationUtils.UNKNOWN_STRING; } - + /** * Returns the line number of an element (SAX flavor) - * + * * @param attrs the element's attributes that hold the location information * @return the element's line number or -1 if attrs * has no location information. @@ -151,10 +151,10 @@ public static int getLine(Attributes attrs) { String line = attrs.getValue(URI, LINE_ATTR); return line != null ? Integer.parseInt(line) : -1; } - + /** * Returns the column number of an element (SAX flavor) - * + * * @param attrs the element's attributes that hold the location information * @return the element's column number or -1 if attrs * has no location information. @@ -163,10 +163,10 @@ public static int getColumn(Attributes attrs) { String col = attrs.getValue(URI, COL_ATTR); return col != null ? Integer.parseInt(col) : -1; } - + /** * Returns the {@link Location} of an element (DOM flavor). - * + * * @param elem the element that holds the location information * @param description a description for the location (if null, the element's name is used) * @return a {@link Location} object @@ -180,7 +180,7 @@ public static Location getLocation(Element elem, String description) { return new LocationImpl(description == null ? elem.getNodeName() : description, srcAttr.getValue(), getLine(elem), getColumn(elem)); } - + /** * Same as getLocation(elem, null). * @@ -190,13 +190,13 @@ public static Location getLocation(Element elem, String description) { public static Location getLocation(Element elem) { return getLocation(elem, null); } - + /** * Returns the location of an element that has been processed by this pipe (DOM flavor). * If the location is to be kept into an object built from this element, consider using * {@link #getLocation(Element)} and the {@link Locatable} interface. - * + * * @param elem the element that holds the location information * @return a location string as defined by {@link Location}. */ @@ -205,13 +205,13 @@ public static String getLocationString(Element elem) { if (srcAttr == null) { return LocationUtils.UNKNOWN_STRING; } - + return srcAttr.getValue() + ":" + elem.getAttributeNS(URI, LINE_ATTR) + ":" + elem.getAttributeNS(URI, COL_ATTR); } - + /** * Returns the URI of an element (DOM flavor) - * + * * @param elem the element that holds the location information * @return the element's URI or "[unknown location]" if elem * has no location information. @@ -223,7 +223,7 @@ public static String getURI(Element elem) { /** * Returns the line number of an element (DOM flavor) - * + * * @param elem the element that holds the location information * @return the element's line number or -1 if elem * has no location information. @@ -235,7 +235,7 @@ public static int getLine(Element elem) { /** * Returns the column number of an element (DOM flavor) - * + * * @param elem the element that holds the location information * @return the element's column number or -1 if elem * has no location information. @@ -244,10 +244,10 @@ public static int getColumn(Element elem) { Attr attr = elem.getAttributeNodeNS(URI, COL_ATTR); return attr != null ? Integer.parseInt(attr.getValue()) : -1; } - + /** * Remove the location attributes from a DOM element. - * + * * @param elem the element to remove the location attributes from. * @param recurse if true, also remove location attributes on descendant elements. */ @@ -282,15 +282,15 @@ public static void remove(Element elem, boolean recurse) { * Note: Although this adds a lot of information to the serialized form of the document, * the overhead in SAX events is not that big, as attribute names are interned, and all src * attributes point to the same string. - * - * @see com.opensymphony.xwork2.util.location.LocationAttributes + * + * @see org.apache.struts2.util.location.LocationAttributes */ public static class Pipe implements ContentHandler { - + private Locator locator; - + private ContentHandler nextHandler; - + /** * Create a filter. It has to be chained to another handler to be really useful. */ @@ -309,12 +309,12 @@ public void setDocumentLocator(Locator locator) { this.locator = locator; nextHandler.setDocumentLocator(locator); } - + public void startDocument() throws SAXException { nextHandler.startDocument(); nextHandler.startPrefixMapping(LocationAttributes.PREFIX, LocationAttributes.URI); } - + public void endDocument() throws SAXException { endPrefixMapping(LocationAttributes.PREFIX); nextHandler.endDocument(); diff --git a/core/src/main/java/com/opensymphony/xwork2/util/location/LocationImpl.java b/core/src/main/java/org/apache/struts2/util/location/LocationImpl.java similarity index 99% rename from core/src/main/java/com/opensymphony/xwork2/util/location/LocationImpl.java rename to core/src/main/java/org/apache/struts2/util/location/LocationImpl.java index 3f3fc63f1d..02c0987b86 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/location/LocationImpl.java +++ b/core/src/main/java/org/apache/struts2/util/location/LocationImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util.location; +package org.apache.struts2.util.location; import org.apache.commons.lang3.StringUtils; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/location/LocationUtils.java b/core/src/main/java/org/apache/struts2/util/location/LocationUtils.java similarity index 99% rename from core/src/main/java/com/opensymphony/xwork2/util/location/LocationUtils.java rename to core/src/main/java/org/apache/struts2/util/location/LocationUtils.java index 28a677f632..e2da199612 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/location/LocationUtils.java +++ b/core/src/main/java/org/apache/struts2/util/location/LocationUtils.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util.location; +package org.apache.struts2.util.location; -import com.opensymphony.xwork2.util.ClassLoaderUtil; +import org.apache.struts2.util.ClassLoaderUtil; import org.apache.struts2.config.StrutsJavaConfiguration; import org.w3c.dom.Element; import org.xml.sax.Locator; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/location/package.html b/core/src/main/java/org/apache/struts2/util/location/package.html similarity index 100% rename from core/src/main/java/com/opensymphony/xwork2/util/location/package.html rename to core/src/main/java/org/apache/struts2/util/location/package.html diff --git a/core/src/main/java/com/opensymphony/xwork2/util/package.html b/core/src/main/java/org/apache/struts2/util/package.html similarity index 100% rename from core/src/main/java/com/opensymphony/xwork2/util/package.html rename to core/src/main/java/org/apache/struts2/util/package.html diff --git a/core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionContextFactory.java b/core/src/main/java/org/apache/struts2/util/reflection/ReflectionContextFactory.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionContextFactory.java rename to core/src/main/java/org/apache/struts2/util/reflection/ReflectionContextFactory.java index b8792537b3..5b0075f3bf 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionContextFactory.java +++ b/core/src/main/java/org/apache/struts2/util/reflection/ReflectionContextFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util.reflection; +package org.apache.struts2.util.reflection; import java.util.Map; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionContextState.java b/core/src/main/java/org/apache/struts2/util/reflection/ReflectionContextState.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionContextState.java rename to core/src/main/java/org/apache/struts2/util/reflection/ReflectionContextState.java index c3556cfee2..cc2f457c3e 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionContextState.java +++ b/core/src/main/java/org/apache/struts2/util/reflection/ReflectionContextState.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util.reflection; +package org.apache.struts2.util.reflection; -import com.opensymphony.xwork2.conversion.impl.XWorkConverter; +import org.apache.struts2.conversion.impl.XWorkConverter; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionException.java b/core/src/main/java/org/apache/struts2/util/reflection/ReflectionException.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionException.java rename to core/src/main/java/org/apache/struts2/util/reflection/ReflectionException.java index 9809d80170..a0272aea4d 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionException.java +++ b/core/src/main/java/org/apache/struts2/util/reflection/ReflectionException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util.reflection; +package org.apache.struts2.util.reflection; import org.apache.struts2.StrutsException; diff --git a/core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionExceptionHandler.java b/core/src/main/java/org/apache/struts2/util/reflection/ReflectionExceptionHandler.java similarity index 94% rename from core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionExceptionHandler.java rename to core/src/main/java/org/apache/struts2/util/reflection/ReflectionExceptionHandler.java index bc66de8e3b..ecdd60b147 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionExceptionHandler.java +++ b/core/src/main/java/org/apache/struts2/util/reflection/ReflectionExceptionHandler.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util.reflection; +package org.apache.struts2.util.reflection; /** * Declares a class that wants to handle its own reflection exceptions @@ -25,7 +25,7 @@ public interface ReflectionExceptionHandler { /** * Handles a reflection exception - * + * * @param ex The reflection exception */ void handle(ReflectionException ex); diff --git a/core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionProvider.java b/core/src/main/java/org/apache/struts2/util/reflection/ReflectionProvider.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionProvider.java rename to core/src/main/java/org/apache/struts2/util/reflection/ReflectionProvider.java index 85945aa791..7ffc19a713 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionProvider.java +++ b/core/src/main/java/org/apache/struts2/util/reflection/ReflectionProvider.java @@ -16,7 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.util.reflection; +package org.apache.struts2.util.reflection; + +import org.apache.struts2.conversion.impl.XWorkConverter; import java.beans.IntrospectionException; import java.beans.PropertyDescriptor; @@ -26,13 +28,13 @@ import java.util.Map; public interface ReflectionProvider { - + Method getGetMethod(Class targetClass, String propertyName) throws IntrospectionException, ReflectionException; - + Method getSetMethod(Class targetClass, String propertyName) throws IntrospectionException, ReflectionException; - + Field getField(Class inClass, String name); - + /** * Sets the object's properties using the default type converter, defaulting to not throw * exceptions for problems setting the properties. @@ -53,7 +55,7 @@ public interface ReflectionProvider { * problems setting the properties */ void setProperties(Map props, Object o, Map context, boolean throwPropertyExceptions) throws ReflectionException; - + /** * Sets the properties on the object using the default context, defaulting to not throwing * exceptions for problems setting the properties. @@ -62,7 +64,7 @@ public interface ReflectionProvider { * @param o object */ void setProperties(Map properties, Object o); - + /** * This method returns a PropertyDescriptor for the given class and property name using * a Map lookup (using getPropertyDescriptorsMap()). @@ -79,7 +81,7 @@ public interface ReflectionProvider { /** * Copies the properties in the object "from" and sets them in the object "to" - * using specified type converter, or {@link com.opensymphony.xwork2.conversion.impl.XWorkConverter} if none + * using specified type converter, or {@link XWorkConverter} if none * is specified. * * @param from the source object @@ -94,7 +96,7 @@ public interface ReflectionProvider { /** * Copies the properties in the object "from" and sets them in the object "to" * only setting properties defined in the given "editable" class (or interface) - * using specified type converter, or {@link com.opensymphony.xwork2.conversion.impl.XWorkConverter} if none + * using specified type converter, or {@link XWorkConverter} if none * is specified. * * @param from the source object @@ -118,7 +120,7 @@ public interface ReflectionProvider { * @throws ReflectionException in case of reflection problems */ Object getRealTarget(String property, Map context, Object root) throws ReflectionException; - + /** * Sets the named property to the supplied value on the Object, * @@ -141,7 +143,7 @@ public interface ReflectionProvider { * @param context the context which may include the TypeConverter */ void setProperty(String name, Object value, Object o, Map context); - + /** * Creates a Map with read properties for the given source object. *

        @@ -154,7 +156,7 @@ public interface ReflectionProvider { * @throws IntrospectionException is thrown if an exception occurs during introspection. */ Map getBeanMap(Object source) throws IntrospectionException, ReflectionException; - + /** * Evaluates the given OGNL expression to extract a value from the given root * object in a given context @@ -165,7 +167,7 @@ public interface ReflectionProvider { * @return the result of evaluating the expression */ Object getValue( String expression, Map context, Object root ) throws ReflectionException; - + /** * Evaluates the given OGNL expression to insert a value into the object graph * rooted at the given root object given the context. @@ -176,10 +178,10 @@ public interface ReflectionProvider { * @param value the value to insert into the object graph */ void setValue( String expression, Map context, Object root, Object value ) throws ReflectionException; - + /** * Get's the java beans property descriptors for the given source. - * + * * @param source the source object. * @return property descriptors. * @throws IntrospectionException is thrown if an exception occurs during introspection. diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/ActionValidatorManager.java b/core/src/main/java/org/apache/struts2/validator/ActionValidatorManager.java similarity index 98% rename from core/src/main/java/com/opensymphony/xwork2/validator/ActionValidatorManager.java rename to core/src/main/java/org/apache/struts2/validator/ActionValidatorManager.java index ea0de3a724..99356a6b3c 100644 --- a/core/src/main/java/com/opensymphony/xwork2/validator/ActionValidatorManager.java +++ b/core/src/main/java/org/apache/struts2/validator/ActionValidatorManager.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.validator; +package org.apache.struts2.validator; import java.util.List; diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java b/core/src/main/java/org/apache/struts2/validator/AnnotationActionValidatorManager.java similarity index 93% rename from core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java rename to core/src/main/java/org/apache/struts2/validator/AnnotationActionValidatorManager.java index 260c0c5e24..c2d5ca1e11 100644 --- a/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java +++ b/core/src/main/java/org/apache/struts2/validator/AnnotationActionValidatorManager.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.validator; +package org.apache.struts2.validator; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.ActionProxy; -import com.opensymphony.xwork2.config.entities.ActionConfig; +import org.apache.struts2.ActionContext; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.ActionProxy; +import org.apache.struts2.config.entities.ActionConfig; import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationValidationConfigurationBuilder.java b/core/src/main/java/org/apache/struts2/validator/AnnotationValidationConfigurationBuilder.java similarity index 95% rename from core/src/main/java/com/opensymphony/xwork2/validator/AnnotationValidationConfigurationBuilder.java rename to core/src/main/java/org/apache/struts2/validator/AnnotationValidationConfigurationBuilder.java index f1de89269b..fa0a23a07e 100644 --- a/core/src/main/java/com/opensymphony/xwork2/validator/AnnotationValidationConfigurationBuilder.java +++ b/core/src/main/java/org/apache/struts2/validator/AnnotationValidationConfigurationBuilder.java @@ -16,29 +16,29 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.validator; - -import com.opensymphony.xwork2.util.AnnotationUtils; -import com.opensymphony.xwork2.validator.annotations.ConditionalVisitorFieldValidator; -import com.opensymphony.xwork2.validator.annotations.ConversionErrorFieldValidator; -import com.opensymphony.xwork2.validator.annotations.CreditCardValidator; -import com.opensymphony.xwork2.validator.annotations.CustomValidator; -import com.opensymphony.xwork2.validator.annotations.DateRangeFieldValidator; -import com.opensymphony.xwork2.validator.annotations.DoubleRangeFieldValidator; -import com.opensymphony.xwork2.validator.annotations.EmailValidator; -import com.opensymphony.xwork2.validator.annotations.ExpressionValidator; -import com.opensymphony.xwork2.validator.annotations.FieldExpressionValidator; -import com.opensymphony.xwork2.validator.annotations.IntRangeFieldValidator; -import com.opensymphony.xwork2.validator.annotations.LongRangeFieldValidator; -import com.opensymphony.xwork2.validator.annotations.RegexFieldValidator; -import com.opensymphony.xwork2.validator.annotations.RequiredFieldValidator; -import com.opensymphony.xwork2.validator.annotations.RequiredStringValidator; -import com.opensymphony.xwork2.validator.annotations.ShortRangeFieldValidator; -import com.opensymphony.xwork2.validator.annotations.StringLengthFieldValidator; -import com.opensymphony.xwork2.validator.annotations.UrlValidator; -import com.opensymphony.xwork2.validator.annotations.ValidationParameter; -import com.opensymphony.xwork2.validator.annotations.Validations; -import com.opensymphony.xwork2.validator.annotations.VisitorFieldValidator; +package org.apache.struts2.validator; + +import org.apache.struts2.util.AnnotationUtils; +import org.apache.struts2.validator.annotations.ConditionalVisitorFieldValidator; +import org.apache.struts2.validator.annotations.ConversionErrorFieldValidator; +import org.apache.struts2.validator.annotations.CreditCardValidator; +import org.apache.struts2.validator.annotations.CustomValidator; +import org.apache.struts2.validator.annotations.DateRangeFieldValidator; +import org.apache.struts2.validator.annotations.DoubleRangeFieldValidator; +import org.apache.struts2.validator.annotations.EmailValidator; +import org.apache.struts2.validator.annotations.ExpressionValidator; +import org.apache.struts2.validator.annotations.FieldExpressionValidator; +import org.apache.struts2.validator.annotations.IntRangeFieldValidator; +import org.apache.struts2.validator.annotations.LongRangeFieldValidator; +import org.apache.struts2.validator.annotations.RegexFieldValidator; +import org.apache.struts2.validator.annotations.RequiredFieldValidator; +import org.apache.struts2.validator.annotations.RequiredStringValidator; +import org.apache.struts2.validator.annotations.ShortRangeFieldValidator; +import org.apache.struts2.validator.annotations.StringLengthFieldValidator; +import org.apache.struts2.validator.annotations.UrlValidator; +import org.apache.struts2.validator.annotations.ValidationParameter; +import org.apache.struts2.validator.annotations.Validations; +import org.apache.struts2.validator.annotations.VisitorFieldValidator; import org.apache.commons.lang3.StringUtils; import java.lang.annotation.Annotation; diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java b/core/src/main/java/org/apache/struts2/validator/DefaultActionValidatorManager.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java rename to core/src/main/java/org/apache/struts2/validator/DefaultActionValidatorManager.java index f05b804860..275aaf1696 100644 --- a/core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java +++ b/core/src/main/java/org/apache/struts2/validator/DefaultActionValidatorManager.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -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.inject.Inject; -import com.opensymphony.xwork2.util.ClassLoaderUtil; -import com.opensymphony.xwork2.util.ValueStack; +package org.apache.struts2.validator; + +import org.apache.struts2.ActionContext; +import org.apache.struts2.FileManager; +import org.apache.struts2.FileManagerFactory; +import org.apache.struts2.TextProviderFactory; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.ClassLoaderUtil; +import org.apache.struts2.util.ValueStack; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.StrutsConstants; diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/DefaultValidatorFactory.java b/core/src/main/java/org/apache/struts2/validator/DefaultValidatorFactory.java similarity index 94% rename from core/src/main/java/com/opensymphony/xwork2/validator/DefaultValidatorFactory.java rename to core/src/main/java/org/apache/struts2/validator/DefaultValidatorFactory.java index 5ae3ee8c07..4e8a233088 100644 --- a/core/src/main/java/com/opensymphony/xwork2/validator/DefaultValidatorFactory.java +++ b/core/src/main/java/org/apache/struts2/validator/DefaultValidatorFactory.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.validator; - -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ObjectFactory; -import com.opensymphony.xwork2.config.ConfigurationException; -import com.opensymphony.xwork2.inject.Initializable; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.ClassLoaderUtil; +package org.apache.struts2.validator; + +import org.apache.struts2.ActionContext; +import org.apache.struts2.ObjectFactory; +import org.apache.struts2.config.ConfigurationException; +import org.apache.struts2.inject.Initializable; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.ClassLoaderUtil; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.StrutsException; @@ -180,7 +180,7 @@ private void parseValidators() { } // Parse default validator configurations - String resourceName = "com/opensymphony/xwork2/validator/validators/default.xml"; + String resourceName = "org/apache/struts2/validator/validators/default.xml"; retrieveValidatorConfiguration(resourceName); // Overwrite and extend defaults with application specific validator configurations diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/DefaultValidatorFileParser.java b/core/src/main/java/org/apache/struts2/validator/DefaultValidatorFileParser.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/validator/DefaultValidatorFileParser.java rename to core/src/main/java/org/apache/struts2/validator/DefaultValidatorFileParser.java index a576439db3..d61ff4595b 100644 --- a/core/src/main/java/com/opensymphony/xwork2/validator/DefaultValidatorFileParser.java +++ b/core/src/main/java/org/apache/struts2/validator/DefaultValidatorFileParser.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.validator; - -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ObjectFactory; -import com.opensymphony.xwork2.config.ConfigurationException; -import com.opensymphony.xwork2.config.providers.XmlHelper; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.DomHelper; +package org.apache.struts2.validator; + +import org.apache.struts2.ActionContext; +import org.apache.struts2.ObjectFactory; +import org.apache.struts2.config.ConfigurationException; +import org.apache.struts2.config.providers.XmlHelper; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.util.DomHelper; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.w3c.dom.CharacterData; @@ -53,7 +53,7 @@ * @author Rene Gielen * @author Martin Gilday * - * @see com.opensymphony.xwork2.validator.ValidatorConfig + * @see ValidatorConfig */ public class DefaultValidatorFileParser implements ValidatorFileParser { diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java b/core/src/main/java/org/apache/struts2/validator/DelegatingValidatorContext.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java rename to core/src/main/java/org/apache/struts2/validator/DelegatingValidatorContext.java index 63e8c1d191..fd8b5cb2e1 100644 --- a/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java +++ b/core/src/main/java/org/apache/struts2/validator/DelegatingValidatorContext.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.validator; - -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.CompositeTextProvider; -import com.opensymphony.xwork2.LocaleProvider; -import com.opensymphony.xwork2.LocaleProviderFactory; -import com.opensymphony.xwork2.TextProvider; -import com.opensymphony.xwork2.TextProviderFactory; -import com.opensymphony.xwork2.interceptor.ValidationAware; -import com.opensymphony.xwork2.util.ValueStack; +package org.apache.struts2.validator; + +import org.apache.struts2.ActionContext; +import org.apache.struts2.CompositeTextProvider; +import org.apache.struts2.LocaleProvider; +import org.apache.struts2.LocaleProviderFactory; +import org.apache.struts2.TextProvider; +import org.apache.struts2.TextProviderFactory; +import org.apache.struts2.interceptor.ValidationAware; +import org.apache.struts2.util.ValueStack; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/FieldValidator.java b/core/src/main/java/org/apache/struts2/validator/FieldValidator.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/validator/FieldValidator.java rename to core/src/main/java/org/apache/struts2/validator/FieldValidator.java index 1536ded13a..c3af5c225f 100644 --- a/core/src/main/java/com/opensymphony/xwork2/validator/FieldValidator.java +++ b/core/src/main/java/org/apache/struts2/validator/FieldValidator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.validator; +package org.apache.struts2.validator; /** * The FieldValidator interface defines the methods to be implemented by FieldValidators. diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/ShortCircuitableValidator.java b/core/src/main/java/org/apache/struts2/validator/ShortCircuitableValidator.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/validator/ShortCircuitableValidator.java rename to core/src/main/java/org/apache/struts2/validator/ShortCircuitableValidator.java index 9e6372dba6..05d4faeb03 100644 --- a/core/src/main/java/com/opensymphony/xwork2/validator/ShortCircuitableValidator.java +++ b/core/src/main/java/org/apache/struts2/validator/ShortCircuitableValidator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.validator; +package org.apache.struts2.validator; /** * This interface should be implemented by validators that can short-circuit the validator queue diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/ValidationException.java b/core/src/main/java/org/apache/struts2/validator/ValidationException.java similarity index 96% rename from core/src/main/java/com/opensymphony/xwork2/validator/ValidationException.java rename to core/src/main/java/org/apache/struts2/validator/ValidationException.java index ec0e516a82..b0a7df359f 100644 --- a/core/src/main/java/com/opensymphony/xwork2/validator/ValidationException.java +++ b/core/src/main/java/org/apache/struts2/validator/ValidationException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.validator; +package org.apache.struts2.validator; /** * ValidationException. diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/ValidationInterceptor.java b/core/src/main/java/org/apache/struts2/validator/ValidationInterceptor.java similarity index 92% rename from core/src/main/java/com/opensymphony/xwork2/validator/ValidationInterceptor.java rename to core/src/main/java/org/apache/struts2/validator/ValidationInterceptor.java index b0852ed035..0b7d49f97d 100644 --- a/core/src/main/java/com/opensymphony/xwork2/validator/ValidationInterceptor.java +++ b/core/src/main/java/org/apache/struts2/validator/ValidationInterceptor.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.validator; +package org.apache.struts2.validator; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.ActionProxy; -import com.opensymphony.xwork2.Validateable; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.interceptor.MethodFilterInterceptor; -import com.opensymphony.xwork2.interceptor.PrefixMethodInvocationUtil; -import com.opensymphony.xwork2.interceptor.ValidationAware; +import org.apache.struts2.ActionInvocation; +import org.apache.struts2.ActionProxy; +import org.apache.struts2.Validateable; +import org.apache.struts2.inject.Inject; +import org.apache.struts2.interceptor.MethodFilterInterceptor; +import org.apache.struts2.interceptor.PrefixMethodInvocationUtil; +import org.apache.struts2.interceptor.ValidationAware; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -71,9 +71,9 @@ *

      • programmatic - Defaults to true. If true and the action is Validateable call validate(), * and any method that starts with "validate". *
        • - * + * *
      • declarative - Defaults to true. Perform validation based on xml or annotations.
        • - * + * *
      * * @@ -90,14 +90,14 @@ * * 
        * 
- * 
+ *
  * <action name="someAction" class="com.examples.SomeAction">
  *     <interceptor-ref name="params"/>
  *     <interceptor-ref name="validation"/>
  *     <interceptor-ref name="workflow"/>
  *     <result name="success">good_result.ftl</result>
  * </action>
- * 
+ *
  * <-- in the following case myMethod of the action class will not
  *        get validated -->
  * <action name="someAction" class="com.examples.SomeAction">
@@ -108,7 +108,7 @@
  *     <interceptor-ref name="workflow"/>
  *     <result name="success">good_result.ftl</result>
  * </action>
- * 
+ *
  * <-- in the following case only annotated methods of the action class will
  *        be validated -->
  * <action name="someAction" class="com.examples.SomeAction">
@@ -128,7 +128,7 @@
  * @author Rainer Hermanns
  * @author Alexandru Popescu
  * @see ActionValidatorManager
- * @see com.opensymphony.xwork2.interceptor.DefaultWorkflowInterceptor
+ * @see org.apache.struts2.interceptor.DefaultWorkflowInterceptor
  */
 public class ValidationInterceptor extends MethodFilterInterceptor {
 
@@ -138,9 +138,9 @@ public class ValidationInterceptor extends MethodFilterInterceptor {
     private final static String ALT_VALIDATE_PREFIX = "validateDo";
 
     private boolean validateAnnotatedMethodOnly;
-    
+
     private ActionValidatorManager actionValidatorManager;
-    
+
     private boolean alwaysInvokeValidate = true;
     private boolean programmatic = true;
     private boolean declarative = true;
@@ -149,11 +149,11 @@ public class ValidationInterceptor extends MethodFilterInterceptor {
     public void setActionValidatorManager(ActionValidatorManager mgr) {
         this.actionValidatorManager = mgr;
     }
-    
+
     /**
      * Determines if {@link Validateable}'s validate() should be called,
      * as well as methods whose name that start with "validate". Defaults to "true".
-     * 
+     *
      * @param programmatic true then validate() is invoked.
      */
     public void setProgrammatic(boolean programmatic) {
@@ -161,9 +161,9 @@ public void setProgrammatic(boolean programmatic) {
     }
 
     /**
-     * Determines if validation based on annotations or xml should be performed. Defaults 
+     * Determines if validation based on annotations or xml should be performed. Defaults
      * to "true".
-     * 
+     *
      * @param declarative true then perform validation based on annotations or xml.
      */
     public void setDeclarative(boolean declarative) {
@@ -171,9 +171,9 @@ public void setDeclarative(boolean declarative) {
     }
 
     /**
-     * Determines if {@link Validateable}'s validate() should always 
+     * Determines if {@link Validateable}'s validate() should always
      * be invoked. Default to "true".
-     * 
+     *
      * @param alwaysInvokeValidate true then validate() is always invoked.
      */
     public void setAlwaysInvokeValidate(String alwaysInvokeValidate) {
@@ -218,7 +218,7 @@ protected void doBeforeInvocation(ActionInvocation invocation) throws Exception
         if (LOG.isDebugEnabled()) {
             LOG.debug("Validating {}/{} with method {}.", invocation.getProxy().getNamespace(), invocation.getProxy().getActionName(), method);
         }
-        
+
 
         if (declarative) {
            if (validateAnnotatedMethodOnly) {
@@ -226,12 +226,12 @@ protected void doBeforeInvocation(ActionInvocation invocation) throws Exception
            } else {
                actionValidatorManager.validate(action, context);
            }
-       }    
-        
+       }
+
         if (action instanceof Validateable && programmatic) {
             // keep exception that might occured in validateXXX or validateDoXXX
-            Exception exception = null; 
-            
+            Exception exception = null;
+
             Validateable validateable = (Validateable) action;
             LOG.debug("Invoking validate() on action {}", validateable);
 
@@ -239,19 +239,19 @@ protected void doBeforeInvocation(ActionInvocation invocation) throws Exception
                 PrefixMethodInvocationUtil.invokePrefixMethod(invocation, new String[]{VALIDATE_PREFIX, ALT_VALIDATE_PREFIX});
             }
             catch(Exception e) {
-                // If any exception occurred while doing reflection, we want 
+                // If any exception occurred while doing reflection, we want
                 // validate() to be executed
                 LOG.warn("an exception occured while executing the prefix method", e);
                 exception = e;
             }
-            
-            
+
+
             if (alwaysInvokeValidate) {
                 validateable.validate();
             }
-            
-            if (exception != null) { 
-                // rethrow if something is wrong while doing validateXXX / validateDoXXX 
+
+            if (exception != null) {
+                // rethrow if something is wrong while doing validateXXX / validateDoXXX
                 throw exception;
             }
         }
@@ -262,7 +262,7 @@ protected String doIntercept(ActionInvocation invocation) throws Exception {
         doBeforeInvocation(invocation);
         return invocation.invoke();
     }
-    
+
     /**
      * 
      
      * Returns the context that will be used by the
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/Validator.java b/core/src/main/java/org/apache/struts2/validator/Validator.java
similarity index 99%
rename from core/src/main/java/com/opensymphony/xwork2/validator/Validator.java
rename to core/src/main/java/org/apache/struts2/validator/Validator.java
index 6550e513a0..02244818fe 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/Validator.java
+++ b/core/src/main/java/org/apache/struts2/validator/Validator.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.validator;
 
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.util.ValueStack;
 
 /**
  * 
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/ValidatorConfig.java b/core/src/main/java/org/apache/struts2/validator/ValidatorConfig.java
similarity index 96%
rename from core/src/main/java/com/opensymphony/xwork2/validator/ValidatorConfig.java
rename to core/src/main/java/org/apache/struts2/validator/ValidatorConfig.java
index 4fb4933286..d291c25e91 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/ValidatorConfig.java
+++ b/core/src/main/java/org/apache/struts2/validator/ValidatorConfig.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.validator;
 
-import com.opensymphony.xwork2.util.location.Located;
-import com.opensymphony.xwork2.util.location.Location;
+import org.apache.struts2.util.location.Located;
+import org.apache.struts2.util.location.Location;
 
 import java.util.Collections;
 import java.util.LinkedHashMap;
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/ValidatorContext.java b/core/src/main/java/org/apache/struts2/validator/ValidatorContext.java
similarity index 87%
rename from core/src/main/java/com/opensymphony/xwork2/validator/ValidatorContext.java
rename to core/src/main/java/org/apache/struts2/validator/ValidatorContext.java
index dd5f6f8b6f..f5401b7ce7 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/ValidatorContext.java
+++ b/core/src/main/java/org/apache/struts2/validator/ValidatorContext.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.validator;
 
-import com.opensymphony.xwork2.LocaleProvider;
-import com.opensymphony.xwork2.TextProvider;
-import com.opensymphony.xwork2.interceptor.ValidationAware;
+import org.apache.struts2.LocaleProvider;
+import org.apache.struts2.TextProvider;
+import org.apache.struts2.interceptor.ValidationAware;
 
 /**
  * The context for validation. This interface extends others to provide methods for reporting
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/ValidatorFactory.java b/core/src/main/java/org/apache/struts2/validator/ValidatorFactory.java
similarity index 97%
rename from core/src/main/java/com/opensymphony/xwork2/validator/ValidatorFactory.java
rename to core/src/main/java/org/apache/struts2/validator/ValidatorFactory.java
index f085d1b127..9b172ecffe 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/ValidatorFactory.java
+++ b/core/src/main/java/org/apache/struts2/validator/ValidatorFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.validator;
 
 /**
  * ValidatorFactory
@@ -37,7 +37,7 @@
  * validators.xml if being defined should be available in the classpath. However
  * this is not necessary, if no custom validator is needed. Predefined sets of validators
  * will automatically be picked up when defined in
- * com/opensymphony/xwork2/validator/validators/default.xml packaged in
+ * org/apache/struts2/validator/validators/default.xml packaged in
  * in the xwork jar file. See ValidatorFactory static block for details.
  * 
  * 
      
@@ -49,7 +49,7 @@
  * place in the classpath, do remember to copy all the other pre-defined validators
  * that is needed into the validators.xml as if not they will not be registered.
  * Once a validators.xml is detected in the classpath, the default one
- * (com/opensymphony/xwork2/validator/validators/default.xml) will not be loaded.
+ * (org/apache/struts2/validator/validators/default.xml) will not be loaded.
  * It is only loaded when a custom validators.xml cannot be found in the classpath.
  *  Be careful.
  * 
@@ -65,7 +65,7 @@
  *
  * 
        * 
- *     <interceptor name="validator" class="com.opensymphony.xwork2.validator.ValidationInterceptor"/>
+ *     <interceptor name="validator" class="org.apache.struts2.validator.ValidationInterceptor"/>
  * 
  * 
      
  *
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/ValidatorFileParser.java b/core/src/main/java/org/apache/struts2/validator/ValidatorFileParser.java
similarity index 95%
rename from core/src/main/java/com/opensymphony/xwork2/validator/ValidatorFileParser.java
rename to core/src/main/java/org/apache/struts2/validator/ValidatorFileParser.java
index 1927ced83c..5fbb1d1508 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/ValidatorFileParser.java
+++ b/core/src/main/java/org/apache/struts2/validator/ValidatorFileParser.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.validator;
 
 import java.io.InputStream;
 import java.util.List;
@@ -41,7 +41,7 @@
  * @author Rob Harrop
  * @author Rene Gielen
  *
- * @see com.opensymphony.xwork2.validator.ValidatorConfig
+ * @see org.apache.struts2.validator.ValidatorConfig
  */
 public interface ValidatorFileParser {
     /**
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/ConditionalVisitorFieldValidator.java b/core/src/main/java/org/apache/struts2/validator/annotations/ConditionalVisitorFieldValidator.java
similarity index 99%
rename from core/src/main/java/com/opensymphony/xwork2/validator/annotations/ConditionalVisitorFieldValidator.java
rename to core/src/main/java/org/apache/struts2/validator/annotations/ConditionalVisitorFieldValidator.java
index 693fb8faf4..8915837df7 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/ConditionalVisitorFieldValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/annotations/ConditionalVisitorFieldValidator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.annotations;
+package org.apache.struts2.validator.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/ConversionErrorFieldValidator.java b/core/src/main/java/org/apache/struts2/validator/annotations/ConversionErrorFieldValidator.java
similarity index 98%
rename from core/src/main/java/com/opensymphony/xwork2/validator/annotations/ConversionErrorFieldValidator.java
rename to core/src/main/java/org/apache/struts2/validator/annotations/ConversionErrorFieldValidator.java
index b76cea8fcb..97b9943d44 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/ConversionErrorFieldValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/annotations/ConversionErrorFieldValidator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.annotations;
+package org.apache.struts2.validator.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/CreditCardValidator.java b/core/src/main/java/org/apache/struts2/validator/annotations/CreditCardValidator.java
similarity index 97%
rename from core/src/main/java/com/opensymphony/xwork2/validator/annotations/CreditCardValidator.java
rename to core/src/main/java/org/apache/struts2/validator/annotations/CreditCardValidator.java
index 1a0bc7529f..c7eb204f0c 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/CreditCardValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/annotations/CreditCardValidator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.annotations;
+package org.apache.struts2.validator.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/CustomValidator.java b/core/src/main/java/org/apache/struts2/validator/annotations/CustomValidator.java
similarity index 98%
rename from core/src/main/java/com/opensymphony/xwork2/validator/annotations/CustomValidator.java
rename to core/src/main/java/org/apache/struts2/validator/annotations/CustomValidator.java
index f4ca87b48c..0b95ffc53d 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/CustomValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/annotations/CustomValidator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.annotations;
+package org.apache.struts2.validator.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/DateRangeFieldValidator.java b/core/src/main/java/org/apache/struts2/validator/annotations/DateRangeFieldValidator.java
similarity index 99%
rename from core/src/main/java/com/opensymphony/xwork2/validator/annotations/DateRangeFieldValidator.java
rename to core/src/main/java/org/apache/struts2/validator/annotations/DateRangeFieldValidator.java
index 69c9291dee..d3fa0bb7ef 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/DateRangeFieldValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/annotations/DateRangeFieldValidator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.annotations;
+package org.apache.struts2.validator.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/DoubleRangeFieldValidator.java b/core/src/main/java/org/apache/struts2/validator/annotations/DoubleRangeFieldValidator.java
similarity index 99%
rename from core/src/main/java/com/opensymphony/xwork2/validator/annotations/DoubleRangeFieldValidator.java
rename to core/src/main/java/org/apache/struts2/validator/annotations/DoubleRangeFieldValidator.java
index c617fbecf9..08c7857dd5 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/DoubleRangeFieldValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/annotations/DoubleRangeFieldValidator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.annotations;
+package org.apache.struts2.validator.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/EmailValidator.java b/core/src/main/java/org/apache/struts2/validator/annotations/EmailValidator.java
similarity index 98%
rename from core/src/main/java/com/opensymphony/xwork2/validator/annotations/EmailValidator.java
rename to core/src/main/java/org/apache/struts2/validator/annotations/EmailValidator.java
index d42c343161..ad194e682b 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/EmailValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/annotations/EmailValidator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.annotations;
+package org.apache.struts2.validator.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/ExpressionValidator.java b/core/src/main/java/org/apache/struts2/validator/annotations/ExpressionValidator.java
similarity index 98%
rename from core/src/main/java/com/opensymphony/xwork2/validator/annotations/ExpressionValidator.java
rename to core/src/main/java/org/apache/struts2/validator/annotations/ExpressionValidator.java
index 51a641343a..4dfda8a950 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/ExpressionValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/annotations/ExpressionValidator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.annotations;
+package org.apache.struts2.validator.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/FieldExpressionValidator.java b/core/src/main/java/org/apache/struts2/validator/annotations/FieldExpressionValidator.java
similarity index 98%
rename from core/src/main/java/com/opensymphony/xwork2/validator/annotations/FieldExpressionValidator.java
rename to core/src/main/java/org/apache/struts2/validator/annotations/FieldExpressionValidator.java
index 51c28be6ba..12b4f9c091 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/FieldExpressionValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/annotations/FieldExpressionValidator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.annotations;
+package org.apache.struts2.validator.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/IntRangeFieldValidator.java b/core/src/main/java/org/apache/struts2/validator/annotations/IntRangeFieldValidator.java
similarity index 99%
rename from core/src/main/java/com/opensymphony/xwork2/validator/annotations/IntRangeFieldValidator.java
rename to core/src/main/java/org/apache/struts2/validator/annotations/IntRangeFieldValidator.java
index bcf438a742..f7c7b80197 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/IntRangeFieldValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/annotations/IntRangeFieldValidator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.annotations;
+package org.apache.struts2.validator.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/LongRangeFieldValidator.java b/core/src/main/java/org/apache/struts2/validator/annotations/LongRangeFieldValidator.java
similarity index 99%
rename from core/src/main/java/com/opensymphony/xwork2/validator/annotations/LongRangeFieldValidator.java
rename to core/src/main/java/org/apache/struts2/validator/annotations/LongRangeFieldValidator.java
index 1234da5b2f..17240f3d5b 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/LongRangeFieldValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/annotations/LongRangeFieldValidator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.annotations;
+package org.apache.struts2.validator.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/RegexFieldValidator.java b/core/src/main/java/org/apache/struts2/validator/annotations/RegexFieldValidator.java
similarity index 99%
rename from core/src/main/java/com/opensymphony/xwork2/validator/annotations/RegexFieldValidator.java
rename to core/src/main/java/org/apache/struts2/validator/annotations/RegexFieldValidator.java
index 186f39f4d1..a415738d66 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/RegexFieldValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/annotations/RegexFieldValidator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.annotations;
+package org.apache.struts2.validator.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/RequiredFieldValidator.java b/core/src/main/java/org/apache/struts2/validator/annotations/RequiredFieldValidator.java
similarity index 98%
rename from core/src/main/java/com/opensymphony/xwork2/validator/annotations/RequiredFieldValidator.java
rename to core/src/main/java/org/apache/struts2/validator/annotations/RequiredFieldValidator.java
index 55548cf5b4..9770266106 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/RequiredFieldValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/annotations/RequiredFieldValidator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.annotations;
+package org.apache.struts2.validator.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/RequiredStringValidator.java b/core/src/main/java/org/apache/struts2/validator/annotations/RequiredStringValidator.java
similarity index 98%
rename from core/src/main/java/com/opensymphony/xwork2/validator/annotations/RequiredStringValidator.java
rename to core/src/main/java/org/apache/struts2/validator/annotations/RequiredStringValidator.java
index 9636a4ce48..9ce425a7b3 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/RequiredStringValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/annotations/RequiredStringValidator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.annotations;
+package org.apache.struts2.validator.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/ShortRangeFieldValidator.java b/core/src/main/java/org/apache/struts2/validator/annotations/ShortRangeFieldValidator.java
similarity index 99%
rename from core/src/main/java/com/opensymphony/xwork2/validator/annotations/ShortRangeFieldValidator.java
rename to core/src/main/java/org/apache/struts2/validator/annotations/ShortRangeFieldValidator.java
index 66143530ca..0d419ab8a8 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/ShortRangeFieldValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/annotations/ShortRangeFieldValidator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.annotations;
+package org.apache.struts2.validator.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/StringLengthFieldValidator.java b/core/src/main/java/org/apache/struts2/validator/annotations/StringLengthFieldValidator.java
similarity index 99%
rename from core/src/main/java/com/opensymphony/xwork2/validator/annotations/StringLengthFieldValidator.java
rename to core/src/main/java/org/apache/struts2/validator/annotations/StringLengthFieldValidator.java
index e9e9833f8b..1f596a94d8 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/StringLengthFieldValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/annotations/StringLengthFieldValidator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.annotations;
+package org.apache.struts2.validator.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/UrlValidator.java b/core/src/main/java/org/apache/struts2/validator/annotations/UrlValidator.java
similarity index 97%
rename from core/src/main/java/com/opensymphony/xwork2/validator/annotations/UrlValidator.java
rename to core/src/main/java/org/apache/struts2/validator/annotations/UrlValidator.java
index 9bac722ecc..5b144a9ab0 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/UrlValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/annotations/UrlValidator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.annotations;
+package org.apache.struts2.validator.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/ValidationParameter.java b/core/src/main/java/org/apache/struts2/validator/annotations/ValidationParameter.java
similarity index 97%
rename from core/src/main/java/com/opensymphony/xwork2/validator/annotations/ValidationParameter.java
rename to core/src/main/java/org/apache/struts2/validator/annotations/ValidationParameter.java
index 04b80d30e4..7a8cdeee61 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/ValidationParameter.java
+++ b/core/src/main/java/org/apache/struts2/validator/annotations/ValidationParameter.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.annotations;
+package org.apache.struts2.validator.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/Validations.java b/core/src/main/java/org/apache/struts2/validator/annotations/Validations.java
similarity index 99%
rename from core/src/main/java/com/opensymphony/xwork2/validator/annotations/Validations.java
rename to core/src/main/java/org/apache/struts2/validator/annotations/Validations.java
index e4925ae1aa..87c89d2fbb 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/Validations.java
+++ b/core/src/main/java/org/apache/struts2/validator/annotations/Validations.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.annotations;
+package org.apache.struts2.validator.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/ValidatorType.java b/core/src/main/java/org/apache/struts2/validator/annotations/ValidatorType.java
similarity index 95%
rename from core/src/main/java/com/opensymphony/xwork2/validator/annotations/ValidatorType.java
rename to core/src/main/java/org/apache/struts2/validator/annotations/ValidatorType.java
index 9d9c5e80f8..96d7c6d29b 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/ValidatorType.java
+++ b/core/src/main/java/org/apache/struts2/validator/annotations/ValidatorType.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.annotations;
+package org.apache.struts2.validator.annotations;
 
 /**
  * ValidatorType
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/VisitorFieldValidator.java b/core/src/main/java/org/apache/struts2/validator/annotations/VisitorFieldValidator.java
similarity index 99%
rename from core/src/main/java/com/opensymphony/xwork2/validator/annotations/VisitorFieldValidator.java
rename to core/src/main/java/org/apache/struts2/validator/annotations/VisitorFieldValidator.java
index c8e7146b26..d9ed17bd0b 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/VisitorFieldValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/annotations/VisitorFieldValidator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.annotations;
+package org.apache.struts2.validator.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/annotations/package.html b/core/src/main/java/org/apache/struts2/validator/annotations/package.html
similarity index 100%
rename from core/src/main/java/com/opensymphony/xwork2/validator/annotations/package.html
rename to core/src/main/java/org/apache/struts2/validator/annotations/package.html
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/package.html b/core/src/main/java/org/apache/struts2/validator/package.html
similarity index 100%
rename from core/src/main/java/com/opensymphony/xwork2/validator/package.html
rename to core/src/main/java/org/apache/struts2/validator/package.html
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/validators/ConditionalVisitorFieldValidator.java b/core/src/main/java/org/apache/struts2/validator/validators/ConditionalVisitorFieldValidator.java
similarity index 96%
rename from core/src/main/java/com/opensymphony/xwork2/validator/validators/ConditionalVisitorFieldValidator.java
rename to core/src/main/java/org/apache/struts2/validator/validators/ConditionalVisitorFieldValidator.java
index f0ef9dbc73..242ea7ea7c 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/validators/ConditionalVisitorFieldValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/validators/ConditionalVisitorFieldValidator.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.validator.validators;
 
-import com.opensymphony.xwork2.validator.ValidationException;
+import org.apache.struts2.validator.ValidationException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/validators/ConversionErrorFieldValidator.java b/core/src/main/java/org/apache/struts2/validator/validators/ConversionErrorFieldValidator.java
similarity index 91%
rename from core/src/main/java/com/opensymphony/xwork2/validator/validators/ConversionErrorFieldValidator.java
rename to core/src/main/java/org/apache/struts2/validator/validators/ConversionErrorFieldValidator.java
index 94e0d7eade..03ea36a9dd 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/validators/ConversionErrorFieldValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/validators/ConversionErrorFieldValidator.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.validator.validators;
 
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.conversion.impl.ConversionData;
-import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
-import com.opensymphony.xwork2.validator.ValidationException;
+import org.apache.struts2.ActionContext;
+import org.apache.struts2.conversion.impl.ConversionData;
+import org.apache.struts2.conversion.impl.XWorkConverter;
+import org.apache.struts2.validator.ValidationException;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.Map;
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/validators/CreditCardValidator.java b/core/src/main/java/org/apache/struts2/validator/validators/CreditCardValidator.java
similarity index 97%
rename from core/src/main/java/com/opensymphony/xwork2/validator/validators/CreditCardValidator.java
rename to core/src/main/java/org/apache/struts2/validator/validators/CreditCardValidator.java
index 4f8d3e239f..084fed23ff 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/validators/CreditCardValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/validators/CreditCardValidator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.validator.validators;
 
 import org.apache.commons.lang3.StringUtils;
 
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidator.java b/core/src/main/java/org/apache/struts2/validator/validators/DateRangeFieldValidator.java
similarity index 98%
rename from core/src/main/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidator.java
rename to core/src/main/java/org/apache/struts2/validator/validators/DateRangeFieldValidator.java
index 2159bf7c0c..e84744815b 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/validators/DateRangeFieldValidator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.validator.validators;
 
 import java.util.Date;
 
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/validators/DoubleRangeFieldValidator.java b/core/src/main/java/org/apache/struts2/validator/validators/DoubleRangeFieldValidator.java
similarity index 98%
rename from core/src/main/java/com/opensymphony/xwork2/validator/validators/DoubleRangeFieldValidator.java
rename to core/src/main/java/org/apache/struts2/validator/validators/DoubleRangeFieldValidator.java
index 214e4ed186..cc571cebf1 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/validators/DoubleRangeFieldValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/validators/DoubleRangeFieldValidator.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.validator.validators;
 
-import com.opensymphony.xwork2.validator.ValidationException;
+import org.apache.struts2.validator.ValidationException;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/validators/EmailValidator.java b/core/src/main/java/org/apache/struts2/validator/validators/EmailValidator.java
similarity index 98%
rename from core/src/main/java/com/opensymphony/xwork2/validator/validators/EmailValidator.java
rename to core/src/main/java/org/apache/struts2/validator/validators/EmailValidator.java
index 92c779152d..636b5f8d87 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/validators/EmailValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/validators/EmailValidator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.validator.validators;
 
 /**
  * 
@@ -30,8 +30,8 @@
  *
  * You can also specify expression, caseSensitive and trim params as a OGNL expression, see the example below.
  * 
- * 
- * 
+ *
+ *
  * 
  * 
        
  * 		
      • fieldName - The field name this validator is validating. Required if using Plain-Validator Syntax otherwise not required
        • 
@@ -42,7 +42,7 @@
  * 
  * Do not use ${regexExpression}, ${caseSensitiveExpression} and ${trimExpression} as an expression as this will turn into infinitive loop!
  * 
- * 
+ *
  * 
          * 
  *     <!-- Plain Validator Syntax -->
@@ -52,7 +52,7 @@
  *             <message>Must provide a valid email</message>
  *         </validator>
  *     </validators>
- *     
+ *
  *     <!-- Field Validator Syntax -->
  *     <field name="myEmail">
  *        <field-validator type="email">
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/validators/ExpressionValidator.java b/core/src/main/java/org/apache/struts2/validator/validators/ExpressionValidator.java
similarity index 95%
rename from core/src/main/java/com/opensymphony/xwork2/validator/validators/ExpressionValidator.java
rename to core/src/main/java/org/apache/struts2/validator/validators/ExpressionValidator.java
index 88753fb0fc..ab1c740c1d 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/validators/ExpressionValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/validators/ExpressionValidator.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.validator.validators;
 
-import com.opensymphony.xwork2.validator.ValidationException;
+import org.apache.struts2.validator.ValidationException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/validators/FieldExpressionValidator.java b/core/src/main/java/org/apache/struts2/validator/validators/FieldExpressionValidator.java
similarity index 96%
rename from core/src/main/java/com/opensymphony/xwork2/validator/validators/FieldExpressionValidator.java
rename to core/src/main/java/org/apache/struts2/validator/validators/FieldExpressionValidator.java
index 68f875ebef..0a9a739d04 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/validators/FieldExpressionValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/validators/FieldExpressionValidator.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.validator.validators;
 
-import com.opensymphony.xwork2.validator.ValidationException;
+import org.apache.struts2.validator.ValidationException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/validators/FieldValidatorSupport.java b/core/src/main/java/org/apache/struts2/validator/validators/FieldValidatorSupport.java
similarity index 93%
rename from core/src/main/java/com/opensymphony/xwork2/validator/validators/FieldValidatorSupport.java
rename to core/src/main/java/org/apache/struts2/validator/validators/FieldValidatorSupport.java
index 61d0ea7633..70bb07808e 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/validators/FieldValidatorSupport.java
+++ b/core/src/main/java/org/apache/struts2/validator/validators/FieldValidatorSupport.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.validator.validators;
 
-import com.opensymphony.xwork2.validator.FieldValidator;
+import org.apache.struts2.validator.FieldValidator;
 
 /**
  * Base class for field validators.
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidator.java b/core/src/main/java/org/apache/struts2/validator/validators/IntRangeFieldValidator.java
similarity index 98%
rename from core/src/main/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidator.java
rename to core/src/main/java/org/apache/struts2/validator/validators/IntRangeFieldValidator.java
index 25b98a1383..e3ec01944c 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/validators/IntRangeFieldValidator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.validator.validators;
 
 /**
  * 
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidator.java b/core/src/main/java/org/apache/struts2/validator/validators/LongRangeFieldValidator.java
similarity index 98%
rename from core/src/main/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidator.java
rename to core/src/main/java/org/apache/struts2/validator/validators/LongRangeFieldValidator.java
index 028b4c2f85..ce1f7bf1e4 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/validators/LongRangeFieldValidator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.validator.validators;
 
 /**
  * 
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/validators/RangeValidatorSupport.java b/core/src/main/java/org/apache/struts2/validator/validators/RangeValidatorSupport.java
similarity index 97%
rename from core/src/main/java/com/opensymphony/xwork2/validator/validators/RangeValidatorSupport.java
rename to core/src/main/java/org/apache/struts2/validator/validators/RangeValidatorSupport.java
index b713262c56..f9a9db82bf 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/validators/RangeValidatorSupport.java
+++ b/core/src/main/java/org/apache/struts2/validator/validators/RangeValidatorSupport.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.validator.validators;
 
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
-import com.opensymphony.xwork2.validator.ValidationException;
+import org.apache.struts2.validator.ValidationException;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.Collection;
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/validators/RegexFieldValidator.java b/core/src/main/java/org/apache/struts2/validator/validators/RegexFieldValidator.java
similarity index 98%
rename from core/src/main/java/com/opensymphony/xwork2/validator/validators/RegexFieldValidator.java
rename to core/src/main/java/org/apache/struts2/validator/validators/RegexFieldValidator.java
index c05dd8a024..79db732aa2 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/validators/RegexFieldValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/validators/RegexFieldValidator.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.validator.validators;
 
-import com.opensymphony.xwork2.validator.ValidationException;
+import org.apache.struts2.validator.ValidationException;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/validators/RepopulateConversionErrorFieldValidatorSupport.java b/core/src/main/java/org/apache/struts2/validator/validators/RepopulateConversionErrorFieldValidatorSupport.java
similarity index 95%
rename from core/src/main/java/com/opensymphony/xwork2/validator/validators/RepopulateConversionErrorFieldValidatorSupport.java
rename to core/src/main/java/org/apache/struts2/validator/validators/RepopulateConversionErrorFieldValidatorSupport.java
index 2e3b35d15f..7987b84f6c 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/validators/RepopulateConversionErrorFieldValidatorSupport.java
+++ b/core/src/main/java/org/apache/struts2/validator/validators/RepopulateConversionErrorFieldValidatorSupport.java
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.validator.validators;
 
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.conversion.impl.ConversionData;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.validator.ValidationException;
+import org.apache.struts2.ActionContext;
+import org.apache.struts2.ActionInvocation;
+import org.apache.struts2.conversion.impl.ConversionData;
+import org.apache.struts2.util.ValueStack;
+import org.apache.struts2.validator.ValidationException;
 import org.apache.commons.text.StringEscapeUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/validators/RequiredFieldValidator.java b/core/src/main/java/org/apache/struts2/validator/validators/RequiredFieldValidator.java
similarity index 95%
rename from core/src/main/java/com/opensymphony/xwork2/validator/validators/RequiredFieldValidator.java
rename to core/src/main/java/org/apache/struts2/validator/validators/RequiredFieldValidator.java
index b6492a9ee6..9bc94e3901 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/validators/RequiredFieldValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/validators/RequiredFieldValidator.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.validator.validators;
 
-import com.opensymphony.xwork2.validator.ValidationException;
+import org.apache.struts2.validator.ValidationException;
 
 import java.lang.reflect.Array;
 import java.util.Collection;
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidator.java b/core/src/main/java/org/apache/struts2/validator/validators/RequiredStringValidator.java
similarity index 97%
rename from core/src/main/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidator.java
rename to core/src/main/java/org/apache/struts2/validator/validators/RequiredStringValidator.java
index 9c1869932a..a8a7be1363 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/validators/RequiredStringValidator.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.validator.validators;
 
-import com.opensymphony.xwork2.validator.ValidationException;
+import org.apache.struts2.validator.ValidationException;
 
 import java.util.Collection;
 
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidator.java b/core/src/main/java/org/apache/struts2/validator/validators/ShortRangeFieldValidator.java
similarity index 98%
rename from core/src/main/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidator.java
rename to core/src/main/java/org/apache/struts2/validator/validators/ShortRangeFieldValidator.java
index b7e3cb8435..02d3244519 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/validators/ShortRangeFieldValidator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.validator.validators;
 
 /**
  * 
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/validators/StringLengthFieldValidator.java b/core/src/main/java/org/apache/struts2/validator/validators/StringLengthFieldValidator.java
similarity index 98%
rename from core/src/main/java/com/opensymphony/xwork2/validator/validators/StringLengthFieldValidator.java
rename to core/src/main/java/org/apache/struts2/validator/validators/StringLengthFieldValidator.java
index 335d675476..88bb1020a2 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/validators/StringLengthFieldValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/validators/StringLengthFieldValidator.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.validator.validators;
 
-import com.opensymphony.xwork2.validator.ValidationException;
+import org.apache.struts2.validator.ValidationException;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/validators/URLValidator.java b/core/src/main/java/org/apache/struts2/validator/validators/URLValidator.java
similarity index 97%
rename from core/src/main/java/com/opensymphony/xwork2/validator/validators/URLValidator.java
rename to core/src/main/java/org/apache/struts2/validator/validators/URLValidator.java
index 7093ab7128..be09cfb91c 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/validators/URLValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/validators/URLValidator.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.validator.validators;
 
-import com.opensymphony.xwork2.validator.ValidationException;
+import org.apache.struts2.validator.ValidationException;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java b/core/src/main/java/org/apache/struts2/validator/validators/ValidatorSupport.java
similarity index 91%
rename from core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java
rename to core/src/main/java/org/apache/struts2/validator/validators/ValidatorSupport.java
index e1a79f6b16..4362884e37 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java
+++ b/core/src/main/java/org/apache/struts2/validator/validators/ValidatorSupport.java
@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.validators;
-
-import com.opensymphony.xwork2.TextProviderFactory;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.TextParseUtil;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.validator.DelegatingValidatorContext;
-import com.opensymphony.xwork2.validator.ShortCircuitableValidator;
-import com.opensymphony.xwork2.validator.ValidationException;
-import com.opensymphony.xwork2.validator.Validator;
-import com.opensymphony.xwork2.validator.ValidatorContext;
+package org.apache.struts2.validator.validators;
+
+import org.apache.struts2.TextProviderFactory;
+import org.apache.struts2.inject.Inject;
+import org.apache.struts2.util.TextParseUtil;
+import org.apache.struts2.util.ValueStack;
+import org.apache.struts2.validator.DelegatingValidatorContext;
+import org.apache.struts2.validator.ShortCircuitableValidator;
+import org.apache.struts2.validator.ValidationException;
+import org.apache.struts2.validator.Validator;
+import org.apache.struts2.validator.ValidatorContext;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/validators/VisitorFieldValidator.java b/core/src/main/java/org/apache/struts2/validator/validators/VisitorFieldValidator.java
similarity index 93%
rename from core/src/main/java/com/opensymphony/xwork2/validator/validators/VisitorFieldValidator.java
rename to core/src/main/java/org/apache/struts2/validator/validators/VisitorFieldValidator.java
index eb07a233c6..3b4d87805e 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/validators/VisitorFieldValidator.java
+++ b/core/src/main/java/org/apache/struts2/validator/validators/VisitorFieldValidator.java
@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator.validators;
-
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.CompositeTextProvider;
-import com.opensymphony.xwork2.TextProvider;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.validator.ActionValidatorManager;
-import com.opensymphony.xwork2.validator.DelegatingValidatorContext;
-import com.opensymphony.xwork2.validator.ValidationException;
-import com.opensymphony.xwork2.validator.ValidatorContext;
+package org.apache.struts2.validator.validators;
+
+import org.apache.struts2.ActionContext;
+import org.apache.struts2.CompositeTextProvider;
+import org.apache.struts2.TextProvider;
+import org.apache.struts2.inject.Inject;
+import org.apache.struts2.util.ValueStack;
+import org.apache.struts2.validator.ActionValidatorManager;
+import org.apache.struts2.validator.DelegatingValidatorContext;
+import org.apache.struts2.validator.ValidationException;
+import org.apache.struts2.validator.ValidatorContext;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/validators/package.html b/core/src/main/java/org/apache/struts2/validator/validators/package.html
similarity index 100%
rename from core/src/main/java/com/opensymphony/xwork2/validator/validators/package.html
rename to core/src/main/java/org/apache/struts2/validator/validators/package.html
diff --git a/core/src/main/java/org/apache/struts2/views/DefaultTagLibrary.java b/core/src/main/java/org/apache/struts2/views/DefaultTagLibrary.java
index f047b09d51..3b20eec265 100644
--- a/core/src/main/java/org/apache/struts2/views/DefaultTagLibrary.java
+++ b/core/src/main/java/org/apache/struts2/views/DefaultTagLibrary.java
@@ -18,7 +18,7 @@
  */
 package org.apache.struts2.views;
 
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.util.ValueStack;
 import org.apache.struts2.views.freemarker.tags.StrutsModels;
 
 import jakarta.servlet.http.HttpServletRequest;
@@ -31,7 +31,7 @@ public class DefaultTagLibrary implements TagLibraryModelProvider {
 
     public Object getModels(ValueStack stack, HttpServletRequest req,
                             HttpServletResponse res) {
-        
+
         return new StrutsModels(stack, req, res);
     }
 
diff --git a/core/src/main/java/org/apache/struts2/views/TagLibraryModelProvider.java b/core/src/main/java/org/apache/struts2/views/TagLibraryModelProvider.java
index bf97e9486f..d208aa4686 100644
--- a/core/src/main/java/org/apache/struts2/views/TagLibraryModelProvider.java
+++ b/core/src/main/java/org/apache/struts2/views/TagLibraryModelProvider.java
@@ -18,7 +18,7 @@
  */
 package org.apache.struts2.views;
 
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.util.ValueStack;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
index 6f0594769b..9ba168ab4d 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
@@ -18,12 +18,12 @@
  */
 package org.apache.struts2.views.freemarker;
 
-import com.opensymphony.xwork2.FileManager;
-import com.opensymphony.xwork2.FileManagerFactory;
-import com.opensymphony.xwork2.inject.Container;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.ClassLoaderUtil;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.FileManager;
+import org.apache.struts2.FileManagerFactory;
+import org.apache.struts2.inject.Container;
+import org.apache.struts2.inject.Inject;
+import org.apache.struts2.util.ClassLoaderUtil;
+import org.apache.struts2.util.ValueStack;
 import freemarker.cache.ClassTemplateLoader;
 import freemarker.cache.FileTemplateLoader;
 import freemarker.cache.MultiTemplateLoader;
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
index d09d542925..aa81626966 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
@@ -18,11 +18,11 @@
  */
 package org.apache.struts2.views.freemarker;
 
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.LocaleProvider;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.ActionContext;
+import org.apache.struts2.ActionInvocation;
+import org.apache.struts2.LocaleProvider;
+import org.apache.struts2.inject.Inject;
+import org.apache.struts2.util.ValueStack;
 import freemarker.template.Configuration;
 import freemarker.template.ObjectWrapper;
 import freemarker.template.Template;
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerThemeTemplateLoader.java b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerThemeTemplateLoader.java
index e25143d63b..8ed44de698 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerThemeTemplateLoader.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerThemeTemplateLoader.java
@@ -26,7 +26,7 @@
 import org.apache.struts2.components.template.Template;
 import org.apache.struts2.components.template.TemplateEngine;
 
-import com.opensymphony.xwork2.inject.Inject;
+import org.apache.struts2.inject.Inject;
 
 import freemarker.cache.TemplateLoader;
 
@@ -63,10 +63,10 @@ public Object findTemplateSource(String name) throws IOException {
         }
 
         Template template = new Template(
-            name.substring(0, tokenIndex - 1), 
-            name.substring(tokenIndex + themeExpansionToken.length(), themeEndIndex), 
+            name.substring(0, tokenIndex - 1),
+            name.substring(tokenIndex + themeExpansionToken.length(), themeEndIndex),
             name.substring(themeEndIndex + 1));
-        
+
         List