From 974e051bc5e2541261c44cd6fc27717dfcb3267b Mon Sep 17 00:00:00 2001 From: Antonio Petrelli Date: Sun, 27 Apr 2008 13:41:38 +0000 Subject: [PATCH] WW-2147 Fixed license headers where needed. Re-enabled RAT plugin and fixed its configuration. git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@651946 13f79535-47bb-0310-9956-ffa450edef68 --- apps/pom.xml | 27 ++++++++++-- apps/rest-showcase/pom.xml | 23 ++++++++++- core/pom.xml | 3 +- .../java/org/apache/struts2/RequestUtils.java | 1 + .../apache/struts2/ServletActionContext.java | 1 + .../org/apache/struts2/StrutsConstants.java | 1 + .../org/apache/struts2/StrutsException.java | 1 + .../org/apache/struts2/StrutsStatics.java | 1 + .../struts2/components/ActionComponent.java | 1 + .../struts2/components/ActionError.java | 1 + .../struts2/components/ActionMessage.java | 1 + .../org/apache/struts2/components/Anchor.java | 1 + .../struts2/components/AppendIterator.java | 1 + .../org/apache/struts2/components/Bean.java | 1 + .../apache/struts2/components/Checkbox.java | 1 + .../struts2/components/CheckboxList.java | 1 + .../struts2/components/ClosingUIBean.java | 1 + .../apache/struts2/components/ComboBox.java | 1 + .../apache/struts2/components/Component.java | 1 + .../struts2/components/ContextBean.java | 1 + .../org/apache/struts2/components/Date.java | 1 + .../org/apache/struts2/components/Debug.java | 1 + .../org/apache/struts2/components/Div.java | 1 + .../struts2/components/DoubleListUIBean.java | 1 + .../struts2/components/DoubleSelect.java | 1 + .../org/apache/struts2/components/Else.java | 1 + .../org/apache/struts2/components/ElseIf.java | 1 + .../apache/struts2/components/FieldError.java | 1 + .../org/apache/struts2/components/File.java | 1 + .../org/apache/struts2/components/Form.java | 1 + .../apache/struts2/components/FormButton.java | 1 + .../struts2/components/GenericUIBean.java | 1 + .../org/apache/struts2/components/Head.java | 1 + .../org/apache/struts2/components/Hidden.java | 1 + .../org/apache/struts2/components/I18n.java | 1 + .../org/apache/struts2/components/If.java | 1 + .../apache/struts2/components/Include.java | 1 + .../components/InputTransferSelect.java | 1 + .../struts2/components/IteratorComponent.java | 1 + .../org/apache/struts2/components/Label.java | 1 + .../apache/struts2/components/ListUIBean.java | 1 + .../struts2/components/MergeIterator.java | 1 + .../apache/struts2/components/OptGroup.java | 1 + .../components/OptionTransferSelect.java | 1 + .../org/apache/struts2/components/Param.java | 1 + .../apache/struts2/components/Password.java | 1 + .../apache/struts2/components/Property.java | 1 + .../org/apache/struts2/components/Push.java | 1 + .../org/apache/struts2/components/Radio.java | 1 + .../org/apache/struts2/components/Reset.java | 1 + .../org/apache/struts2/components/Select.java | 1 + .../components/ServletUrlRenderer.java | 1 + .../org/apache/struts2/components/Set.java | 1 + .../org/apache/struts2/components/Submit.java | 1 + .../org/apache/struts2/components/Text.java | 1 + .../apache/struts2/components/TextArea.java | 1 + .../apache/struts2/components/TextField.java | 1 + .../org/apache/struts2/components/Token.java | 1 + .../org/apache/struts2/components/UIBean.java | 1 + .../org/apache/struts2/components/URL.java | 1 + .../struts2/components/UpDownSelect.java | 1 + .../struts2/components/UrlRenderer.java | 1 + .../template/BaseTemplateEngine.java | 1 + .../template/FreemarkerTemplateEngine.java | 1 + .../template/JspTemplateEngine.java | 1 + .../struts2/components/template/Template.java | 1 + .../components/template/TemplateEngine.java | 1 + .../template/TemplateEngineManager.java | 1 + .../template/TemplateRenderingContext.java | 1 + .../template/VelocityTemplateEngine.java | 1 + .../struts2/config/BeanSelectionProvider.java | 1 + .../config/DefaultPropertiesProvider.java | 1 + .../struts2/config/DefaultSettings.java | 1 + .../struts2/config/DelegatingSettings.java | 1 + ...LegacyPropertiesConfigurationProvider.java | 1 + .../org/apache/struts2/config/NullResult.java | 1 + .../struts2/config/PropertiesSettings.java | 1 + .../config/ServletContextSingleton.java | 1 + .../org/apache/struts2/config/Settings.java | 1 + .../StrutsXmlConfigurationProvider.java | 1 + .../dispatcher/ActionContextCleanUp.java | 1 + .../struts2/dispatcher/ApplicationMap.java | 1 + .../dispatcher/DefaultActionSupport.java | 1 + .../apache/struts2/dispatcher/Dispatcher.java | 1 + .../dispatcher/DispatcherListener.java | 1 + .../struts2/dispatcher/FilterDispatcher.java | 1 + .../FilterDispatcherCompatWeblogic61.java | 1 + .../struts2/dispatcher/HttpHeaderResult.java | 1 + .../struts2/dispatcher/PlainTextResult.java | 1 + .../apache/struts2/dispatcher/RequestMap.java | 1 + .../ServletActionRedirectResult.java | 1 + .../dispatcher/ServletDispatcherResult.java | 1 + .../dispatcher/ServletRedirectResult.java | 1 + .../apache/struts2/dispatcher/SessionMap.java | 1 + .../struts2/dispatcher/StreamResult.java | 1 + .../dispatcher/StrutsRequestWrapper.java | 1 + .../dispatcher/StrutsResultSupport.java | 1 + .../struts2/dispatcher/VelocityResult.java | 1 + .../dispatcher/mapper/ActionMapper.java | 1 + .../dispatcher/mapper/ActionMapping.java | 1 + .../mapper/CompositeActionMapper.java | 1 + .../mapper/DefaultActionMapper.java | 1 + .../dispatcher/mapper/ParameterAction.java | 1 + .../mapper/Restful2ActionMapper.java | 1 + .../mapper/RestfulActionMapper.java | 1 + .../multipart/JakartaMultiPartRequest.java | 1 + .../multipart/MultiPartRequest.java | 1 + .../multipart/MultiPartRequestWrapper.java | 1 + .../struts2/impl/StrutsActionProxy.java | 1 + .../impl/StrutsActionProxyFactory.java | 1 + .../struts2/impl/StrutsObjectFactory.java | 1 + .../ActionMappingParametersInteceptor.java | 1 + .../struts2/interceptor/ApplicationAware.java | 1 + .../interceptor/BackgroundProcess.java | 1 + .../interceptor/CheckboxInterceptor.java | 1 + .../interceptor/ClearSessionInterceptor.java | 2 + .../interceptor/CookieInterceptor.java | 1 + .../struts2/interceptor/CookiesAware.java | 1 + .../interceptor/CreateSessionInterceptor.java | 1 + .../ExecuteAndWaitInterceptor.java | 1 + .../interceptor/FileUploadInterceptor.java | 1 + .../interceptor/MessageStoreInterceptor.java | 1 + .../struts2/interceptor/NoParameters.java | 1 + .../struts2/interceptor/ParameterAware.java | 1 + .../struts2/interceptor/PrincipalAware.java | 1 + .../struts2/interceptor/PrincipalProxy.java | 1 + .../ProfilingActivationInterceptor.java | 1 + .../struts2/interceptor/RolesInterceptor.java | 1 + .../struts2/interceptor/ScopeInterceptor.java | 1 + .../interceptor/ServletConfigInterceptor.java | 1 + .../interceptor/ServletRequestAware.java | 1 + .../interceptor/ServletResponseAware.java | 1 + .../struts2/interceptor/SessionAware.java | 1 + .../StrutsConversionErrorInterceptor.java | 1 + .../struts2/interceptor/TokenInterceptor.java | 1 + .../TokenSessionStoreInterceptor.java | 1 + .../debugging/DebuggingInterceptor.java | 1 + .../debugging/ObjectToHTMLWriter.java | 1 + .../debugging/PrettyPrintWriter.java | 1 + .../AnnotationValidationInterceptor.java | 1 + .../validation/JSONValidationInterceptor.java | 1 + .../validation/SkipValidation.java | 1 + .../interceptor/ServletPrincipalProxy.java | 1 + .../struts2/util/AppendIteratorFilter.java | 1 + .../org/apache/struts2/util/AttributeMap.java | 1 + .../apache/struts2/util/ClassLoaderUtils.java | 1 + .../org/apache/struts2/util/ContainUtil.java | 1 + .../java/org/apache/struts2/util/Counter.java | 1 + .../apache/struts2/util/DateFormatter.java | 1 + .../util/FastByteArrayOutputStream.java | 1 + .../struts2/util/InvocationSessionStore.java | 1 + .../struts2/util/IteratorFilterSupport.java | 1 + .../struts2/util/IteratorGenerator.java | 1 + .../org/apache/struts2/util/ListEntry.java | 1 + .../org/apache/struts2/util/MakeIterator.java | 1 + .../struts2/util/MergeIteratorFilter.java | 1 + .../util/ObjectFactoryDestroyable.java | 1 + .../org/apache/struts2/util/PrefixTrie.java | 1 + .../struts2/util/ServletContextAware.java | 1 + .../struts2/util/SortIteratorFilter.java | 1 + .../struts2/util/StrutsTestCaseHelper.java | 1 + .../struts2/util/StrutsTypeConverter.java | 1 + .../org/apache/struts2/util/StrutsUtil.java | 1 + .../struts2/util/SubsetIteratorFilter.java | 1 + .../org/apache/struts2/util/TabbedPane.java | 1 + .../struts2/util/TextProviderHelper.java | 21 ++++++++++ .../java/org/apache/struts2/util/Timer.java | 1 + .../org/apache/struts2/util/TokenHelper.java | 1 + .../java/org/apache/struts2/util/URLBean.java | 1 + .../struts2/util/VelocityStrutsUtil.java | 1 + .../struts2/views/DefaultTagLibrary.java | 1 + .../struts2/views/JspSupportServlet.java | 1 + .../org/apache/struts2/views/TagLibrary.java | 1 + .../views/freemarker/FreemarkerManager.java | 1 + .../views/freemarker/FreemarkerResult.java | 1 + .../views/freemarker/ScopesHashModel.java | 1 + .../views/freemarker/StrutsBeanWrapper.java | 1 + .../freemarker/StrutsClassTemplateLoader.java | 1 + .../freemarker/tags/ActionErrorModel.java | 1 + .../freemarker/tags/ActionMessageModel.java | 1 + .../views/freemarker/tags/ActionModel.java | 1 + .../views/freemarker/tags/AnchorModel.java | 1 + .../views/freemarker/tags/BeanModel.java | 1 + .../views/freemarker/tags/CallbackWriter.java | 1 + .../freemarker/tags/CheckboxListModel.java | 1 + .../views/freemarker/tags/CheckboxModel.java | 1 + .../views/freemarker/tags/ComboBoxModel.java | 1 + .../views/freemarker/tags/ComponentModel.java | 1 + .../views/freemarker/tags/DateModel.java | 1 + .../views/freemarker/tags/DivModel.java | 1 + .../freemarker/tags/DoubleSelectModel.java | 1 + .../views/freemarker/tags/ElseIfModel.java | 1 + .../views/freemarker/tags/ElseModel.java | 1 + .../freemarker/tags/FieldErrorModel.java | 1 + .../views/freemarker/tags/FileModel.java | 1 + .../views/freemarker/tags/FormModel.java | 1 + .../views/freemarker/tags/HeadModel.java | 1 + .../views/freemarker/tags/HiddenModel.java | 1 + .../views/freemarker/tags/I18nModel.java | 1 + .../views/freemarker/tags/IfModel.java | 1 + .../views/freemarker/tags/IncludeModel.java | 1 + .../tags/InputTransferSelectModel.java | 1 + .../views/freemarker/tags/IteratorModel.java | 1 + .../views/freemarker/tags/LabelModel.java | 1 + .../views/freemarker/tags/OptGroupModel.java | 1 + .../tags/OptionTransferSelectModel.java | 1 + .../views/freemarker/tags/ParamModel.java | 1 + .../views/freemarker/tags/PasswordModel.java | 1 + .../views/freemarker/tags/PropertyModel.java | 1 + .../views/freemarker/tags/PushModel.java | 1 + .../views/freemarker/tags/RadioModel.java | 1 + .../views/freemarker/tags/ResetModel.java | 1 + .../views/freemarker/tags/SelectModel.java | 1 + .../views/freemarker/tags/SetModel.java | 1 + .../views/freemarker/tags/StrutsModels.java | 1 + .../views/freemarker/tags/SubmitModel.java | 1 + .../views/freemarker/tags/TagModel.java | 1 + .../views/freemarker/tags/TextAreaModel.java | 1 + .../views/freemarker/tags/TextFieldModel.java | 1 + .../views/freemarker/tags/TextModel.java | 1 + .../views/freemarker/tags/TokenModel.java | 1 + .../views/freemarker/tags/URLModel.java | 1 + .../freemarker/tags/UpDownSelectModel.java | 1 + .../apache/struts2/views/jsp/ActionTag.java | 1 + .../org/apache/struts2/views/jsp/BeanTag.java | 1 + .../views/jsp/ComponentTagSupport.java | 1 + .../struts2/views/jsp/ContextBeanTag.java | 1 + .../org/apache/struts2/views/jsp/DateTag.java | 1 + .../apache/struts2/views/jsp/ElseIfTag.java | 1 + .../org/apache/struts2/views/jsp/ElseTag.java | 1 + .../org/apache/struts2/views/jsp/I18nTag.java | 1 + .../org/apache/struts2/views/jsp/IfTag.java | 1 + .../apache/struts2/views/jsp/IncludeTag.java | 1 + .../struts2/views/jsp/IteratorStatus.java | 1 + .../apache/struts2/views/jsp/IteratorTag.java | 1 + .../apache/struts2/views/jsp/ParamTag.java | 1 + .../apache/struts2/views/jsp/PropertyTag.java | 1 + .../org/apache/struts2/views/jsp/PushTag.java | 1 + .../org/apache/struts2/views/jsp/SetTag.java | 1 + .../views/jsp/StrutsBodyTagSupport.java | 1 + .../apache/struts2/views/jsp/TagUtils.java | 1 + .../org/apache/struts2/views/jsp/TextTag.java | 1 + .../org/apache/struts2/views/jsp/URLTag.java | 1 + .../views/jsp/iterator/AppendIteratorTag.java | 1 + .../jsp/iterator/IteratorGeneratorTag.java | 1 + .../views/jsp/iterator/MergeIteratorTag.java | 1 + .../views/jsp/iterator/SortIteratorTag.java | 1 + .../views/jsp/iterator/SubsetIteratorTag.java | 1 + .../views/jsp/ui/AbstractClosingTag.java | 1 + .../views/jsp/ui/AbstractDoubleListTag.java | 1 + .../struts2/views/jsp/ui/AbstractListTag.java | 1 + .../views/jsp/ui/AbstractRequiredListTag.java | 1 + .../struts2/views/jsp/ui/AbstractUITag.java | 1 + .../struts2/views/jsp/ui/ActionErrorTag.java | 1 + .../views/jsp/ui/ActionMessageTag.java | 1 + .../struts2/views/jsp/ui/AnchorTag.java | 1 + .../struts2/views/jsp/ui/CheckboxListTag.java | 1 + .../struts2/views/jsp/ui/CheckboxTag.java | 1 + .../struts2/views/jsp/ui/ComboBoxTag.java | 1 + .../struts2/views/jsp/ui/ComponentTag.java | 1 + .../apache/struts2/views/jsp/ui/DebugTag.java | 1 + .../apache/struts2/views/jsp/ui/DivTag.java | 1 + .../struts2/views/jsp/ui/DoubleSelectTag.java | 1 + .../struts2/views/jsp/ui/FieldErrorTag.java | 1 + .../apache/struts2/views/jsp/ui/FileTag.java | 1 + .../apache/struts2/views/jsp/ui/FormTag.java | 1 + .../apache/struts2/views/jsp/ui/HeadTag.java | 1 + .../struts2/views/jsp/ui/HiddenTag.java | 1 + .../views/jsp/ui/InputTransferSelectTag.java | 1 + .../apache/struts2/views/jsp/ui/LabelTag.java | 1 + .../apache/struts2/views/jsp/ui/OgnlTool.java | 1 + .../struts2/views/jsp/ui/OptGroupTag.java | 1 + .../views/jsp/ui/OptionTransferSelectTag.java | 1 + .../struts2/views/jsp/ui/PasswordTag.java | 1 + .../apache/struts2/views/jsp/ui/RadioTag.java | 1 + .../apache/struts2/views/jsp/ui/ResetTag.java | 1 + .../struts2/views/jsp/ui/SelectTag.java | 1 + .../struts2/views/jsp/ui/SubmitTag.java | 1 + .../struts2/views/jsp/ui/TextFieldTag.java | 1 + .../struts2/views/jsp/ui/TextareaTag.java | 1 + .../apache/struts2/views/jsp/ui/TokenTag.java | 1 + .../struts2/views/jsp/ui/UpDownSelectTag.java | 1 + .../struts2/views/util/ContextUtil.java | 1 + .../struts2/views/util/ResourceUtil.java | 1 + .../apache/struts2/views/util/TextUtil.java | 26 +++++++----- .../apache/struts2/views/util/UrlHelper.java | 1 + .../views/velocity/StrutsResourceLoader.java | 1 + .../views/velocity/StrutsVelocityContext.java | 1 + .../views/velocity/VelocityManager.java | 1 + .../components/AbstractDirective.java | 1 + .../velocity/components/ActionDirective.java | 1 + .../components/ActionErrorDirective.java | 1 + .../components/ActionMessageDirective.java | 1 + .../velocity/components/AnchorDirective.java | 1 + .../velocity/components/BeanDirective.java | 1 + .../components/CheckBoxDirective.java | 1 + .../components/CheckBoxListDirective.java | 1 + .../components/ComboBoxDirective.java | 1 + .../components/ComponentDirective.java | 1 + .../velocity/components/DateDirective.java | 1 + .../velocity/components/DivDirective.java | 1 + .../components/DoubleSelectDirective.java | 1 + .../components/FieldErrorDirective.java | 1 + .../velocity/components/FileDirective.java | 1 + .../velocity/components/FormDirective.java | 1 + .../velocity/components/HeadDirective.java | 1 + .../velocity/components/HiddenDirective.java | 1 + .../velocity/components/I18nDirective.java | 1 + .../velocity/components/IncludeDirective.java | 1 + .../InputTransferSelectDirective.java | 1 + .../velocity/components/LabelDirective.java | 1 + .../components/OptGroupDirective.java | 1 + .../OptionTransferSelectDirective.java | 1 + .../velocity/components/ParamDirective.java | 1 + .../components/PasswordDirective.java | 1 + .../components/PropertyDirective.java | 1 + .../velocity/components/PushDirective.java | 1 + .../velocity/components/RadioDirective.java | 1 + .../velocity/components/ResetDirective.java | 1 + .../velocity/components/SelectDirective.java | 1 + .../velocity/components/SetDirective.java | 1 + .../velocity/components/SubmitDirective.java | 1 + .../components/TextAreaDirective.java | 1 + .../velocity/components/TextDirective.java | 1 + .../components/TextFieldDirective.java | 1 + .../velocity/components/TokenDirective.java | 1 + .../velocity/components/URLDirective.java | 1 + .../components/UpDownSelectDirective.java | 1 + .../views/xslt/AbstractAdapterElement.java | 1 + .../views/xslt/AbstractAdapterNode.java | 1 + .../struts2/views/xslt/AdapterFactory.java | 1 + .../struts2/views/xslt/AdapterNode.java | 1 + .../struts2/views/xslt/ArrayAdapter.java | 1 + .../struts2/views/xslt/BeanAdapter.java | 1 + .../struts2/views/xslt/CollectionAdapter.java | 1 + .../apache/struts2/views/xslt/MapAdapter.java | 1 + .../struts2/views/xslt/ProxyAttrAdapter.java | 1 + .../views/xslt/ProxyElementAdapter.java | 1 + .../struts2/views/xslt/ProxyNamedNodeMap.java | 1 + .../struts2/views/xslt/ProxyNodeAdapter.java | 1 + .../views/xslt/ProxyTextNodeAdapter.java | 1 + .../views/xslt/ServletURIResolver.java | 1 + .../views/xslt/SimpleAdapterDocument.java | 1 + .../struts2/views/xslt/SimpleNodeList.java | 1 + .../struts2/views/xslt/SimpleTextNode.java | 1 + .../struts2/views/xslt/StringAdapter.java | 1 + .../apache/struts2/views/xslt/XSLTResult.java | 1 + .../org/apache/struts2/default.properties | 20 +++++++++ .../apache/struts2/struts-messages.properties | 20 +++++++++ .../struts2/struts-messages_da.properties | 20 +++++++++ .../struts2/struts-messages_de.properties | 20 +++++++++ .../struts2/struts-messages_pl.properties | 20 +++++++++ .../struts2/struts-messages_pt.properties | 32 ++++++++++++--- core/src/main/resources/struts-2.0.dtd | 1 - core/src/main/resources/struts-default.xml | 1 - .../template/css_xhtml/theme.properties | 20 +++++++++ .../resources/template/xhtml/theme.properties | 20 +++++++++ .../confluence/ww-template-autoexport.html | 22 ++++++++++ .../struts2/ExecutionCountTestAction.java | 1 + .../org/apache/struts2/RequestUtilsTest.java | 1 + .../struts2/ServletActionContextTest.java | 1 + .../java/org/apache/struts2/SomeEnum.java | 1 + .../org/apache/struts2/StrutsTestCase.java | 1 + .../java/org/apache/struts2/TestAction.java | 1 + .../apache/struts2/TestActionTagResult.java | 1 + .../struts2/TestConfigurationProvider.java | 1 + .../java/org/apache/struts2/TestResult.java | 1 + .../java/org/apache/struts2/TestUtils.java | 1 + .../components/ActionComponentTest.java | 1 + .../struts2/components/ComponentTest.java | 1 + .../struts2/components/FormButtonTest.java | 1 + .../apache/struts2/components/FormTest.java | 1 + .../struts2/components/PropertyTest.java | 1 + .../apache/struts2/components/UIBeanTest.java | 1 + .../struts2/components/UIComponentTest.java | 1 + .../template/BaseTemplateEngineTest.java | 1 + .../config/BeanSelectionProviderTest.java | 1 + .../apache/struts2/config/SettingsTest.java | 1 + .../apache/struts2/config/TestSettings.java | 1 + .../dispatcher/ActionContextCleanUpTest.java | 1 + .../struts2/dispatcher/DispatcherTest.java | 1 + .../dispatcher/FilterDispatcherTest.java | 1 + .../apache/struts2/dispatcher/FilterTest.java | 1 + .../dispatcher/HttpHeaderResultTest.java | 1 + .../struts2/dispatcher/NullActionMapper.java | 1 + .../dispatcher/PlainTextResultTest.java | 1 + .../ServletActionRedirectResultTest.java | 1 + ...ervletDispatchedTestAssertInterceptor.java | 1 + .../ServletDispatcherResultTest.java | 1 + .../dispatcher/ServletRedirectResultTest.java | 1 + .../struts2/dispatcher/SessionMapTest.java | 1 + .../struts2/dispatcher/StreamResultTest.java | 1 + .../dispatcher/StrutsResultSupportTest.java | 1 + .../dispatcher/VelocityResultTest.java | 1 + .../mapper/CompositeActionMapperTest.java | 1 + .../mapper/DefaultActionMapperTest.java | 1 + .../mapper/Restful2ActionMapperTest.java | 1 + .../mapper/RestfulActionMapperTest.java | 1 + .../interceptor/CheckboxInterceptorTest.java | 3 +- .../ClearSessionInterceptorTest.java | 3 ++ .../interceptor/CookieInterceptorTest.java | 1 + .../CreateSessionInterceptorTest.java | 1 + .../ExecuteAndWaitDelayAction.java | 1 + .../ExecuteAndWaitInterceptorTest.java | 1 + .../FileUploadInterceptorTest.java | 1 + .../MessageStoreInterceptorTest.java | 1 + .../interceptor/RolesInterceptorTest.java | 1 + .../ServletConfigInterceptorTest.java | 1 + .../StrutsConversionErrorInterceptorTest.java | 1 + .../interceptor/TokenInterceptorTest.java | 1 + .../TokenSessionStoreInterceptorTest.java | 1 + .../AnnotationValidationInterceptorTest.java | 1 + .../JSONValidationInterceptorTest.java | 3 +- .../apache/struts2/util/ContainUtilTest.java | 1 + .../org/apache/struts2/util/CounterTest.java | 1 + .../util/InvocationSessionStoreTest.java | 1 + .../apache/struts2/util/PrefixTrieTest.java | 1 + .../struts2/util/StrutsTypeConverterTest.java | 1 + .../apache/struts2/util/StrutsUtilTest.java | 1 + .../apache/struts2/util/TokenHelperTest.java | 1 + .../views/TemplateEngineManagerTest.java | 1 + .../freemarker/FreeMarkerResultTest.java | 1 + .../freemarker/FreemarkerManagerTest.java | 1 + .../views/freemarker/FreemarkerTest.java | 1 + .../struts2/views/freemarker/TestAction.java | 1 + .../struts2/views/freemarker/TestBean.java | 1 + .../views/freemarker/tags/TagModelTest.java | 1 + .../struts2/views/jsp/AbstractTagTest.java | 1 + .../struts2/views/jsp/AbstractUITagTest.java | 1 + .../struts2/views/jsp/ActionTagTest.java | 1 + .../struts2/views/jsp/AnchorTagTest.java | 1 + .../views/jsp/AppendIteratorTagTest.java | 1 + .../apache/struts2/views/jsp/BeanTagTest.java | 1 + .../struts2/views/jsp/DynAttribsTest.java | 3 +- .../struts2/views/jsp/ElseIfTagTest.java | 1 + .../apache/struts2/views/jsp/ElseTagTest.java | 1 + .../apache/struts2/views/jsp/I18nTagTest.java | 21 ++++++++++ .../apache/struts2/views/jsp/IfTagTest.java | 1 + .../struts2/views/jsp/IncludeTagTest.java | 1 + .../views/jsp/IteratorGeneratorTagTest.java | 1 + .../struts2/views/jsp/IteratorTagTest.java | 1 + .../views/jsp/MergeIteratorTagTest.java | 1 + .../struts2/views/jsp/PropertyTagTest.java | 1 + .../apache/struts2/views/jsp/PushTagTest.java | 1 + .../apache/struts2/views/jsp/SetTagTest.java | 1 + .../views/jsp/SortIteratorTagTest.java | 1 + .../views/jsp/StrutsMockBodyContent.java | 1 + .../jsp/StrutsMockHttpServletRequest.java | 1 + .../jsp/StrutsMockHttpServletResponse.java | 1 + .../views/jsp/StrutsMockHttpSession.java | 1 + .../views/jsp/StrutsMockJspWriter.java | 1 + .../views/jsp/StrutsMockPageContext.java | 1 + .../views/jsp/StrutsMockServletContext.java | 1 + .../views/jsp/SubsetIteratorTagTest.java | 1 + .../apache/struts2/views/jsp/TextTagTest.java | 1 + .../apache/struts2/views/jsp/URLTagTest.java | 1 + .../views/jsp/ui/ActionErrorTagTest.java | 1 + .../views/jsp/ui/ActionMessageTagTest.java | 1 + .../struts2/views/jsp/ui/AnchorTest.java | 1 + .../views/jsp/ui/CheckboxListTest.java | 1 + .../struts2/views/jsp/ui/CheckboxTest.java | 1 + .../struts2/views/jsp/ui/ComboBoxTest.java | 1 + .../struts2/views/jsp/ui/ComponentTest.java | 1 + .../struts2/views/jsp/ui/DateTagTest.java | 1 + .../apache/struts2/views/jsp/ui/DivTest.java | 1 + .../views/jsp/ui/DoubleSelectTest.java | 1 + .../views/jsp/ui/FieldErrorTagTest.java | 1 + .../apache/struts2/views/jsp/ui/FileTest.java | 1 + .../struts2/views/jsp/ui/FormTagTest.java | 1 + .../struts2/views/jsp/ui/HeadTagTest.java | 1 + .../struts2/views/jsp/ui/HiddenTest.java | 1 + .../jsp/ui/InputTransferSelectTagTest.java | 1 + .../views/jsp/ui/IntValidationAction.java | 21 ++++++++++ .../struts2/views/jsp/ui/JspTemplateTest.java | 1 + .../struts2/views/jsp/ui/LabelTest.java | 1 + .../apache/struts2/views/jsp/ui/MockTag.java | 1 + .../struts2/views/jsp/ui/OptGroupTest.java | 1 + .../jsp/ui/OptionTransferSelectTagTest.java | 1 + .../struts2/views/jsp/ui/PasswordTest.java | 1 + .../struts2/views/jsp/ui/RadioTest.java | 1 + .../struts2/views/jsp/ui/ResetTest.java | 1 + .../struts2/views/jsp/ui/SelectTest.java | 1 + .../views/jsp/ui/StrutsBodyContent.java | 1 + .../struts2/views/jsp/ui/SubmitTest.java | 1 + .../struts2/views/jsp/ui/TestAction1.java | 1 + .../struts2/views/jsp/ui/TextareaTest.java | 1 + .../struts2/views/jsp/ui/TextfieldTest.java | 1 + .../struts2/views/jsp/ui/TokenTagTest.java | 1 + .../struts2/views/jsp/ui/TooltipTest.java | 1 + .../views/jsp/ui/UpDownSelectTagTest.java | 1 + .../org/apache/struts2/views/jsp/ui/User.java | 1 + .../struts2/views/util/ContextUtilTest.java | 1 + .../struts2/views/util/ResourceUtilTest.java | 1 + .../struts2/views/util/TextUtilTest.java | 7 ++-- .../struts2/views/util/UrlHelperTest.java | 1 + .../struts2/views/xslt/XSLTResultTest.java | 1 + core/src/test/resources/XSLTResultTest5.xsl | 2 +- core/src/test/resources/log4j.properties | 20 +++++++++ .../apache/struts2/TestAction-validation.xml | 3 +- .../org/apache/struts2/TestAction.properties | 20 +++++++++ .../components/template/dummy.properties | 20 +++++++++ .../theme1/themeThroughClassPath.properties | 20 +++++++++ .../theme1/themeThroughFileSystem.properties | 20 +++++++++ .../struts2/components/tempo.properties | 20 +++++++++ .../apache/struts2/dispatcher/someJspFile.jsp | 22 ++++++++++ .../FileUploadInterceptor.properties | 20 +++++++++ .../org/apache/struts2/othertest.properties | 20 +++++++++ core/src/test/resources/struts.properties | 20 +++++++++ .../resources/template/test/Component.ftl | 3 +- .../test/resources/template/test/checkbox.jsp | 3 +- core/src/test/resources/test.properties | 20 +++++++++ .../test/resources/testmessages.properties | 20 +++++++++ .../test/resources/testmessages2.properties | 20 +++++++++ .../codebehind/CodebehindUnknownHandler.java | 1 + .../org/apache/struts2/config/Action.java | 1 + .../config/ClasspathPackageProvider.java | 1 + .../org/apache/struts2/config/Namespace.java | 1 + .../apache/struts2/config/ParentPackage.java | 1 + .../org/apache/struts2/config/Result.java | 1 + .../org/apache/struts2/config/Results.java | 1 + .../src/main/resources/struts-plugin.xml | 1 - .../CodebehindUnknownHandlerTest.java | 1 + .../struts2/config/AnnotatedAction.java | 1 + .../config/AnotherAnnotatedObject.java | 1 + .../config/ClasspathPackageProviderTest.java | 1 + .../struts2/config/CustomNamespaceAction.java | 1 + .../config/CustomParentPackageAction.java | 1 + .../struts2/config/cltest/ActionImpl.java | 1 + .../config/cltest/OneResultAction.java | 1 + .../config/cltest/TwoResultAction.java | 1 + .../config_browser/ActionNamesAction.java | 1 + .../config_browser/ConfigurationHelper.java | 1 + .../config_browser/ListValidatorsAction.java | 1 + .../config_browser/ShowBeansAction.java | 1 + .../config_browser/ShowConfigAction.java | 1 + .../config_browser/ShowConstantsAction.java | 1 + .../config_browser/ShowJarsAction.java | 1 + .../config_browser/ShowValidatorAction.java | 1 + .../config-browser/config-styles.css | 21 ++++++++++ .../src/main/resources/struts-plugin.xml | 1 - plugins/dojo/pom.xml | 2 - .../dojo/components/AbstractRemoteBean.java | 26 +++++++----- .../dojo/components/AbstractValidateBean.java | 26 +++++++----- .../struts2/dojo/components/Anchor.java | 1 + .../dojo/components/Autocompleter.java | 1 + .../apache/struts2/dojo/components/Bind.java | 1 + .../dojo/components/DateTimePicker.java | 1 + .../apache/struts2/dojo/components/Div.java | 1 + .../apache/struts2/dojo/components/Head.java | 1 + .../struts2/dojo/components/RemoteBean.java | 1 + .../struts2/dojo/components/Submit.java | 1 + .../struts2/dojo/components/TabbedPanel.java | 1 + .../struts2/dojo/components/TextArea.java | 1 + .../apache/struts2/dojo/components/Tree.java | 1 + .../struts2/dojo/components/TreeNode.java | 1 + .../struts2/dojo/views/DojoTagLibrary.java | 1 + .../views/freemarker/tags/AnchorModel.java | 26 +++++++----- .../freemarker/tags/AutocompleterModel.java | 1 + .../dojo/views/freemarker/tags/BindModel.java | 1 + .../freemarker/tags/DateTimePickerModel.java | 26 +++++++----- .../dojo/views/freemarker/tags/DivModel.java | 26 +++++++----- .../views/freemarker/tags/DojoModels.java | 26 +++++++----- .../dojo/views/freemarker/tags/HeadModel.java | 1 + .../views/freemarker/tags/SubmitModel.java | 26 +++++++----- .../freemarker/tags/TabbedPanelModel.java | 1 + .../views/freemarker/tags/TextAreaModel.java | 1 + .../dojo/views/freemarker/tags/TreeModel.java | 1 + .../views/freemarker/tags/TreeNodeModel.java | 1 + .../dojo/views/jsp/ui/AbstractRemoteTag.java | 26 +++++++----- .../views/jsp/ui/AbstractValidateTag.java | 26 +++++++----- .../struts2/dojo/views/jsp/ui/AnchorTag.java | 1 + .../dojo/views/jsp/ui/AutocompleterTag.java | 1 + .../struts2/dojo/views/jsp/ui/BindTag.java | 1 + .../dojo/views/jsp/ui/DateTimePickerTag.java | 1 + .../struts2/dojo/views/jsp/ui/DivTag.java | 1 + .../struts2/dojo/views/jsp/ui/HeadTag.java | 1 + .../struts2/dojo/views/jsp/ui/SubmitTag.java | 1 + .../dojo/views/jsp/ui/TabbedPanelTag.java | 1 + .../dojo/views/jsp/ui/TextareaTag.java | 1 + .../dojo/views/jsp/ui/TreeNodeTag.java | 1 + .../struts2/dojo/views/jsp/ui/TreeTag.java | 1 + .../velocity/components/AnchorDirective.java | 1 + .../components/AutocompleterDirective.java | 1 + .../velocity/components/BindDirective.java | 1 + .../components/DateTimePickerDirective.java | 26 +++++++----- .../velocity/components/DivDirective.java | 1 + .../components/DojoAbstractDirective.java | 1 + .../velocity/components/HeadDirective.java | 1 + .../velocity/components/SubmitDirective.java | 1 + .../components/TabbedPanelDirective.java | 1 + .../components/TextAreaDirective.java | 1 + .../velocity/components/TreeDirective.java | 1 + .../components/TreeNodeDirective.java | 1 + .../dojo/struts/widget/StrutsTabContainer.js | 1 + .../resources/template/ajax/theme.properties | 20 +++++++++ .../org/apache/struts2/dojo/TestAction.java | 1 + .../dojo/views/jsp/ui/AbstractTagTest.java | 1 + .../dojo/views/jsp/ui/AbstractUITagTest.java | 1 + .../struts2/dojo/views/jsp/ui/AnchorTest.java | 1 + .../dojo/views/jsp/ui/AutocompleterTest.java | 1 + .../struts2/dojo/views/jsp/ui/BindTest.java | 1 + .../struts2/dojo/views/jsp/ui/Category.java | 1 + .../views/jsp/ui/DateTimePickerTagTest.java | 1 + .../struts2/dojo/views/jsp/ui/DivTest.java | 1 + .../dojo/views/jsp/ui/HeadTagTest.java | 1 + .../jsp/ui/StrutsMockHttpServletRequest.java | 1 + .../jsp/ui/StrutsMockHttpServletResponse.java | 1 + .../views/jsp/ui/StrutsMockHttpSession.java | 1 + .../views/jsp/ui/StrutsMockJspWriter.java | 1 + .../views/jsp/ui/StrutsMockPageContext.java | 1 + .../jsp/ui/StrutsMockServletContext.java | 1 + .../dojo/views/jsp/ui/SubmitAjaxTest.java | 26 +++++++----- .../dojo/views/jsp/ui/TabbedPanelTagTest.java | 1 + .../struts2/dojo/views/jsp/ui/TreeTest.java | 1 + .../dojo/src/test/resources/struts.properties | 20 +++++++++ plugins/dwr/pom.xml | 2 +- .../struts2/validators/DWRValidator.java | 1 + .../views/jasperreports/CompileReport.java | 1 + .../jasperreports/JasperReportConstants.java | 1 + .../jasperreports/JasperReportsResult.java | 1 + .../jasperreports/ValueStackDataSource.java | 1 + .../jasperreports/ValueStackShadowMap.java | 1 + .../src/main/resources/struts-plugin.xml | 1 - .../struts2/dispatcher/ChartResult.java | 1 + .../src/main/resources/struts-plugin.xml | 1 - .../struts2/dispatcher/ChartResultTest.java | 1 + .../jsf/ApplyRequestValuesInterceptor.java | 1 + .../apache/struts2/jsf/FacesInterceptor.java | 1 + .../org/apache/struts2/jsf/FacesRender.java | 1 + .../org/apache/struts2/jsf/FacesResult.java | 1 + .../struts2/jsf/FacesSetupInterceptor.java | 1 + .../org/apache/struts2/jsf/FacesSupport.java | 1 + .../jsf/InvokeApplicationInterceptor.java | 1 + .../jsf/ProcessValidationsInterceptor.java | 1 + .../struts2/jsf/RestoreViewInterceptor.java | 1 + .../struts2/jsf/StrutsNavigationHandler.java | 1 + .../struts2/jsf/StrutsVariableResolver.java | 1 + .../jsf/UpdateModelValuesInterceptor.java | 1 + .../jsf/src/main/resources/struts-plugin.xml | 1 - plugins/junit/pom.xml | 2 +- .../org/apache/struts2/StrutsTestCase.java | 3 +- .../multipart/PellMultiPartRequest.java | 1 + .../src/main/resources/struts-plugin.xml | 1 - .../apache/struts2/plexus/PlexusFilter.java | 1 + .../plexus/PlexusLifecycleListener.java | 1 + .../struts2/plexus/PlexusObjectFactory.java | 1 + .../struts2/plexus/PlexusThreadLocal.java | 1 + .../apache/struts2/plexus/PlexusUtils.java | 1 + .../src/main/resources/struts-plugin.xml | 1 - plugins/pom.xml | 3 ++ .../components/PortletUrlRenderer.java | 1 + .../portlet/PortletActionConstants.java | 1 + .../portlet/PortletApplicationMap.java | 1 + .../struts2/portlet/PortletRequestMap.java | 1 + .../struts2/portlet/PortletSessionMap.java | 1 + .../portlet/context/PortletActionContext.java | 1 + .../portlet/context/PreparatorServlet.java | 1 + .../context/ServletContextHolderListener.java | 1 + .../DirectRenderFromEventAction.java | 1 + .../portlet/dispatcher/DispatcherServlet.java | 1 + .../portlet/dispatcher/Jsr168Dispatcher.java | 1 + .../interceptor/PortletAwareInterceptor.java | 1 + .../interceptor/PortletContextAware.java | 1 + .../interceptor/PortletPreferencesAware.java | 1 + .../interceptor/PortletPrincipalProxy.java | 1 + .../interceptor/PortletRequestAware.java | 1 + .../interceptor/PortletResponseAware.java | 1 + .../interceptor/PortletStateInterceptor.java | 1 + .../ServletPortletPreferences.java | 1 + .../result/PortletActionRedirectResult.java | 1 + .../struts2/portlet/result/PortletResult.java | 1 + .../portlet/result/PortletVelocityResult.java | 1 + .../portlet/servlet/PortletHttpSession.java | 1 + .../portlet/servlet/PortletServletConfig.java | 1 + .../servlet/PortletServletContext.java | 1 + .../servlet/PortletServletInputStream.java | 1 + .../servlet/PortletServletOutputStream.java | 1 + .../servlet/PortletServletRequest.java | 1 + .../PortletServletRequestDispatcher.java | 1 + .../servlet/PortletServletResponse.java | 1 + .../portlet/util/PortletUrlHelper.java | 1 + .../freemarker/PortletFreemarkerResult.java | 1 + .../src/main/resources/struts-plugin.xml | 1 - .../components/PortletUrlRendererTest.java | 41 ++++++++++--------- .../portlet/PortletApplicationMapTest.java | 1 + .../portlet/PortletRequestMapTest.java | 1 + .../portlet/PortletSessionMapTest.java | 1 + .../context/PortletActionContextTest.java | 1 + .../dispatcher/Jsr168DispatcherTest.java | 1 + .../PortletAwareInterceptorTest.java | 1 + .../PortletStateInterceptorTest.java | 1 + .../portlet/result/PortletResultTest.java | 1 + .../portlet/util/PortletUrlHelperTest.java | 1 + .../struts2/views/jsp/PortletUrlTagTest.java | 1 + plugins/rest/pom.xml | 22 ++++++++++ .../rest/ContentTypeHandlerManager.java | 1 + .../struts2/rest/ContentTypeInterceptor.java | 1 + .../ControllerClasspathPackageProvider.java | 1 + .../struts2/rest/DefaultHttpHeaders.java | 1 + .../org/apache/struts2/rest/HttpHeaders.java | 1 + .../struts2/rest/RestActionInvocation.java | 1 + .../apache/struts2/rest/RestActionMapper.java | 1 + .../struts2/rest/RestActionProxyFactory.java | 1 + .../struts2/rest/RestWorkflowInterceptor.java | 1 + .../rest/handler/ContentTypeHandler.java | 1 + .../struts2/rest/handler/HtmlHandler.java | 1 + .../struts2/rest/handler/JsonLibHandler.java | 1 + .../struts2/rest/handler/XStreamHandler.java | 1 + .../rest/src/main/resources/struts-plugin.xml | 23 ++++++++++- .../rest/ContentTypeHandlerManagerTest.java | 1 + .../struts2/rest/DefaultHttpHeadersTest.java | 1 + .../struts2/rest/RestActionMapperTest.java | 21 ++++++++++ .../apache/struts2/rest/handler/Contact.java | 1 + .../rest/handler/JsonLibHandlerTest.java | 1 + .../main/java/org/apache/struts2/Main.java | 1 + .../apache/struts2/sitegraph/SiteGraph.java | 1 + .../sitegraph/StrutsConfigRetriever.java | 1 + .../sitegraph/entities/FileBasedView.java | 1 + .../sitegraph/entities/FreeMarkerView.java | 1 + .../struts2/sitegraph/entities/JspView.java | 1 + .../struts2/sitegraph/entities/Target.java | 1 + .../sitegraph/entities/VelocityView.java | 1 + .../struts2/sitegraph/entities/View.java | 1 + .../struts2/sitegraph/model/ActionNode.java | 1 + .../apache/struts2/sitegraph/model/Graph.java | 1 + .../struts2/sitegraph/model/IndentWriter.java | 1 + .../apache/struts2/sitegraph/model/Link.java | 1 + .../struts2/sitegraph/model/Render.java | 1 + .../sitegraph/model/SiteGraphNode.java | 1 + .../struts2/sitegraph/model/SubGraph.java | 1 + .../struts2/sitegraph/model/ViewNode.java | 1 + .../sitegraph/renderers/DOTRenderer.java | 1 + .../struts2/sitegraph/SiteGraphTest.java | 1 + .../sitemesh/FreeMarkerPageFilter.java | 1 + .../struts2/sitemesh/NoneDecoratorMapper.java | 1 + .../struts2/sitemesh/TemplatePageFilter.java | 1 + .../struts2/sitemesh/VelocityPageFilter.java | 1 + .../src/main/resources/struts-plugin.xml | 1 - .../spring/StrutsSpringObjectFactory.java | 1 + .../src/main/resources/struts-plugin.xml | 1 - .../spring/StrutsSpringObjectFactoryTest.java | 1 + .../s1/ActionFormResetInterceptor.java | 25 ++++++----- .../s1/ActionFormValidationInterceptor.java | 25 ++++++----- .../struts2/s1/DynaBeanPropertyAccessor.java | 27 ++++++------ .../org/apache/struts2/s1/Struts1Action.java | 30 ++++++++------ .../org/apache/struts2/s1/Struts1Factory.java | 28 +++++++------ .../struts2/s1/WrapperActionForward.java | 30 ++++++++------ .../struts2/s1/WrapperActionMapping.java | 30 ++++++++------ .../struts2/s1/WrapperExceptionConfig.java | 30 ++++++++------ .../struts2/s1/WrapperMessageResources.java | 28 +++++++------ .../struts2/s1/WrapperModuleConfig.java | 30 ++++++++------ .../src/main/resources/struts-plugin.xml | 1 - .../s1/DynaBeanPropertyAccessorTest.java | 1 + .../apache/struts2/s1/Struts1FactoryTest.java | 1 + .../apache/struts2/s1/test-struts-factory.xml | 1 - plugins/testng/pom.xml | 2 +- .../org/apache/struts2/StrutsTestCase.java | 3 +- .../apache/struts2/TestNGStrutsTestCase.java | 3 +- .../struts2/TestNGStrutsTestCaseTest.java | 3 +- .../tiles/ConfiguredServletContext.java | 6 ++- .../tiles/StrutsTilesContainerFactory.java | 1 + .../struts2/tiles/StrutsTilesListener.java | 1 + .../tiles/StrutsTilesRequestContext.java | 1 + .../struts2/views/tiles/TilesResult.java | 1 + .../src/main/resources/struts-plugin.xml | 1 - pom.xml | 35 +++++++++++++++- src/etc/header.txt | 18 ++++++++ src/site/xdoc/index.xml | 22 ++++++++++ src/site/xdoc/jxr.xml | 32 +++++++++------ 769 files changed, 1850 insertions(+), 341 deletions(-) create mode 100644 src/etc/header.txt diff --git a/apps/pom.xml b/apps/pom.xml index 6ebc04a25..95c2c4d01 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -1,3 +1,26 @@ + + 4.0.0 @@ -112,11 +135,10 @@ - diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index bd4b55d17..4f22a8172 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -1,5 +1,26 @@ - + 4.0.0 diff --git a/core/pom.xml b/core/pom.xml index d3d761283..c32721f8f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -129,7 +129,6 @@ - diff --git a/core/src/main/java/org/apache/struts2/RequestUtils.java b/core/src/main/java/org/apache/struts2/RequestUtils.java index 132cc9010..a1067a5cf 100644 --- a/core/src/main/java/org/apache/struts2/RequestUtils.java +++ b/core/src/main/java/org/apache/struts2/RequestUtils.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/ServletActionContext.java b/core/src/main/java/org/apache/struts2/ServletActionContext.java index c6d83b7ca..db34fdaee 100644 --- a/core/src/main/java/org/apache/struts2/ServletActionContext.java +++ b/core/src/main/java/org/apache/struts2/ServletActionContext.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2; import java.util.Map; diff --git a/core/src/main/java/org/apache/struts2/StrutsConstants.java b/core/src/main/java/org/apache/struts2/StrutsConstants.java index f2964dcdf..cf212e8d0 100644 --- a/core/src/main/java/org/apache/struts2/StrutsConstants.java +++ b/core/src/main/java/org/apache/struts2/StrutsConstants.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2; import org.apache.struts2.dispatcher.mapper.CompositeActionMapper; diff --git a/core/src/main/java/org/apache/struts2/StrutsException.java b/core/src/main/java/org/apache/struts2/StrutsException.java index 0c57029e6..089205aa6 100644 --- a/core/src/main/java/org/apache/struts2/StrutsException.java +++ b/core/src/main/java/org/apache/struts2/StrutsException.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2; import com.opensymphony.xwork2.XWorkException; diff --git a/core/src/main/java/org/apache/struts2/StrutsStatics.java b/core/src/main/java/org/apache/struts2/StrutsStatics.java index 2d6171791..b17c5e943 100644 --- a/core/src/main/java/org/apache/struts2/StrutsStatics.java +++ b/core/src/main/java/org/apache/struts2/StrutsStatics.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2; 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 f05389ec4..a1ff9ad65 100644 --- a/core/src/main/java/org/apache/struts2/components/ActionComponent.java +++ b/core/src/main/java/org/apache/struts2/components/ActionComponent.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import java.io.IOException; 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 e76106ab4..9a7350138 100644 --- a/core/src/main/java/org/apache/struts2/components/ActionError.java +++ b/core/src/main/java/org/apache/struts2/components/ActionError.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; 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 26978b521..7de1afaae 100644 --- a/core/src/main/java/org/apache/struts2/components/ActionMessage.java +++ b/core/src/main/java/org/apache/struts2/components/ActionMessage.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; 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 374cc3b63..c4b9daa89 100644 --- a/core/src/main/java/org/apache/struts2/components/Anchor.java +++ b/core/src/main/java/org/apache/struts2/components/Anchor.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; 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 4f352657c..a75049737 100644 --- a/core/src/main/java/org/apache/struts2/components/AppendIterator.java +++ b/core/src/main/java/org/apache/struts2/components/AppendIterator.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import java.io.Writer; 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 9c3644f08..8c68dc3a8 100644 --- a/core/src/main/java/org/apache/struts2/components/Bean.java +++ b/core/src/main/java/org/apache/struts2/components/Bean.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import java.io.Writer; 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 3eedc67b8..e1765b295 100644 --- a/core/src/main/java/org/apache/struts2/components/Checkbox.java +++ b/core/src/main/java/org/apache/struts2/components/Checkbox.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; 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 3638f9cef..b6cb477f2 100644 --- a/core/src/main/java/org/apache/struts2/components/CheckboxList.java +++ b/core/src/main/java/org/apache/struts2/components/CheckboxList.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; 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 2db8886e7..c7c8db1dc 100644 --- a/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java +++ b/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import java.io.Writer; 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 aae3efcc9..bde41baf9 100644 --- a/core/src/main/java/org/apache/struts2/components/ComboBox.java +++ b/core/src/main/java/org/apache/struts2/components/ComboBox.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import java.util.Collection; 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 c6a1afb38..bab20fcb6 100644 --- a/core/src/main/java/org/apache/struts2/components/Component.java +++ b/core/src/main/java/org/apache/struts2/components/Component.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import java.io.IOException; 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 250bac979..57a44317f 100644 --- a/core/src/main/java/org/apache/struts2/components/ContextBean.java +++ b/core/src/main/java/org/apache/struts2/components/ContextBean.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import org.apache.struts2.views.annotations.StrutsTagAttribute; 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 90767c9bb..829cb5846 100644 --- a/core/src/main/java/org/apache/struts2/components/Date.java +++ b/core/src/main/java/org/apache/struts2/components/Date.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import java.io.IOException; 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 a028275ff..a76e87191 100644 --- a/core/src/main/java/org/apache/struts2/components/Debug.java +++ b/core/src/main/java/org/apache/struts2/components/Debug.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import com.opensymphony.xwork2.inject.Inject; diff --git a/core/src/main/java/org/apache/struts2/components/Div.java b/core/src/main/java/org/apache/struts2/components/Div.java index 213f801ca..5967686a4 100644 --- a/core/src/main/java/org/apache/struts2/components/Div.java +++ b/core/src/main/java/org/apache/struts2/components/Div.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; 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 835bb1c3f..50198c02e 100644 --- a/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java +++ b/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import java.util.Map; 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 5d586cce5..440e6b6f3 100644 --- a/core/src/main/java/org/apache/struts2/components/DoubleSelect.java +++ b/core/src/main/java/org/apache/struts2/components/DoubleSelect.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; 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 6824a3f4d..b64bcda72 100644 --- a/core/src/main/java/org/apache/struts2/components/Else.java +++ b/core/src/main/java/org/apache/struts2/components/Else.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; 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 2c9995ef4..48f050e1e 100644 --- a/core/src/main/java/org/apache/struts2/components/ElseIf.java +++ b/core/src/main/java/org/apache/struts2/components/ElseIf.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import java.io.Writer; 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 55bb4b4d3..075b896ed 100644 --- a/core/src/main/java/org/apache/struts2/components/FieldError.java +++ b/core/src/main/java/org/apache/struts2/components/FieldError.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import java.util.ArrayList; 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 915f85455..8e781db2c 100644 --- a/core/src/main/java/org/apache/struts2/components/File.java +++ b/core/src/main/java/org/apache/struts2/components/File.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; 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 d4b3ccf67..316b0a825 100644 --- a/core/src/main/java/org/apache/struts2/components/Form.java +++ b/core/src/main/java/org/apache/struts2/components/Form.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import com.opensymphony.xwork2.ObjectFactory; 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 ae5e2bc56..e2f7beba9 100644 --- a/core/src/main/java/org/apache/struts2/components/FormButton.java +++ b/core/src/main/java/org/apache/struts2/components/FormButton.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; 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 a1d631fb9..64dfabe0d 100644 --- a/core/src/main/java/org/apache/struts2/components/GenericUIBean.java +++ b/core/src/main/java/org/apache/struts2/components/GenericUIBean.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; 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 d30d5cee7..acdf49154 100644 --- a/core/src/main/java/org/apache/struts2/components/Head.java +++ b/core/src/main/java/org/apache/struts2/components/Head.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; 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 a5125d6b9..67d8220f7 100644 --- a/core/src/main/java/org/apache/struts2/components/Hidden.java +++ b/core/src/main/java/org/apache/struts2/components/Hidden.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; 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 eeca50270..82d991ef3 100644 --- a/core/src/main/java/org/apache/struts2/components/I18n.java +++ b/core/src/main/java/org/apache/struts2/components/I18n.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import java.io.Writer; 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 4c3cfc43d..d9a81155a 100644 --- a/core/src/main/java/org/apache/struts2/components/If.java +++ b/core/src/main/java/org/apache/struts2/components/If.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import java.io.Writer; 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 4e05cec17..5709690de 100644 --- a/core/src/main/java/org/apache/struts2/components/Include.java +++ b/core/src/main/java/org/apache/struts2/components/Include.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import java.io.IOException; 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 f27e4ec57..4a157bc48 100644 --- a/core/src/main/java/org/apache/struts2/components/InputTransferSelect.java +++ b/core/src/main/java/org/apache/struts2/components/InputTransferSelect.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import java.util.LinkedHashMap; 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 db40d1c78..06bba45a0 100644 --- a/core/src/main/java/org/apache/struts2/components/IteratorComponent.java +++ b/core/src/main/java/org/apache/struts2/components/IteratorComponent.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import java.io.Writer; 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 aaadaf337..e35e46877 100644 --- a/core/src/main/java/org/apache/struts2/components/Label.java +++ b/core/src/main/java/org/apache/struts2/components/Label.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; 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 164be412c..776d01585 100644 --- a/core/src/main/java/org/apache/struts2/components/ListUIBean.java +++ b/core/src/main/java/org/apache/struts2/components/ListUIBean.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import java.lang.reflect.Array; 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 48176753a..2c11a2dae 100644 --- a/core/src/main/java/org/apache/struts2/components/MergeIterator.java +++ b/core/src/main/java/org/apache/struts2/components/MergeIterator.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import java.io.Writer; 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 39db13769..4eb3eb2b8 100644 --- a/core/src/main/java/org/apache/struts2/components/OptGroup.java +++ b/core/src/main/java/org/apache/struts2/components/OptGroup.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import java.io.Writer; 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 29b51f16d..ac21020ba 100644 --- a/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java +++ b/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import java.util.LinkedHashMap; 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 c3b80119c..c3c6f03e2 100644 --- a/core/src/main/java/org/apache/struts2/components/Param.java +++ b/core/src/main/java/org/apache/struts2/components/Param.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import java.io.Writer; 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 c0c8a8c6e..47dc3dd37 100644 --- a/core/src/main/java/org/apache/struts2/components/Password.java +++ b/core/src/main/java/org/apache/struts2/components/Password.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; 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 d582582cd..91fd47775 100644 --- a/core/src/main/java/org/apache/struts2/components/Property.java +++ b/core/src/main/java/org/apache/struts2/components/Property.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import java.io.IOException; 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 0fbfa47ba..dec90da70 100644 --- a/core/src/main/java/org/apache/struts2/components/Push.java +++ b/core/src/main/java/org/apache/struts2/components/Push.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import java.io.Writer; 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 3cc0c8d8c..d4b389467 100644 --- a/core/src/main/java/org/apache/struts2/components/Radio.java +++ b/core/src/main/java/org/apache/struts2/components/Radio.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; 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 1dd04e5cf..2907a3baf 100644 --- a/core/src/main/java/org/apache/struts2/components/Reset.java +++ b/core/src/main/java/org/apache/struts2/components/Reset.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; 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 669ba6db0..5eb1f7d7f 100644 --- a/core/src/main/java/org/apache/struts2/components/Select.java +++ b/core/src/main/java/org/apache/struts2/components/Select.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; 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 ea1749ac1..ca729041e 100644 --- a/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java +++ b/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import java.io.IOException; 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 13ff9675b..5c4c654dc 100644 --- a/core/src/main/java/org/apache/struts2/components/Set.java +++ b/core/src/main/java/org/apache/struts2/components/Set.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import java.io.Writer; 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 6710c712f..4158ee459 100644 --- a/core/src/main/java/org/apache/struts2/components/Submit.java +++ b/core/src/main/java/org/apache/struts2/components/Submit.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import java.io.Writer; 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 eaee4170f..396fbf9ba 100644 --- a/core/src/main/java/org/apache/struts2/components/Text.java +++ b/core/src/main/java/org/apache/struts2/components/Text.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import java.io.IOException; 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 fc16fd045..7831f5e6b 100644 --- a/core/src/main/java/org/apache/struts2/components/TextArea.java +++ b/core/src/main/java/org/apache/struts2/components/TextArea.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; 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 828550148..daebeecb2 100644 --- a/core/src/main/java/org/apache/struts2/components/TextField.java +++ b/core/src/main/java/org/apache/struts2/components/TextField.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; 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 9fd151b8a..a52d5ecc3 100644 --- a/core/src/main/java/org/apache/struts2/components/Token.java +++ b/core/src/main/java/org/apache/struts2/components/Token.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import java.util.Map; 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 c6f329a3c..a20942c26 100644 --- a/core/src/main/java/org/apache/struts2/components/UIBean.java +++ b/core/src/main/java/org/apache/struts2/components/UIBean.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import java.io.Writer; 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 2b960269e..c02e9ae4b 100644 --- a/core/src/main/java/org/apache/struts2/components/URL.java +++ b/core/src/main/java/org/apache/struts2/components/URL.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import java.io.Writer; 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 4d6ebc65e..f7c32bba3 100644 --- a/core/src/main/java/org/apache/struts2/components/UpDownSelect.java +++ b/core/src/main/java/org/apache/struts2/components/UpDownSelect.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import java.util.LinkedHashMap; diff --git a/core/src/main/java/org/apache/struts2/components/UrlRenderer.java b/core/src/main/java/org/apache/struts2/components/UrlRenderer.java index a3b65e8ab..3f864eb3e 100644 --- a/core/src/main/java/org/apache/struts2/components/UrlRenderer.java +++ b/core/src/main/java/org/apache/struts2/components/UrlRenderer.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import java.io.Writer; 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 344273607..49e8a6f4c 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,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components.template; import java.io.File; 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 b834795b5..cb25eee97 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,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components.template; import java.io.IOException; 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 6231f2530..7067f3b26 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,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components.template; import java.util.List; diff --git a/core/src/main/java/org/apache/struts2/components/template/Template.java b/core/src/main/java/org/apache/struts2/components/template/Template.java index 2c50b9e98..b6bbfdb0c 100644 --- a/core/src/main/java/org/apache/struts2/components/template/Template.java +++ b/core/src/main/java/org/apache/struts2/components/template/Template.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components.template; import java.util.ArrayList; diff --git a/core/src/main/java/org/apache/struts2/components/template/TemplateEngine.java b/core/src/main/java/org/apache/struts2/components/template/TemplateEngine.java index 5f0401fd0..bb24519a2 100644 --- a/core/src/main/java/org/apache/struts2/components/template/TemplateEngine.java +++ b/core/src/main/java/org/apache/struts2/components/template/TemplateEngine.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components.template; import java.util.Map; 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 8e48a8040..08dfa8955 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,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components.template; import java.util.Collections; 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 a3ae7f1c5..3c02d8cbd 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 @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components.template; import java.io.Writer; diff --git a/core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java b/core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java index a2f92efbd..4c665fe73 100644 --- a/core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java +++ b/core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components.template; import java.io.IOException; diff --git a/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java b/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java index 850d8ced0..a04eac853 100644 --- a/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java +++ b/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.config; import java.util.Properties; 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 cbd8de18b..7bf7611c0 100644 --- a/core/src/main/java/org/apache/struts2/config/DefaultPropertiesProvider.java +++ b/core/src/main/java/org/apache/struts2/config/DefaultPropertiesProvider.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.config; import com.opensymphony.xwork2.config.Configuration; 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 2c06edf09..02e47fc1b 100644 --- a/core/src/main/java/org/apache/struts2/config/DefaultSettings.java +++ b/core/src/main/java/org/apache/struts2/config/DefaultSettings.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.config; import java.util.ArrayList; 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 4384e07b4..5cb79b5df 100644 --- a/core/src/main/java/org/apache/struts2/config/DelegatingSettings.java +++ b/core/src/main/java/org/apache/struts2/config/DelegatingSettings.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.config; import java.util.HashSet; diff --git a/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java b/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java index 9fbf9cffc..899084d24 100644 --- a/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java +++ b/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.config; import java.util.Iterator; 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 2f695835e..d63bc4133 100644 --- a/core/src/main/java/org/apache/struts2/config/NullResult.java +++ b/core/src/main/java/org/apache/struts2/config/NullResult.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.config; import com.opensymphony.xwork2.ActionInvocation; 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 42c76961b..1907d7d5b 100644 --- a/core/src/main/java/org/apache/struts2/config/PropertiesSettings.java +++ b/core/src/main/java/org/apache/struts2/config/PropertiesSettings.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.config; import java.io.IOException; diff --git a/core/src/main/java/org/apache/struts2/config/ServletContextSingleton.java b/core/src/main/java/org/apache/struts2/config/ServletContextSingleton.java index ed8806794..5c59410f3 100644 --- a/core/src/main/java/org/apache/struts2/config/ServletContextSingleton.java +++ b/core/src/main/java/org/apache/struts2/config/ServletContextSingleton.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.config; import javax.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 c623d627e..085e4122e 100644 --- a/core/src/main/java/org/apache/struts2/config/Settings.java +++ b/core/src/main/java/org/apache/struts2/config/Settings.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.config; import java.util.Iterator; 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 705ddb24a..012efd3cd 100644 --- a/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java +++ b/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.config; import java.io.File; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java b/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java index 11dd718a6..4173d721d 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dispatcher; import java.io.IOException; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ApplicationMap.java b/core/src/main/java/org/apache/struts2/dispatcher/ApplicationMap.java index bbef6ba55..741940cd2 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/ApplicationMap.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/ApplicationMap.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dispatcher; import java.io.Serializable; 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 59f02ba01..430509c66 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/DefaultActionSupport.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/DefaultActionSupport.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dispatcher; 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 f778e93b3..40b7dd63a 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dispatcher; import java.io.File; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/DispatcherListener.java b/core/src/main/java/org/apache/struts2/dispatcher/DispatcherListener.java index 444ce664f..7fa317498 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/DispatcherListener.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/DispatcherListener.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dispatcher; /** diff --git a/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java b/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java index e1263118d..162f93686 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dispatcher; import java.io.IOException; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcherCompatWeblogic61.java b/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcherCompatWeblogic61.java index 667ee997e..8ed2ad4f8 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcherCompatWeblogic61.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcherCompatWeblogic61.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dispatcher; import javax.servlet.Filter; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java b/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java index f7a49fb39..ca2b0abfb 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dispatcher; import java.util.HashMap; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java b/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java index f3d21858c..fc07a4ec0 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dispatcher; import java.io.InputStreamReader; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/RequestMap.java b/core/src/main/java/org/apache/struts2/dispatcher/RequestMap.java index 4add7f68f..de46b3bfb 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/RequestMap.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/RequestMap.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dispatcher; import java.io.Serializable; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java b/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java index ced31df0b..9c195fab3 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dispatcher; import java.util.Arrays; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ServletDispatcherResult.java b/core/src/main/java/org/apache/struts2/dispatcher/ServletDispatcherResult.java index 5bac8ab9b..acd4d586f 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/ServletDispatcherResult.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/ServletDispatcherResult.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dispatcher; import javax.servlet.RequestDispatcher; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java b/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java index 9ed2a3887..b5822c5a8 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dispatcher; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/SessionMap.java b/core/src/main/java/org/apache/struts2/dispatcher/SessionMap.java index e245c4a29..1b5a622c7 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/SessionMap.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/SessionMap.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dispatcher; import java.io.Serializable; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java b/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java index 2ab1144f7..650129672 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dispatcher; import java.io.InputStream; 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 3292c75b7..effdc56e1 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dispatcher; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java b/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java index 24d9f8ebf..c934c68e9 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dispatcher; import java.io.UnsupportedEncodingException; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java b/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java index 6b9e2fd7d..5feeaf0c9 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dispatcher; import java.io.OutputStreamWriter; 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 9d02bd5ed..a4af0c973 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,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dispatcher.mapper; import javax.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 933210cca..678a5cc4a 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,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dispatcher.mapper; import java.util.Map; 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 6bd77857d..4d2af0728 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,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dispatcher.mapper; import java.util.ArrayList; 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 61b9c2bfb..4faec2e56 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,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dispatcher.mapper; import java.util.*; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/ParameterAction.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/ParameterAction.java index cfb7ff0dc..f4f3f4fae 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/ParameterAction.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/ParameterAction.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dispatcher.mapper; /** 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 00f8d31f9..f8d200267 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,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dispatcher.mapper; import java.net.URLDecoder; 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 8c3fa1f8a..a86d221b4 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,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dispatcher.mapper; import java.net.URLDecoder; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java index a58b2cb0f..64f3e690f 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dispatcher.multipart; import java.io.File; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequest.java b/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequest.java index 5edf55398..36a1b03f9 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequest.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequest.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dispatcher.multipart; import java.io.File; 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 e2745229b..1c4989e8a 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,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dispatcher.multipart; import java.io.File; diff --git a/core/src/main/java/org/apache/struts2/impl/StrutsActionProxy.java b/core/src/main/java/org/apache/struts2/impl/StrutsActionProxy.java index d6639cbba..18486ed64 100644 --- a/core/src/main/java/org/apache/struts2/impl/StrutsActionProxy.java +++ b/core/src/main/java/org/apache/struts2/impl/StrutsActionProxy.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + // Copyright 2006 Google Inc. All Rights Reserved. package org.apache.struts2.impl; diff --git a/core/src/main/java/org/apache/struts2/impl/StrutsActionProxyFactory.java b/core/src/main/java/org/apache/struts2/impl/StrutsActionProxyFactory.java index 4fb9eec8c..be7c2edff 100644 --- a/core/src/main/java/org/apache/struts2/impl/StrutsActionProxyFactory.java +++ b/core/src/main/java/org/apache/struts2/impl/StrutsActionProxyFactory.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + // Copyright 2006 Google Inc. All Rights Reserved. package org.apache.struts2.impl; diff --git a/core/src/main/java/org/apache/struts2/impl/StrutsObjectFactory.java b/core/src/main/java/org/apache/struts2/impl/StrutsObjectFactory.java index edf08dbe8..68dacb16c 100644 --- a/core/src/main/java/org/apache/struts2/impl/StrutsObjectFactory.java +++ b/core/src/main/java/org/apache/struts2/impl/StrutsObjectFactory.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + // Copyright 2006 Google Inc. All Rights Reserved. package org.apache.struts2.impl; diff --git a/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java index 79c7dd4a5..aa98b9eed 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.interceptor; import com.opensymphony.xwork2.interceptor.ParametersInterceptor; diff --git a/core/src/main/java/org/apache/struts2/interceptor/ApplicationAware.java b/core/src/main/java/org/apache/struts2/interceptor/ApplicationAware.java index 769c9f76a..78ac18a37 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/ApplicationAware.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ApplicationAware.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.interceptor; import java.util.Map; diff --git a/core/src/main/java/org/apache/struts2/interceptor/BackgroundProcess.java b/core/src/main/java/org/apache/struts2/interceptor/BackgroundProcess.java index c103f976d..79ad0173c 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/BackgroundProcess.java +++ b/core/src/main/java/org/apache/struts2/interceptor/BackgroundProcess.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.interceptor; import java.io.Serializable; 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 276fec589..daa413390 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.interceptor; import com.opensymphony.xwork2.ActionInvocation; 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 25f31d38b..b97eb6ed5 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/ClearSessionInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ClearSessionInterceptor.java @@ -1,4 +1,6 @@ /* + * $Id$ + * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information 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 c93d7fdc9..462d0c885 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.interceptor; import java.util.Collections; diff --git a/core/src/main/java/org/apache/struts2/interceptor/CookiesAware.java b/core/src/main/java/org/apache/struts2/interceptor/CookiesAware.java index 3d0ee5dee..9d406a34b 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/CookiesAware.java +++ b/core/src/main/java/org/apache/struts2/interceptor/CookiesAware.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.interceptor; import java.util.Map; 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 a9f9f85fc..ce7eca1c9 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/CreateSessionInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/CreateSessionInterceptor.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.interceptor; import org.apache.struts2.ServletActionContext; 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 d8b345def..80920ade8 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.interceptor; import java.util.Collections; diff --git a/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java index 961720f62..2b26f253a 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.interceptor; import java.io.File; 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 2d3abab44..d3f8e6708 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.interceptor; import java.util.ArrayList; diff --git a/core/src/main/java/org/apache/struts2/interceptor/NoParameters.java b/core/src/main/java/org/apache/struts2/interceptor/NoParameters.java index 56615617d..5d118164f 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/NoParameters.java +++ b/core/src/main/java/org/apache/struts2/interceptor/NoParameters.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.interceptor; diff --git a/core/src/main/java/org/apache/struts2/interceptor/ParameterAware.java b/core/src/main/java/org/apache/struts2/interceptor/ParameterAware.java index b5be97680..81bbbb9a5 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/ParameterAware.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ParameterAware.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.interceptor; import java.util.Map; diff --git a/core/src/main/java/org/apache/struts2/interceptor/PrincipalAware.java b/core/src/main/java/org/apache/struts2/interceptor/PrincipalAware.java index 8b9c843ea..91878d81c 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/PrincipalAware.java +++ b/core/src/main/java/org/apache/struts2/interceptor/PrincipalAware.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.interceptor; /** diff --git a/core/src/main/java/org/apache/struts2/interceptor/PrincipalProxy.java b/core/src/main/java/org/apache/struts2/interceptor/PrincipalProxy.java index 826b0b958..b4bcff0f5 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/PrincipalProxy.java +++ b/core/src/main/java/org/apache/struts2/interceptor/PrincipalProxy.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.interceptor; import java.security.Principal; diff --git a/core/src/main/java/org/apache/struts2/interceptor/ProfilingActivationInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ProfilingActivationInterceptor.java index 8026399a4..0de19968c 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/ProfilingActivationInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ProfilingActivationInterceptor.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.interceptor; import com.opensymphony.xwork2.ActionInvocation; 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 14b73a6cf..0b6c8c5de 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/RolesInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/RolesInterceptor.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.interceptor; import java.util.ArrayList; 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 4e438f399..ee784ddf9 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.interceptor; import java.io.Serializable; 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 e9ccd75c5..129cc6c84 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.interceptor; import java.util.Map; diff --git a/core/src/main/java/org/apache/struts2/interceptor/ServletRequestAware.java b/core/src/main/java/org/apache/struts2/interceptor/ServletRequestAware.java index 09e5b8029..7adb5dc79 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/ServletRequestAware.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ServletRequestAware.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.interceptor; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/interceptor/ServletResponseAware.java b/core/src/main/java/org/apache/struts2/interceptor/ServletResponseAware.java index 0d6b6d293..5674c695b 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/ServletResponseAware.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ServletResponseAware.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.interceptor; import javax.servlet.http.HttpServletResponse; diff --git a/core/src/main/java/org/apache/struts2/interceptor/SessionAware.java b/core/src/main/java/org/apache/struts2/interceptor/SessionAware.java index 540cb0924..4791f18bc 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/SessionAware.java +++ b/core/src/main/java/org/apache/struts2/interceptor/SessionAware.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.interceptor; import java.util.Map; 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 8e3f89a36..2a19432f0 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptor.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.interceptor; import com.opensymphony.xwork2.ActionInvocation; 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 3a0427cbb..8a52723ea 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/TokenInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/TokenInterceptor.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.interceptor; import java.util.Map; 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 3fb70eff9..ad9bbbda7 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.interceptor; import java.util.Map; 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 4870ea0be..dc5532d92 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,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.interceptor.debugging; import java.beans.BeanInfo; 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 23f6f357f..223fe9856 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,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.interceptor.debugging; import java.beans.IntrospectionException; diff --git a/core/src/main/java/org/apache/struts2/interceptor/debugging/PrettyPrintWriter.java b/core/src/main/java/org/apache/struts2/interceptor/debugging/PrettyPrintWriter.java index 95ffe15e7..254104089 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/debugging/PrettyPrintWriter.java +++ b/core/src/main/java/org/apache/struts2/interceptor/debugging/PrettyPrintWriter.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.interceptor.debugging; import java.io.PrintWriter; 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 e76e725a6..f8a34d9a3 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,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.interceptor.validation; import java.lang.reflect.Method; diff --git a/core/src/main/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptor.java index 37dbd9a21..95e851c98 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/validation/JSONValidationInterceptor.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.interceptor.validation; import java.text.CharacterIterator; diff --git a/core/src/main/java/org/apache/struts2/interceptor/validation/SkipValidation.java b/core/src/main/java/org/apache/struts2/interceptor/validation/SkipValidation.java index 22b974c11..8ba717c14 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/validation/SkipValidation.java +++ b/core/src/main/java/org/apache/struts2/interceptor/validation/SkipValidation.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.interceptor.validation; import static java.lang.annotation.ElementType.METHOD; diff --git a/core/src/main/java/org/apache/struts2/servlet/interceptor/ServletPrincipalProxy.java b/core/src/main/java/org/apache/struts2/servlet/interceptor/ServletPrincipalProxy.java index de5ff7072..e264c6bc8 100644 --- a/core/src/main/java/org/apache/struts2/servlet/interceptor/ServletPrincipalProxy.java +++ b/core/src/main/java/org/apache/struts2/servlet/interceptor/ServletPrincipalProxy.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.servlet.interceptor; import org.apache.struts2.interceptor.PrincipalProxy; 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 87cf5edf2..efedcc07c 100644 --- a/core/src/main/java/org/apache/struts2/util/AppendIteratorFilter.java +++ b/core/src/main/java/org/apache/struts2/util/AppendIteratorFilter.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.util; import java.util.ArrayList; diff --git a/core/src/main/java/org/apache/struts2/util/AttributeMap.java b/core/src/main/java/org/apache/struts2/util/AttributeMap.java index 8b827f0a5..cca191406 100644 --- a/core/src/main/java/org/apache/struts2/util/AttributeMap.java +++ b/core/src/main/java/org/apache/struts2/util/AttributeMap.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.util; import java.util.Collection; diff --git a/core/src/main/java/org/apache/struts2/util/ClassLoaderUtils.java b/core/src/main/java/org/apache/struts2/util/ClassLoaderUtils.java index 5a0b6679f..93c6e1d7b 100644 --- a/core/src/main/java/org/apache/struts2/util/ClassLoaderUtils.java +++ b/core/src/main/java/org/apache/struts2/util/ClassLoaderUtils.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.util; import java.io.IOException; diff --git a/core/src/main/java/org/apache/struts2/util/ContainUtil.java b/core/src/main/java/org/apache/struts2/util/ContainUtil.java index 480d8f7e3..0f6196b48 100644 --- a/core/src/main/java/org/apache/struts2/util/ContainUtil.java +++ b/core/src/main/java/org/apache/struts2/util/ContainUtil.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.util; import java.lang.reflect.Array; diff --git a/core/src/main/java/org/apache/struts2/util/Counter.java b/core/src/main/java/org/apache/struts2/util/Counter.java index 3071d8d9a..aa5a6003c 100644 --- a/core/src/main/java/org/apache/struts2/util/Counter.java +++ b/core/src/main/java/org/apache/struts2/util/Counter.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.util; import java.io.Serializable; diff --git a/core/src/main/java/org/apache/struts2/util/DateFormatter.java b/core/src/main/java/org/apache/struts2/util/DateFormatter.java index a7c10b7c3..eb75e8701 100644 --- a/core/src/main/java/org/apache/struts2/util/DateFormatter.java +++ b/core/src/main/java/org/apache/struts2/util/DateFormatter.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.util; import java.text.DateFormat; diff --git a/core/src/main/java/org/apache/struts2/util/FastByteArrayOutputStream.java b/core/src/main/java/org/apache/struts2/util/FastByteArrayOutputStream.java index 9b4f54ce6..ba3390a62 100644 --- a/core/src/main/java/org/apache/struts2/util/FastByteArrayOutputStream.java +++ b/core/src/main/java/org/apache/struts2/util/FastByteArrayOutputStream.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.util; import javax.servlet.jsp.JspWriter; 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 fa70c79b7..680d86db4 100644 --- a/core/src/main/java/org/apache/struts2/util/InvocationSessionStore.java +++ b/core/src/main/java/org/apache/struts2/util/InvocationSessionStore.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.util; import java.io.Serializable; diff --git a/core/src/main/java/org/apache/struts2/util/IteratorFilterSupport.java b/core/src/main/java/org/apache/struts2/util/IteratorFilterSupport.java index 2dc06f266..66aa5dee9 100644 --- a/core/src/main/java/org/apache/struts2/util/IteratorFilterSupport.java +++ b/core/src/main/java/org/apache/struts2/util/IteratorFilterSupport.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.util; import java.util.Enumeration; 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 f59ae6c40..0fac95f71 100644 --- a/core/src/main/java/org/apache/struts2/util/IteratorGenerator.java +++ b/core/src/main/java/org/apache/struts2/util/IteratorGenerator.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.util; import java.util.ArrayList; diff --git a/core/src/main/java/org/apache/struts2/util/ListEntry.java b/core/src/main/java/org/apache/struts2/util/ListEntry.java index 229f0e666..0c7bc1ba4 100644 --- a/core/src/main/java/org/apache/struts2/util/ListEntry.java +++ b/core/src/main/java/org/apache/struts2/util/ListEntry.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.util; /** diff --git a/core/src/main/java/org/apache/struts2/util/MakeIterator.java b/core/src/main/java/org/apache/struts2/util/MakeIterator.java index 0033738f2..76d6d0195 100644 --- a/core/src/main/java/org/apache/struts2/util/MakeIterator.java +++ b/core/src/main/java/org/apache/struts2/util/MakeIterator.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.util; import java.lang.reflect.Array; 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 02245729e..e1fd13ec7 100644 --- a/core/src/main/java/org/apache/struts2/util/MergeIteratorFilter.java +++ b/core/src/main/java/org/apache/struts2/util/MergeIteratorFilter.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.util; import java.util.ArrayList; diff --git a/core/src/main/java/org/apache/struts2/util/ObjectFactoryDestroyable.java b/core/src/main/java/org/apache/struts2/util/ObjectFactoryDestroyable.java index 56ca7d1f9..55a9ad16c 100644 --- a/core/src/main/java/org/apache/struts2/util/ObjectFactoryDestroyable.java +++ b/core/src/main/java/org/apache/struts2/util/ObjectFactoryDestroyable.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.util; /** diff --git a/core/src/main/java/org/apache/struts2/util/PrefixTrie.java b/core/src/main/java/org/apache/struts2/util/PrefixTrie.java index 7166b2f17..afed5e77b 100644 --- a/core/src/main/java/org/apache/struts2/util/PrefixTrie.java +++ b/core/src/main/java/org/apache/struts2/util/PrefixTrie.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.util; /** diff --git a/core/src/main/java/org/apache/struts2/util/ServletContextAware.java b/core/src/main/java/org/apache/struts2/util/ServletContextAware.java index b009d6b75..23f065465 100644 --- a/core/src/main/java/org/apache/struts2/util/ServletContextAware.java +++ b/core/src/main/java/org/apache/struts2/util/ServletContextAware.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.util; import javax.servlet.ServletContext; 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 8079af7db..aef043d87 100644 --- a/core/src/main/java/org/apache/struts2/util/SortIteratorFilter.java +++ b/core/src/main/java/org/apache/struts2/util/SortIteratorFilter.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.util; import java.util.ArrayList; 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 ad86b6715..3243db41a 100644 --- a/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java +++ b/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.util; import java.util.HashMap; 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 930af7b22..d01ec7a29 100644 --- a/core/src/main/java/org/apache/struts2/util/StrutsTypeConverter.java +++ b/core/src/main/java/org/apache/struts2/util/StrutsTypeConverter.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.util; import java.util.Map; 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 973984c5c..f40c0d0ac 100644 --- a/core/src/main/java/org/apache/struts2/util/StrutsUtil.java +++ b/core/src/main/java/org/apache/struts2/util/StrutsUtil.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.util; import java.io.IOException; 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 90475f338..f12d653a8 100644 --- a/core/src/main/java/org/apache/struts2/util/SubsetIteratorFilter.java +++ b/core/src/main/java/org/apache/struts2/util/SubsetIteratorFilter.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.util; import java.util.ArrayList; diff --git a/core/src/main/java/org/apache/struts2/util/TabbedPane.java b/core/src/main/java/org/apache/struts2/util/TabbedPane.java index 4c8782880..a33065910 100644 --- a/core/src/main/java/org/apache/struts2/util/TabbedPane.java +++ b/core/src/main/java/org/apache/struts2/util/TabbedPane.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.util; import java.util.Vector; 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 37f909878..167a5b7b5 100644 --- a/core/src/main/java/org/apache/struts2/util/TextProviderHelper.java +++ b/core/src/main/java/org/apache/struts2/util/TextProviderHelper.java @@ -1,3 +1,24 @@ +/* + * $Id$ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package org.apache.struts2.util; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/util/Timer.java b/core/src/main/java/org/apache/struts2/util/Timer.java index 1fba0d49e..0431410bd 100644 --- a/core/src/main/java/org/apache/struts2/util/Timer.java +++ b/core/src/main/java/org/apache/struts2/util/Timer.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.util; 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 4a15a07fa..2e386b60e 100644 --- a/core/src/main/java/org/apache/struts2/util/TokenHelper.java +++ b/core/src/main/java/org/apache/struts2/util/TokenHelper.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.util; import java.math.BigInteger; 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 afe39a241..795f37fe1 100644 --- a/core/src/main/java/org/apache/struts2/util/URLBean.java +++ b/core/src/main/java/org/apache/struts2/util/URLBean.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.util; import java.util.HashMap; diff --git a/core/src/main/java/org/apache/struts2/util/VelocityStrutsUtil.java b/core/src/main/java/org/apache/struts2/util/VelocityStrutsUtil.java index ce567720e..155ecbdb5 100644 --- a/core/src/main/java/org/apache/struts2/util/VelocityStrutsUtil.java +++ b/core/src/main/java/org/apache/struts2/util/VelocityStrutsUtil.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.util; import java.io.CharArrayWriter; 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 897225846..d5661dea6 100644 --- a/core/src/main/java/org/apache/struts2/views/DefaultTagLibrary.java +++ b/core/src/main/java/org/apache/struts2/views/DefaultTagLibrary.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views; import java.util.Arrays; diff --git a/core/src/main/java/org/apache/struts2/views/JspSupportServlet.java b/core/src/main/java/org/apache/struts2/views/JspSupportServlet.java index 238ab18f8..f51957071 100644 --- a/core/src/main/java/org/apache/struts2/views/JspSupportServlet.java +++ b/core/src/main/java/org/apache/struts2/views/JspSupportServlet.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views; import javax.servlet.ServletConfig; diff --git a/core/src/main/java/org/apache/struts2/views/TagLibrary.java b/core/src/main/java/org/apache/struts2/views/TagLibrary.java index 4e41de42a..ab8999b69 100644 --- a/core/src/main/java/org/apache/struts2/views/TagLibrary.java +++ b/core/src/main/java/org/apache/struts2/views/TagLibrary.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views; import java.util.List; 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 e5f239d0a..9d51cd8c7 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,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker; import java.io.File; 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 96077d479..5e87d08bb 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,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker; import java.io.CharArrayWriter; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java index ace98a588..a42ae09c3 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker; import javax.servlet.ServletContext; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/StrutsBeanWrapper.java b/core/src/main/java/org/apache/struts2/views/freemarker/StrutsBeanWrapper.java index 315c3739e..4c093c280 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/StrutsBeanWrapper.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/StrutsBeanWrapper.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker; import java.util.Map; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/StrutsClassTemplateLoader.java b/core/src/main/java/org/apache/struts2/views/freemarker/StrutsClassTemplateLoader.java index 0ef88c0b5..2810d9fde 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/StrutsClassTemplateLoader.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/StrutsClassTemplateLoader.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker; import java.net.URL; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionErrorModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionErrorModel.java index 2c892f1dd..d74acee26 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionErrorModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionErrorModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionMessageModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionMessageModel.java index 7e1eae03f..7e7dcef4a 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionMessageModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionMessageModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionModel.java index b935c107c..e66c2a15e 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/AnchorModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/AnchorModel.java index 05b4004a1..18df7e27a 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/AnchorModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/AnchorModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/BeanModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/BeanModel.java index 2ce6f8562..45afafc26 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/BeanModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/BeanModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/CallbackWriter.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/CallbackWriter.java index 89629caf7..1d46e393e 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/CallbackWriter.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/CallbackWriter.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import java.io.IOException; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxListModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxListModel.java index ca6c0d953..64480a58c 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxListModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxListModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxModel.java index 8477d7b5e..e8b34e0e1 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ComboBoxModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ComboBoxModel.java index b572d2ca8..bf68d6fce 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ComboBoxModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ComboBoxModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ComponentModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ComponentModel.java index 597f72891..0ab10988e 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ComponentModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ComponentModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/DateModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/DateModel.java index b7f7c71c6..39c584793 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/DateModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/DateModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/DivModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/DivModel.java index 6e480d42a..4471b6410 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/DivModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/DivModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/DoubleSelectModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/DoubleSelectModel.java index 4d6363c43..12bdd25e2 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/DoubleSelectModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/DoubleSelectModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ElseIfModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ElseIfModel.java index e4248468a..60eec8523 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ElseIfModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ElseIfModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ElseModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ElseModel.java index 6ae43665a..ee10fc6b7 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ElseModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ElseModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/FieldErrorModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/FieldErrorModel.java index 104933009..713977002 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/FieldErrorModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/FieldErrorModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/FileModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/FileModel.java index 3325311ab..9fb49913a 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/FileModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/FileModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/FormModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/FormModel.java index b7ea200d8..d28ec16cb 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/FormModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/FormModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/HeadModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/HeadModel.java index adf01b9ee..efa3f461e 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/HeadModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/HeadModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/HiddenModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/HiddenModel.java index 766207a2d..ce9d05fbc 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/HiddenModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/HiddenModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/I18nModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/I18nModel.java index 28a6017e8..84030fcbd 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/I18nModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/I18nModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/IfModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/IfModel.java index 60a44ddce..4fca3c2f4 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/IfModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/IfModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/IncludeModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/IncludeModel.java index a62e2ec7c..e73a3b3f5 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/IncludeModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/IncludeModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/InputTransferSelectModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/InputTransferSelectModel.java index b8868cf00..ee3ae4047 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/InputTransferSelectModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/InputTransferSelectModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/IteratorModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/IteratorModel.java index 00cb8dbe0..12d2077ff 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/IteratorModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/IteratorModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/LabelModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/LabelModel.java index e7a106181..3fc93c463 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/LabelModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/LabelModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptGroupModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptGroupModel.java index a428b157b..8143ad8a3 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptGroupModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptGroupModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptionTransferSelectModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptionTransferSelectModel.java index be8b71898..383f33ccc 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptionTransferSelectModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptionTransferSelectModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ParamModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ParamModel.java index 11d584611..105dd0af9 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ParamModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ParamModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/PasswordModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/PasswordModel.java index da59537b6..9ed125d5f 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/PasswordModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/PasswordModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/PropertyModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/PropertyModel.java index b0ad49190..8bd30ed0f 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/PropertyModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/PropertyModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/PushModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/PushModel.java index c2824938a..95412f1df 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/PushModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/PushModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/RadioModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/RadioModel.java index 7ecd43a4d..ce4fa79df 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/RadioModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/RadioModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ResetModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ResetModel.java index 96246e8cb..77a09c9be 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/ResetModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/ResetModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/SelectModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/SelectModel.java index f92602f36..6b4066702 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/SelectModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/SelectModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/SetModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/SetModel.java index 74378afe8..ea44fe3b5 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/SetModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/SetModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java index c40f6f6d1..e1fb93c69 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/SubmitModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/SubmitModel.java index fc881b8be..57f58a4f4 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/SubmitModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/SubmitModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java index c84227016..270f02890 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import java.io.IOException; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextAreaModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextAreaModel.java index 540c3757a..f1c001087 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextAreaModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextAreaModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextFieldModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextFieldModel.java index b73ce5439..c3eafa524 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextFieldModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextFieldModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextModel.java index 2894d1de5..d2ae42509 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TokenModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TokenModel.java index 0cbeb494c..73fa036a6 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TokenModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TokenModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/URLModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/URLModel.java index 61049750f..76575bf23 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/URLModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/URLModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/UpDownSelectModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/UpDownSelectModel.java index 4ce573ed8..3e1408687 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/UpDownSelectModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/UpDownSelectModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ActionTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ActionTag.java index b53fe64cc..ba3f7f543 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ActionTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ActionTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java b/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java index 98a56cb51..5c21421a7 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ComponentTagSupport.java b/core/src/main/java/org/apache/struts2/views/jsp/ComponentTagSupport.java index 8c1a88c7e..ca0b6e10e 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ComponentTagSupport.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ComponentTagSupport.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ContextBeanTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ContextBeanTag.java index d20c121de..e51fb1996 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ContextBeanTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ContextBeanTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp; import org.apache.struts2.components.ContextBean; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/DateTag.java b/core/src/main/java/org/apache/struts2/views/jsp/DateTag.java index fcd3e2bd3..c39baf5dc 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/DateTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/DateTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ElseIfTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ElseIfTag.java index d464b6dae..e9229e5ca 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ElseIfTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ElseIfTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ElseTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ElseTag.java index ee795f747..ca2aec980 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ElseTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ElseTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/I18nTag.java b/core/src/main/java/org/apache/struts2/views/jsp/I18nTag.java index 2fee30acd..da69da094 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/I18nTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/I18nTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/IfTag.java b/core/src/main/java/org/apache/struts2/views/jsp/IfTag.java index c181a4529..c54edc29c 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/IfTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/IfTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/IncludeTag.java b/core/src/main/java/org/apache/struts2/views/jsp/IncludeTag.java index dacfc302f..c5a8d4749 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/IncludeTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/IncludeTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/IteratorStatus.java b/core/src/main/java/org/apache/struts2/views/jsp/IteratorStatus.java index cb48d0ffc..572adcb26 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/IteratorStatus.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/IteratorStatus.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java index 38a450705..7a6af900b 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ParamTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ParamTag.java index 8819ff116..4e88fd22e 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ParamTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ParamTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/PropertyTag.java b/core/src/main/java/org/apache/struts2/views/jsp/PropertyTag.java index ed612d9db..bf37d2761 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/PropertyTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/PropertyTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/PushTag.java b/core/src/main/java/org/apache/struts2/views/jsp/PushTag.java index 14cfa0b06..078ed58f8 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/PushTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/PushTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java b/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java index 7ca3db41f..3ff152f13 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java b/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java index 811b0ed8c..49ac66afb 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp; import java.io.PrintWriter; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java b/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java index c805d4eef..418011b8c 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp; import java.util.Map; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/TextTag.java b/core/src/main/java/org/apache/struts2/views/jsp/TextTag.java index 3f703b523..d8daca5e7 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/TextTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/TextTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/URLTag.java b/core/src/main/java/org/apache/struts2/views/jsp/URLTag.java index a16e00cd8..a445cce40 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/URLTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/URLTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/iterator/AppendIteratorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/iterator/AppendIteratorTag.java index 11cf85c9f..ca567edb3 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/iterator/AppendIteratorTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/iterator/AppendIteratorTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.iterator; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java index d96bcfaef..0aedb1beb 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.iterator; import javax.servlet.jsp.JspException; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/iterator/MergeIteratorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/iterator/MergeIteratorTag.java index 88feffa3a..99bd65726 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/iterator/MergeIteratorTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/iterator/MergeIteratorTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.iterator; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java index 1d9a5ddd0..4ae8054e5 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.iterator; import java.util.Comparator; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java index c17c7dea6..c0a8901f9 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.iterator; import javax.servlet.jsp.JspException; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractClosingTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractClosingTag.java index 6b92a95c4..fdce4a156 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractClosingTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractClosingTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.ui; import org.apache.struts2.components.ClosingUIBean; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractDoubleListTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractDoubleListTag.java index 50dee4455..713654f84 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractDoubleListTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractDoubleListTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.ui; import org.apache.struts2.components.DoubleListUIBean; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractListTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractListTag.java index 84634bdc7..c2310643d 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractListTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractListTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.ui; import org.apache.struts2.components.ListUIBean; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractRequiredListTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractRequiredListTag.java index 91c887ba8..08e89af15 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractRequiredListTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractRequiredListTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.ui; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java index 90be5031b..2e7e44a1e 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.ui; import java.util.HashMap; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/ActionErrorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/ActionErrorTag.java index 1d7349f70..7c6d3e58f 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/ActionErrorTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/ActionErrorTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/ActionMessageTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/ActionMessageTag.java index 7d1aa2cb4..9cbbbe837 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/ActionMessageTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/ActionMessageTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java index e20e4f9ab..005326483 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxListTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxListTag.java index 144f3780a..9debe52c0 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxListTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxListTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxTag.java index 57b3f1139..ccf31bb2b 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/ComboBoxTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/ComboBoxTag.java index 889fd59ad..c4f04d977 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/ComboBoxTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/ComboBoxTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/ComponentTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/ComponentTag.java index ee79268eb..5c3717391 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/ComponentTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/ComponentTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/DebugTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/DebugTag.java index d7ed6a44e..90019d138 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/DebugTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/DebugTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java index c9c1b5278..31d21e6f4 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/DoubleSelectTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/DoubleSelectTag.java index 053d032a0..21428253b 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/DoubleSelectTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/DoubleSelectTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/FieldErrorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/FieldErrorTag.java index 7fbfb4fd3..d8c199fdc 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/FieldErrorTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/FieldErrorTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/FileTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/FileTag.java index 65d55a675..efe045334 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/FileTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/FileTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/FormTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/FormTag.java index 44998c832..655c9a451 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/FormTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/FormTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/HeadTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/HeadTag.java index 2f33963eb..f2ad9ea72 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/HeadTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/HeadTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/HiddenTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/HiddenTag.java index 355cbb36d..75894de67 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/HiddenTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/HiddenTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/InputTransferSelectTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/InputTransferSelectTag.java index 70a963496..e6c692e81 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/InputTransferSelectTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/InputTransferSelectTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.ui; import org.apache.struts2.components.Component; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/LabelTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/LabelTag.java index 33b5e03d8..31682f743 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/LabelTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/LabelTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/OgnlTool.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/OgnlTool.java index 6fbfc10f3..e49314d98 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/OgnlTool.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/OgnlTool.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.ui; import ognl.Ognl; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/OptGroupTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/OptGroupTag.java index 741455f79..0de95f848 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/OptGroupTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/OptGroupTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTag.java index af2d42af6..850ac67c9 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/PasswordTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/PasswordTag.java index 26005494b..455dd1d7e 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/PasswordTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/PasswordTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/RadioTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/RadioTag.java index bd0bfa12f..818d9774d 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/RadioTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/RadioTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/ResetTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/ResetTag.java index ccd995276..20631b639 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/ResetTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/ResetTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/SelectTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/SelectTag.java index 9c0542e54..b45103a33 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/SelectTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/SelectTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java index d49313cb9..fd6bb0e90 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/TextFieldTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/TextFieldTag.java index f995fafad..97d07ae3a 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/TextFieldTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/TextFieldTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/TextareaTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/TextareaTag.java index a8217018c..2ae6566af 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/TextareaTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/TextareaTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/TokenTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/TokenTag.java index b8e8bdc25..9b3a5af0a 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/TokenTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/TokenTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/UpDownSelectTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/UpDownSelectTag.java index 091dc86a0..186a18d52 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/UpDownSelectTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/UpDownSelectTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java b/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java index 577a390e5..3de8f02f6 100644 --- a/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java +++ b/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.util; import java.util.HashMap; diff --git a/core/src/main/java/org/apache/struts2/views/util/ResourceUtil.java b/core/src/main/java/org/apache/struts2/views/util/ResourceUtil.java index ffa204fd4..ec5109c35 100644 --- a/core/src/main/java/org/apache/struts2/views/util/ResourceUtil.java +++ b/core/src/main/java/org/apache/struts2/views/util/ResourceUtil.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.util; import org.apache.struts2.RequestUtils; diff --git a/core/src/main/java/org/apache/struts2/views/util/TextUtil.java b/core/src/main/java/org/apache/struts2/views/util/TextUtil.java index 81f892d11..d0f13c202 100644 --- a/core/src/main/java/org/apache/struts2/views/util/TextUtil.java +++ b/core/src/main/java/org/apache/struts2/views/util/TextUtil.java @@ -1,20 +1,24 @@ /* * $Id$ * - * Copyright 2006 The Apache Software Foundation. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ + package org.apache.struts2.views.util; diff --git a/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java b/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java index 0754ce10b..8cda42bdc 100644 --- a/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java +++ b/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.util; import java.io.UnsupportedEncodingException; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/StrutsResourceLoader.java b/core/src/main/java/org/apache/struts2/views/velocity/StrutsResourceLoader.java index 67f28db8d..91d7be90e 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/StrutsResourceLoader.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/StrutsResourceLoader.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity; import java.io.InputStream; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityContext.java b/core/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityContext.java index 930f51318..b1bdc4912 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityContext.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityContext.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity; import org.apache.velocity.VelocityContext; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java b/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java index c3b64e177..e04048475 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity; import java.io.File; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java index fb58ea412..a76a14d94 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import java.io.IOException; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/ActionDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/ActionDirective.java index 560af490d..142167e67 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/ActionDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/ActionDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/ActionErrorDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/ActionErrorDirective.java index 710c035c9..670f02168 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/ActionErrorDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/ActionErrorDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/ActionMessageDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/ActionMessageDirective.java index f9545eb2d..2535a6a35 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/ActionMessageDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/ActionMessageDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/AnchorDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/AnchorDirective.java index 715bd5aba..fc0ac8b72 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/AnchorDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/AnchorDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/BeanDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/BeanDirective.java index 007f98605..083e33792 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/BeanDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/BeanDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxDirective.java index 73427a115..e53037336 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxListDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxListDirective.java index e5539a4ae..ed979aedf 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxListDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxListDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/ComboBoxDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/ComboBoxDirective.java index 69386e531..521719676 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/ComboBoxDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/ComboBoxDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/ComponentDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/ComponentDirective.java index 0d1b3f7f5..6837cedca 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/ComponentDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/ComponentDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/DateDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/DateDirective.java index 4cd0516de..78d9f0f71 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/DateDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/DateDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java index e46d556c0..1a488b8de 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/DoubleSelectDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/DoubleSelectDirective.java index 6dd32ce3c..b303c701c 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/DoubleSelectDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/DoubleSelectDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/FieldErrorDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/FieldErrorDirective.java index e4d68071b..d1451d9ce 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/FieldErrorDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/FieldErrorDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/FileDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/FileDirective.java index d309cd7fc..3675fc3c2 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/FileDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/FileDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/FormDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/FormDirective.java index 4db7be3b1..9d033f27d 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/FormDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/FormDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/HeadDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/HeadDirective.java index 3b919902f..4727fee90 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/HeadDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/HeadDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/HiddenDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/HiddenDirective.java index 797e3a906..1d3634cd4 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/HiddenDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/HiddenDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/I18nDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/I18nDirective.java index 2608456e1..befc239c4 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/I18nDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/I18nDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/IncludeDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/IncludeDirective.java index 01c40618f..b0972120b 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/IncludeDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/IncludeDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/InputTransferSelectDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/InputTransferSelectDirective.java index a48d43d5b..ef9718305 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/InputTransferSelectDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/InputTransferSelectDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import org.apache.struts2.components.Component; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/LabelDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/LabelDirective.java index 5312e6f01..3926c8e94 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/LabelDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/LabelDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/OptGroupDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/OptGroupDirective.java index cdb1c8e13..1edfc18fc 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/OptGroupDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/OptGroupDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/OptionTransferSelectDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/OptionTransferSelectDirective.java index a6679da82..738d37a9b 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/OptionTransferSelectDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/OptionTransferSelectDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/ParamDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/ParamDirective.java index 2210adfb2..72d5a621f 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/ParamDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/ParamDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.java index e7e272818..98225cc9c 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/PropertyDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/PropertyDirective.java index c994606c7..c86ae618d 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/PropertyDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/PropertyDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/PushDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/PushDirective.java index c4ba20223..5f3e24abf 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/PushDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/PushDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/RadioDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/RadioDirective.java index 1c7cf39fd..dded77b79 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/RadioDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/RadioDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/ResetDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/ResetDirective.java index cdd504f55..d58cae508 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/ResetDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/ResetDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/SelectDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/SelectDirective.java index 545bb1f6b..89739f409 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/SelectDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/SelectDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/SetDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/SetDirective.java index 845b3c54a..c826088a7 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/SetDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/SetDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/SubmitDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/SubmitDirective.java index 6ff6c45e0..7da388311 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/SubmitDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/SubmitDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/TextAreaDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/TextAreaDirective.java index af22fd21f..ca734eeb9 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/TextAreaDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/TextAreaDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/TextDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/TextDirective.java index 77733381e..df39004ca 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/TextDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/TextDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/TextFieldDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/TextFieldDirective.java index 97c03187c..1bf369336 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/TextFieldDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/TextFieldDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/TokenDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/TokenDirective.java index ce9bd6301..d2bb7aa68 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/TokenDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/TokenDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/URLDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/URLDirective.java index 111af0225..a14babf42 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/URLDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/URLDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/UpDownSelectDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/UpDownSelectDirective.java index d3872c17e..d2b89c126 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/components/UpDownSelectDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/UpDownSelectDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterElement.java b/core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterElement.java index 709894418..e181511b9 100644 --- a/core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterElement.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterElement.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.xslt; import java.util.HashMap; diff --git a/core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterNode.java b/core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterNode.java index 60b3d4272..34b2446b9 100644 --- a/core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterNode.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterNode.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.xslt; import java.util.ArrayList; diff --git a/core/src/main/java/org/apache/struts2/views/xslt/AdapterFactory.java b/core/src/main/java/org/apache/struts2/views/xslt/AdapterFactory.java index f4101deb9..2fd466504 100644 --- a/core/src/main/java/org/apache/struts2/views/xslt/AdapterFactory.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/AdapterFactory.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.xslt; import java.util.Collection; diff --git a/core/src/main/java/org/apache/struts2/views/xslt/AdapterNode.java b/core/src/main/java/org/apache/struts2/views/xslt/AdapterNode.java index c4afdaee4..c5063e219 100644 --- a/core/src/main/java/org/apache/struts2/views/xslt/AdapterNode.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/AdapterNode.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.xslt; import org.w3c.dom.Node; diff --git a/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java index 12335ba16..48046505c 100644 --- a/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.xslt; import java.util.ArrayList; diff --git a/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java index 2e3b18dd8..5e874f089 100644 --- a/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.xslt; import java.beans.IntrospectionException; diff --git a/core/src/main/java/org/apache/struts2/views/xslt/CollectionAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/CollectionAdapter.java index dc6629863..171a9a643 100644 --- a/core/src/main/java/org/apache/struts2/views/xslt/CollectionAdapter.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/CollectionAdapter.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.xslt; import java.util.ArrayList; diff --git a/core/src/main/java/org/apache/struts2/views/xslt/MapAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/MapAdapter.java index cbf0e4b6c..646e8afbe 100644 --- a/core/src/main/java/org/apache/struts2/views/xslt/MapAdapter.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/MapAdapter.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.xslt; import java.util.ArrayList; diff --git a/core/src/main/java/org/apache/struts2/views/xslt/ProxyAttrAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/ProxyAttrAdapter.java index ad0c66067..2bacc0ef2 100644 --- a/core/src/main/java/org/apache/struts2/views/xslt/ProxyAttrAdapter.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/ProxyAttrAdapter.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.xslt; import org.w3c.dom.Attr; diff --git a/core/src/main/java/org/apache/struts2/views/xslt/ProxyElementAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/ProxyElementAdapter.java index 2e13f6d12..18c6db3cc 100644 --- a/core/src/main/java/org/apache/struts2/views/xslt/ProxyElementAdapter.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/ProxyElementAdapter.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.xslt; import java.util.ArrayList; diff --git a/core/src/main/java/org/apache/struts2/views/xslt/ProxyNamedNodeMap.java b/core/src/main/java/org/apache/struts2/views/xslt/ProxyNamedNodeMap.java index 699fdfa61..e9e13472e 100644 --- a/core/src/main/java/org/apache/struts2/views/xslt/ProxyNamedNodeMap.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/ProxyNamedNodeMap.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.xslt; import org.w3c.dom.DOMException; diff --git a/core/src/main/java/org/apache/struts2/views/xslt/ProxyNodeAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/ProxyNodeAdapter.java index 4a1b6338e..72a138800 100644 --- a/core/src/main/java/org/apache/struts2/views/xslt/ProxyNodeAdapter.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/ProxyNodeAdapter.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.xslt; import org.w3c.dom.DOMException; diff --git a/core/src/main/java/org/apache/struts2/views/xslt/ProxyTextNodeAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/ProxyTextNodeAdapter.java index f9f726ce3..363305336 100644 --- a/core/src/main/java/org/apache/struts2/views/xslt/ProxyTextNodeAdapter.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/ProxyTextNodeAdapter.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.xslt; import org.w3c.dom.DOMException; diff --git a/core/src/main/java/org/apache/struts2/views/xslt/ServletURIResolver.java b/core/src/main/java/org/apache/struts2/views/xslt/ServletURIResolver.java index e0d54b23d..8b4d39c46 100644 --- a/core/src/main/java/org/apache/struts2/views/xslt/ServletURIResolver.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/ServletURIResolver.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.xslt; import java.io.InputStream; diff --git a/core/src/main/java/org/apache/struts2/views/xslt/SimpleAdapterDocument.java b/core/src/main/java/org/apache/struts2/views/xslt/SimpleAdapterDocument.java index e1a6775ba..02a2e5302 100644 --- a/core/src/main/java/org/apache/struts2/views/xslt/SimpleAdapterDocument.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/SimpleAdapterDocument.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.xslt; import java.util.Arrays; diff --git a/core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java b/core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java index b6157eae0..d061abff8 100644 --- a/core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.xslt; import java.util.List; diff --git a/core/src/main/java/org/apache/struts2/views/xslt/SimpleTextNode.java b/core/src/main/java/org/apache/struts2/views/xslt/SimpleTextNode.java index a19e491b8..6e96a4397 100644 --- a/core/src/main/java/org/apache/struts2/views/xslt/SimpleTextNode.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/SimpleTextNode.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.xslt; import org.apache.struts2.StrutsException; diff --git a/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java index 2c7c3e038..b7c1dad96 100644 --- a/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.xslt; import java.io.StringReader; diff --git a/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java b/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java index 31c1a5213..79a1ec95a 100644 --- a/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.xslt; import java.io.IOException; diff --git a/core/src/main/resources/org/apache/struts2/default.properties b/core/src/main/resources/org/apache/struts2/default.properties index 4c9975c5f..9a5a1670d 100644 --- a/core/src/main/resources/org/apache/struts2/default.properties +++ b/core/src/main/resources/org/apache/struts2/default.properties @@ -1,3 +1,23 @@ +# +# $Id$ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ### START SNIPPET: complete_file ### Struts default properties diff --git a/core/src/main/resources/org/apache/struts2/struts-messages.properties b/core/src/main/resources/org/apache/struts2/struts-messages.properties index 5688acd6d..1510f2e8d 100644 --- a/core/src/main/resources/org/apache/struts2/struts-messages.properties +++ b/core/src/main/resources/org/apache/struts2/struts-messages.properties @@ -1,3 +1,23 @@ +# +# $Id$ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# struts.messages.invalid.token=The form has already been processed or no token was supplied, please try again. struts.internal.invalid.token=Form token {0} does not match the session token {1}. diff --git a/core/src/main/resources/org/apache/struts2/struts-messages_da.properties b/core/src/main/resources/org/apache/struts2/struts-messages_da.properties index dca430ab3..532cb9eb0 100644 --- a/core/src/main/resources/org/apache/struts2/struts-messages_da.properties +++ b/core/src/main/resources/org/apache/struts2/struts-messages_da.properties @@ -1,3 +1,23 @@ +# +# $Id$ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# struts.messages.invalid.token=Denne form er allerede blevet behandlet eller der mangler en token, venligst pr�v igen. struts.internal.invalid.token=Form token {0} passer ikke med den token som findes i session {1}. diff --git a/core/src/main/resources/org/apache/struts2/struts-messages_de.properties b/core/src/main/resources/org/apache/struts2/struts-messages_de.properties index 030b0896c..725c92aca 100644 --- a/core/src/main/resources/org/apache/struts2/struts-messages_de.properties +++ b/core/src/main/resources/org/apache/struts2/struts-messages_de.properties @@ -1,3 +1,23 @@ +# +# $Id$ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# struts.messages.invalid.token=Das Formular wurde bereits verarbeitet oder es wurde kein Token angegeben, bitte versuchen Sie es erneut. struts.internal.invalid.token=Das Formular Token {0} stimmt nicht mit dem Session Token {1} \u00fcberein. diff --git a/core/src/main/resources/org/apache/struts2/struts-messages_pl.properties b/core/src/main/resources/org/apache/struts2/struts-messages_pl.properties index a954abf0c..2463e50bb 100644 --- a/core/src/main/resources/org/apache/struts2/struts-messages_pl.properties +++ b/core/src/main/resources/org/apache/struts2/struts-messages_pl.properties @@ -1,3 +1,23 @@ +# +# $Id$ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# struts.messages.invalid.token=Formularz zosta\u0142 ju\u017c przetworzony lub nie za\u0142\u0105czono tokena, spr\u00f3buj ponownie. struts.internal.invalid.token=Token formularza {0} nie pasuje do tokena sesji {1}. diff --git a/core/src/main/resources/org/apache/struts2/struts-messages_pt.properties b/core/src/main/resources/org/apache/struts2/struts-messages_pt.properties index 841895cb1..8a6b97689 100644 --- a/core/src/main/resources/org/apache/struts2/struts-messages_pt.properties +++ b/core/src/main/resources/org/apache/struts2/struts-messages_pt.properties @@ -1,13 +1,33 @@ -struts.messages.invalid.token=O formulario já foi processado ou nenhum token foi gerado, por favor tente novamente. -struts.internal.invalid.token=O token do formulário {0} é diferente do token de sessão {1}. +# +# $Id$ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +struts.messages.invalid.token=O formulario j� foi processado ou nenhum token foi gerado, por favor tente novamente. +struts.internal.invalid.token=O token do formul�rio {0} � diferente do token de sess�o {1}. struts.messages.bypass.request=Ignorando {0}/ {1} struts.messages.current.file=Arquivo {0} {1} {2} {3} -struts.messages.invalid.file=Não foi possível encontra um Nome de Arquivo para {0}. Verifique se um arquivo válido foi submetido. -struts.messages.invalid.content.type=Não foi possível encontrar um Content-Type para {0}. Verifique se um arquivo válido foi submetido. +struts.messages.invalid.file=N�o foi poss�vel encontra um Nome de Arquivo para {0}. Verifique se um arquivo v�lido foi submetido. +struts.messages.invalid.content.type=N�o foi poss�vel encontrar um Content-Type para {0}. Verifique se um arquivo v�lido foi submetido. struts.messages.removing.file=Removendo arquivo {0} {1} struts.messages.error.uploading=Erro de uploading: {0} struts.messages.error.file.too.large=Arquivo muito grande: {0} "{1}" {2} -struts.messages.error.content.type.not.allowed=Content-Type não permitido: {0} "{1}" {2} +struts.messages.error.content.type.not.allowed=Content-Type n�o permitido: {0} "{1}" {2} -devmode.notification=Notificação para o Desenvolvedor (altere o paramêtro struts.devMode para false para desabilitar esta mensagem):\n{0} +devmode.notification=Notifica��o para o Desenvolvedor (altere o param�tro struts.devMode para false para desabilitar esta mensagem):\n{0} diff --git a/core/src/main/resources/struts-2.0.dtd b/core/src/main/resources/struts-2.0.dtd index 9ae538905..7400cc624 100644 --- a/core/src/main/resources/struts-2.0.dtd +++ b/core/src/main/resources/struts-2.0.dtd @@ -21,7 +21,6 @@ * under the License. */ --> - - diff --git a/core/src/main/resources/template/css_xhtml/theme.properties b/core/src/main/resources/template/css_xhtml/theme.properties index 0a9fb9e76..81346c707 100644 --- a/core/src/main/resources/template/css_xhtml/theme.properties +++ b/core/src/main/resources/template/css_xhtml/theme.properties @@ -1 +1,21 @@ +# +# $Id$ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# parent = xhtml diff --git a/core/src/main/resources/template/xhtml/theme.properties b/core/src/main/resources/template/xhtml/theme.properties index adf79b1fb..84dc15580 100644 --- a/core/src/main/resources/template/xhtml/theme.properties +++ b/core/src/main/resources/template/xhtml/theme.properties @@ -1 +1,21 @@ +# +# $Id$ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# parent = simple diff --git a/core/src/site/confluence/ww-template-autoexport.html b/core/src/site/confluence/ww-template-autoexport.html index 2d4dc50f8..d01ec7e8a 100644 --- a/core/src/site/confluence/ww-template-autoexport.html +++ b/core/src/site/confluence/ww-template-autoexport.html @@ -1,3 +1,25 @@ + diff --git a/core/src/test/resources/org/apache/struts2/TestAction.properties b/core/src/test/resources/org/apache/struts2/TestAction.properties index 06c433969..173d97b77 100644 --- a/core/src/test/resources/org/apache/struts2/TestAction.properties +++ b/core/src/test/resources/org/apache/struts2/TestAction.properties @@ -1,3 +1,23 @@ +# +# $Id$ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# simpleKey=Simple Message expressionKey=Foo is ${foo} messageFormatKey=Params are {0} {1} {2} diff --git a/core/src/test/resources/org/apache/struts2/components/template/dummy.properties b/core/src/test/resources/org/apache/struts2/components/template/dummy.properties index e69de29bb..4a1b3c11e 100644 --- a/core/src/test/resources/org/apache/struts2/components/template/dummy.properties +++ b/core/src/test/resources/org/apache/struts2/components/template/dummy.properties @@ -0,0 +1,20 @@ +# +# $Id$ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# diff --git a/core/src/test/resources/org/apache/struts2/components/template/theme1/themeThroughClassPath.properties b/core/src/test/resources/org/apache/struts2/components/template/theme1/themeThroughClassPath.properties index 1b04afac2..1548e58c6 100644 --- a/core/src/test/resources/org/apache/struts2/components/template/theme1/themeThroughClassPath.properties +++ b/core/src/test/resources/org/apache/struts2/components/template/theme1/themeThroughClassPath.properties @@ -1 +1,21 @@ +# +# $Id$ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# parent=xhtml diff --git a/core/src/test/resources/org/apache/struts2/components/template/theme1/themeThroughFileSystem.properties b/core/src/test/resources/org/apache/struts2/components/template/theme1/themeThroughFileSystem.properties index 1b04afac2..1548e58c6 100644 --- a/core/src/test/resources/org/apache/struts2/components/template/theme1/themeThroughFileSystem.properties +++ b/core/src/test/resources/org/apache/struts2/components/template/theme1/themeThroughFileSystem.properties @@ -1 +1,21 @@ +# +# $Id$ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# parent=xhtml diff --git a/core/src/test/resources/org/apache/struts2/components/tempo.properties b/core/src/test/resources/org/apache/struts2/components/tempo.properties index e69de29bb..4a1b3c11e 100644 --- a/core/src/test/resources/org/apache/struts2/components/tempo.properties +++ b/core/src/test/resources/org/apache/struts2/components/tempo.properties @@ -0,0 +1,20 @@ +# +# $Id$ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# diff --git a/core/src/test/resources/org/apache/struts2/dispatcher/someJspFile.jsp b/core/src/test/resources/org/apache/struts2/dispatcher/someJspFile.jsp index 9f12a0369..5644abe30 100644 --- a/core/src/test/resources/org/apache/struts2/dispatcher/someJspFile.jsp +++ b/core/src/test/resources/org/apache/struts2/dispatcher/someJspFile.jsp @@ -1,3 +1,25 @@ +<%-- +/* + * $Id$ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--%> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%-- diff --git a/core/src/test/resources/org/apache/struts2/interceptor/FileUploadInterceptor.properties b/core/src/test/resources/org/apache/struts2/interceptor/FileUploadInterceptor.properties index a5ad395b8..fabce245e 100644 --- a/core/src/test/resources/org/apache/struts2/interceptor/FileUploadInterceptor.properties +++ b/core/src/test/resources/org/apache/struts2/interceptor/FileUploadInterceptor.properties @@ -1,3 +1,23 @@ +# +# $Id$ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ### Unit test of FileUploadInterceptor struts.messages.error.file.too.large=The file is to large to be uploaded {0} {1} {2} {3} struts.messages.error.uploading=Error uploading: {0} diff --git a/core/src/test/resources/org/apache/struts2/othertest.properties b/core/src/test/resources/org/apache/struts2/othertest.properties index f254366d0..6c7d32d75 100644 --- a/core/src/test/resources/org/apache/struts2/othertest.properties +++ b/core/src/test/resources/org/apache/struts2/othertest.properties @@ -1 +1,21 @@ +# +# $Id$ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# othertestkey=othertestvalue diff --git a/core/src/test/resources/struts.properties b/core/src/test/resources/struts.properties index 5766ea515..281991bf2 100644 --- a/core/src/test/resources/struts.properties +++ b/core/src/test/resources/struts.properties @@ -1,3 +1,23 @@ +# +# $Id$ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# struts.i18n.encoding=ISO-8859-1 struts.locale=de_DE struts.multipart.saveDir=\temp diff --git a/core/src/test/resources/template/test/Component.ftl b/core/src/test/resources/template/test/Component.ftl index 5770a3304..3d700302b 100644 --- a/core/src/test/resources/template/test/Component.ftl +++ b/core/src/test/resources/template/test/Component.ftl @@ -10,7 +10,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -18,7 +18,6 @@ * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * */ --> param hello = ${parameters.hello} diff --git a/core/src/test/resources/template/test/checkbox.jsp b/core/src/test/resources/template/test/checkbox.jsp index 1982c7d9d..00e177bb8 100644 --- a/core/src/test/resources/template/test/checkbox.jsp +++ b/core/src/test/resources/template/test/checkbox.jsp @@ -10,7 +10,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -18,7 +18,6 @@ * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * */ --%> <%@ taglib prefix="s" uri="/struts-tags" %> diff --git a/core/src/test/resources/test.properties b/core/src/test/resources/test.properties index 8ec93311e..62a06943a 100644 --- a/core/src/test/resources/test.properties +++ b/core/src/test/resources/test.properties @@ -1 +1,21 @@ +# +# $Id$ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# testkey=testvalue diff --git a/core/src/test/resources/testmessages.properties b/core/src/test/resources/testmessages.properties index 398743879..75d59ecfd 100644 --- a/core/src/test/resources/testmessages.properties +++ b/core/src/test/resources/testmessages.properties @@ -1,2 +1,22 @@ +# +# $Id$ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# default.testmessage=This is a test message struts.messages.invalid.token=Replaced message for token tag diff --git a/core/src/test/resources/testmessages2.properties b/core/src/test/resources/testmessages2.properties index 12472b80a..eeae93a03 100644 --- a/core/src/test/resources/testmessages2.properties +++ b/core/src/test/resources/testmessages2.properties @@ -1 +1,21 @@ +# +# $Id$ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# default.testmessage2=This is another test message diff --git a/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java b/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java index be03bd81a..6a8b7fc7d 100644 --- a/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java +++ b/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.codebehind; import java.net.MalformedURLException; diff --git a/plugins/codebehind/src/main/java/org/apache/struts2/config/Action.java b/plugins/codebehind/src/main/java/org/apache/struts2/config/Action.java index 417928ab9..f139202a8 100644 --- a/plugins/codebehind/src/main/java/org/apache/struts2/config/Action.java +++ b/plugins/codebehind/src/main/java/org/apache/struts2/config/Action.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.config; import java.lang.annotation.Retention; diff --git a/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java b/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java index 305bdc4c5..88ee3dd64 100644 --- a/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java +++ b/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.config; import java.lang.annotation.Annotation; diff --git a/plugins/codebehind/src/main/java/org/apache/struts2/config/Namespace.java b/plugins/codebehind/src/main/java/org/apache/struts2/config/Namespace.java index 3ee34161a..8396825f4 100644 --- a/plugins/codebehind/src/main/java/org/apache/struts2/config/Namespace.java +++ b/plugins/codebehind/src/main/java/org/apache/struts2/config/Namespace.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.config; import java.lang.annotation.Retention; diff --git a/plugins/codebehind/src/main/java/org/apache/struts2/config/ParentPackage.java b/plugins/codebehind/src/main/java/org/apache/struts2/config/ParentPackage.java index b74cee888..0a86c9c7b 100644 --- a/plugins/codebehind/src/main/java/org/apache/struts2/config/ParentPackage.java +++ b/plugins/codebehind/src/main/java/org/apache/struts2/config/ParentPackage.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.config; import java.lang.annotation.Retention; diff --git a/plugins/codebehind/src/main/java/org/apache/struts2/config/Result.java b/plugins/codebehind/src/main/java/org/apache/struts2/config/Result.java index 61227ff71..fc7c5bd4a 100644 --- a/plugins/codebehind/src/main/java/org/apache/struts2/config/Result.java +++ b/plugins/codebehind/src/main/java/org/apache/struts2/config/Result.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.config; import com.opensymphony.xwork2.Action; diff --git a/plugins/codebehind/src/main/java/org/apache/struts2/config/Results.java b/plugins/codebehind/src/main/java/org/apache/struts2/config/Results.java index 99b2db87b..d299a5bed 100644 --- a/plugins/codebehind/src/main/java/org/apache/struts2/config/Results.java +++ b/plugins/codebehind/src/main/java/org/apache/struts2/config/Results.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.config; import java.lang.annotation.Retention; diff --git a/plugins/codebehind/src/main/resources/struts-plugin.xml b/plugins/codebehind/src/main/resources/struts-plugin.xml index 74d82a89b..43b66c71b 100644 --- a/plugins/codebehind/src/main/resources/struts-plugin.xml +++ b/plugins/codebehind/src/main/resources/struts-plugin.xml @@ -21,7 +21,6 @@ * under the License. */ --> - diff --git a/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java b/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java index d627b68f2..760bbc506 100644 --- a/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java +++ b/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.codebehind; import java.net.MalformedURLException; diff --git a/plugins/codebehind/src/test/java/org/apache/struts2/config/AnnotatedAction.java b/plugins/codebehind/src/test/java/org/apache/struts2/config/AnnotatedAction.java index 43df3ca67..61ee16c4e 100644 --- a/plugins/codebehind/src/test/java/org/apache/struts2/config/AnnotatedAction.java +++ b/plugins/codebehind/src/test/java/org/apache/struts2/config/AnnotatedAction.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.config; @Action(name="myaction",namespace="/foo") diff --git a/plugins/codebehind/src/test/java/org/apache/struts2/config/AnotherAnnotatedObject.java b/plugins/codebehind/src/test/java/org/apache/struts2/config/AnotherAnnotatedObject.java index 4a7cda56f..2238bb423 100644 --- a/plugins/codebehind/src/test/java/org/apache/struts2/config/AnotherAnnotatedObject.java +++ b/plugins/codebehind/src/test/java/org/apache/struts2/config/AnotherAnnotatedObject.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.config; @Action(name="myaction2") diff --git a/plugins/codebehind/src/test/java/org/apache/struts2/config/ClasspathPackageProviderTest.java b/plugins/codebehind/src/test/java/org/apache/struts2/config/ClasspathPackageProviderTest.java index 1b03fd128..646f6b10c 100644 --- a/plugins/codebehind/src/test/java/org/apache/struts2/config/ClasspathPackageProviderTest.java +++ b/plugins/codebehind/src/test/java/org/apache/struts2/config/ClasspathPackageProviderTest.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.config; import java.util.HashMap; diff --git a/plugins/codebehind/src/test/java/org/apache/struts2/config/CustomNamespaceAction.java b/plugins/codebehind/src/test/java/org/apache/struts2/config/CustomNamespaceAction.java index e4460f685..8231bb408 100644 --- a/plugins/codebehind/src/test/java/org/apache/struts2/config/CustomNamespaceAction.java +++ b/plugins/codebehind/src/test/java/org/apache/struts2/config/CustomNamespaceAction.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.config; @Namespace("/mynamespace") diff --git a/plugins/codebehind/src/test/java/org/apache/struts2/config/CustomParentPackageAction.java b/plugins/codebehind/src/test/java/org/apache/struts2/config/CustomParentPackageAction.java index f88f5e154..734d2f927 100644 --- a/plugins/codebehind/src/test/java/org/apache/struts2/config/CustomParentPackageAction.java +++ b/plugins/codebehind/src/test/java/org/apache/struts2/config/CustomParentPackageAction.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.config; @ParentPackage("custom-package") diff --git a/plugins/codebehind/src/test/java/org/apache/struts2/config/cltest/ActionImpl.java b/plugins/codebehind/src/test/java/org/apache/struts2/config/cltest/ActionImpl.java index b6dc16374..6863e7553 100644 --- a/plugins/codebehind/src/test/java/org/apache/struts2/config/cltest/ActionImpl.java +++ b/plugins/codebehind/src/test/java/org/apache/struts2/config/cltest/ActionImpl.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.config.cltest; import com.opensymphony.xwork2.Action; diff --git a/plugins/codebehind/src/test/java/org/apache/struts2/config/cltest/OneResultAction.java b/plugins/codebehind/src/test/java/org/apache/struts2/config/cltest/OneResultAction.java index 1a0724c51..0b91bd11a 100644 --- a/plugins/codebehind/src/test/java/org/apache/struts2/config/cltest/OneResultAction.java +++ b/plugins/codebehind/src/test/java/org/apache/struts2/config/cltest/OneResultAction.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.config.cltest; import org.apache.struts2.config.Result; diff --git a/plugins/codebehind/src/test/java/org/apache/struts2/config/cltest/TwoResultAction.java b/plugins/codebehind/src/test/java/org/apache/struts2/config/cltest/TwoResultAction.java index dab878808..a62e02bcc 100644 --- a/plugins/codebehind/src/test/java/org/apache/struts2/config/cltest/TwoResultAction.java +++ b/plugins/codebehind/src/test/java/org/apache/struts2/config/cltest/TwoResultAction.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.config.cltest; import org.apache.struts2.config.Result; diff --git a/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java b/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java index 25be8cfb2..457c97d7e 100644 --- a/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java +++ b/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.config_browser; import java.util.Set; diff --git a/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java b/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java index 43215b5d5..82c22c42d 100644 --- a/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java +++ b/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.config_browser; import java.io.IOException; diff --git a/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ListValidatorsAction.java b/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ListValidatorsAction.java index 4efafc67a..dd22b55d7 100644 --- a/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ListValidatorsAction.java +++ b/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ListValidatorsAction.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.config_browser; import java.util.Collections; diff --git a/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowBeansAction.java b/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowBeansAction.java index 4d5de03d1..3cfb82259 100644 --- a/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowBeansAction.java +++ b/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowBeansAction.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.config_browser; import java.util.Map; diff --git a/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java b/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java index c9e17b568..6bd334367 100644 --- a/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java +++ b/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.config_browser; import java.beans.PropertyDescriptor; diff --git a/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConstantsAction.java b/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConstantsAction.java index d063bcedf..b328da6b2 100644 --- a/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConstantsAction.java +++ b/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConstantsAction.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.config_browser; import java.util.HashMap; diff --git a/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowJarsAction.java b/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowJarsAction.java index 9b4a37688..06d7a0e1f 100644 --- a/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowJarsAction.java +++ b/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowJarsAction.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.config_browser; import java.io.IOException; diff --git a/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java b/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java index 105ca13d8..0984e14b6 100644 --- a/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java +++ b/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.config_browser; import java.beans.BeanInfo; diff --git a/plugins/config-browser/src/main/resources/config-browser/config-styles.css b/plugins/config-browser/src/main/resources/config-browser/config-styles.css index 5fd091325..eb42c4bb2 100644 --- a/plugins/config-browser/src/main/resources/config-browser/config-styles.css +++ b/plugins/config-browser/src/main/resources/config-browser/config-styles.css @@ -1,3 +1,24 @@ +/* + * $Id$ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + <#-- * $Id$ * diff --git a/plugins/config-browser/src/main/resources/struts-plugin.xml b/plugins/config-browser/src/main/resources/struts-plugin.xml index 47cc9b005..03baac1ff 100644 --- a/plugins/config-browser/src/main/resources/struts-plugin.xml +++ b/plugins/config-browser/src/main/resources/struts-plugin.xml @@ -21,7 +21,6 @@ * under the License. */ --> - diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml index 83217d85a..9404dfa09 100644 --- a/plugins/dojo/pom.xml +++ b/plugins/dojo/pom.xml @@ -47,7 +47,6 @@ - diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractRemoteBean.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractRemoteBean.java index 9068a3753..b7e58c73e 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractRemoteBean.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractRemoteBean.java @@ -1,20 +1,24 @@ /* * $Id$ * - * Copyright 2006 The Apache Software Foundation. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ + package org.apache.struts2.dojo.components; import java.util.Random; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractValidateBean.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractValidateBean.java index 7bf0a28e6..5bf9705a4 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractValidateBean.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractValidateBean.java @@ -1,20 +1,24 @@ /* * $Id$ * - * Copyright 2006 The Apache Software Foundation. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ + package org.apache.struts2.dojo.components; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java index 028e98118..ace440edf 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Anchor.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.components; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java index 9236f9cc9..56193204d 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.components; import java.util.Random; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java index 2923ae2f2..0e027abd5 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.components; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java index 2286f5b7a..22fb32a27 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.components; import java.text.DateFormat; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div.java index 6677e099d..ae45789b8 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.components; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Head.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Head.java index b62ba3ae5..814a510ac 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Head.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Head.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.components; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/RemoteBean.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/RemoteBean.java index 2c4f3f9f2..a65afb2b5 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/RemoteBean.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/RemoteBean.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.components; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java index 8c2607947..e402f644a 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.components; import java.io.Writer; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel.java index 80a25c7b1..d7b6f879e 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.components; import java.util.Random; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TextArea.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TextArea.java index 4b5b0db38..c61dd70a4 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TextArea.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TextArea.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.components; import java.util.Random; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree.java index 1272b6161..123a5c000 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.components; import java.io.Writer; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TreeNode.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TreeNode.java index 8a24ae946..e65276952 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TreeNode.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TreeNode.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.components; import java.util.Random; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/DojoTagLibrary.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/DojoTagLibrary.java index fa83080a4..ac2f41695 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/DojoTagLibrary.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/DojoTagLibrary.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views; import java.util.Arrays; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/AnchorModel.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/AnchorModel.java index 5152f08ec..42dd5fb93 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/AnchorModel.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/AnchorModel.java @@ -1,20 +1,24 @@ /* * $Id$ * - * Copyright 2006 The Apache Software Foundation. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ + package org.apache.struts2.dojo.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/AutocompleterModel.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/AutocompleterModel.java index 131379bf7..69783d4b8 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/AutocompleterModel.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/AutocompleterModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/BindModel.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/BindModel.java index da8f195bd..9805b6f7a 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/BindModel.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/BindModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/DateTimePickerModel.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/DateTimePickerModel.java index babb36914..0e748853b 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/DateTimePickerModel.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/DateTimePickerModel.java @@ -1,20 +1,24 @@ /* * $Id$ * - * Copyright 2006 The Apache Software Foundation. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ + package org.apache.struts2.dojo.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/DivModel.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/DivModel.java index 7bbf5a19d..0d7d8afe1 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/DivModel.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/DivModel.java @@ -1,20 +1,24 @@ /* * $Id$ * - * Copyright 2006 The Apache Software Foundation. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ + package org.apache.struts2.dojo.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/DojoModels.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/DojoModels.java index 457f08674..c094662c6 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/DojoModels.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/DojoModels.java @@ -1,20 +1,24 @@ /* * $Id$ * - * Copyright 2006 The Apache Software Foundation. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ + package org.apache.struts2.dojo.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/HeadModel.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/HeadModel.java index 70100ffdb..b5fdefeaf 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/HeadModel.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/HeadModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/SubmitModel.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/SubmitModel.java index bc071d286..c295e10c5 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/SubmitModel.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/SubmitModel.java @@ -1,20 +1,24 @@ /* * $Id$ * - * Copyright 2006 The Apache Software Foundation. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ + package org.apache.struts2.dojo.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TabbedPanelModel.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TabbedPanelModel.java index c61e38d26..d597ee8f7 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TabbedPanelModel.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TabbedPanelModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TextAreaModel.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TextAreaModel.java index 07a79b9da..703d3041e 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TextAreaModel.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TextAreaModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TreeModel.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TreeModel.java index 3b50b91f3..f3f69c1f1 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TreeModel.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TreeModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TreeNodeModel.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TreeNodeModel.java index ab21e1cca..773d77693 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TreeNodeModel.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/TreeNodeModel.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AbstractRemoteTag.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AbstractRemoteTag.java index acae58fc1..af11e04b8 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AbstractRemoteTag.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AbstractRemoteTag.java @@ -1,20 +1,24 @@ /* * $Id$ * - * Copyright 2006 The Apache Software Foundation. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ + package org.apache.struts2.dojo.views.jsp.ui; import org.apache.struts2.dojo.components.RemoteBean; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AbstractValidateTag.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AbstractValidateTag.java index 6d06e4a1e..193fff836 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AbstractValidateTag.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AbstractValidateTag.java @@ -1,20 +1,24 @@ /* * $Id$ * - * Copyright 2006 The Apache Software Foundation. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ + package org.apache.struts2.dojo.views.jsp.ui; import org.apache.struts2.dojo.components.AbstractValidateBean; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTag.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTag.java index 581a653a7..9b95c431a 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTag.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTag.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTag.java index 969852457..4f7667f59 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTag.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/BindTag.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/BindTag.java index 2180665a5..e3bc988b9 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/BindTag.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/BindTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTag.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTag.java index 45fc2ad08..9d3c1f6be 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTag.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DivTag.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DivTag.java index 890e5c504..81244fb2b 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DivTag.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DivTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/HeadTag.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/HeadTag.java index 1b43e2938..05a7a8186 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/HeadTag.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/HeadTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/SubmitTag.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/SubmitTag.java index 44880d377..f29b86a29 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/SubmitTag.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/SubmitTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TabbedPanelTag.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TabbedPanelTag.java index c77bf0371..d70db29f7 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TabbedPanelTag.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TabbedPanelTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TextareaTag.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TextareaTag.java index d4ccd9adb..437ebd1fa 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TextareaTag.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TextareaTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TreeNodeTag.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TreeNodeTag.java index 4146d33c2..291a2d442 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TreeNodeTag.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TreeNodeTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TreeTag.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TreeTag.java index 9f4169c49..79fef3956 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TreeTag.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/TreeTag.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.jsp.ui; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AnchorDirective.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AnchorDirective.java index 2c2d6d3ed..deef0a340 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AnchorDirective.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AnchorDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AutocompleterDirective.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AutocompleterDirective.java index 42dae7e56..4297ec9cf 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AutocompleterDirective.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/AutocompleterDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/BindDirective.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/BindDirective.java index cb069cc55..0c774c10f 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/BindDirective.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/BindDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DateTimePickerDirective.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DateTimePickerDirective.java index 23bde3b1e..06a5bad1f 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DateTimePickerDirective.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DateTimePickerDirective.java @@ -1,20 +1,24 @@ /* * $Id$ * - * Copyright 2006 The Apache Software Foundation. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ + package org.apache.struts2.dojo.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DivDirective.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DivDirective.java index 1355eeedd..987e236e7 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DivDirective.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DivDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DojoAbstractDirective.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DojoAbstractDirective.java index b0433dc1b..fe46811ec 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DojoAbstractDirective.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/DojoAbstractDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.velocity.components; import org.apache.struts2.views.velocity.components.AbstractDirective; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/HeadDirective.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/HeadDirective.java index 2b1e5c9f7..b1cd7c9b9 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/HeadDirective.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/HeadDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/SubmitDirective.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/SubmitDirective.java index 391ddf8bb..135639fe8 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/SubmitDirective.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/SubmitDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TabbedPanelDirective.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TabbedPanelDirective.java index 52c30b45e..ca61c4a7b 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TabbedPanelDirective.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TabbedPanelDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TextAreaDirective.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TextAreaDirective.java index 19c572adb..b13299a39 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TextAreaDirective.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TextAreaDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TreeDirective.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TreeDirective.java index b98a0583f..79dd533e1 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TreeDirective.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TreeDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TreeNodeDirective.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TreeNodeDirective.java index 0d50d8ab2..3a52bd332 100644 --- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TreeNodeDirective.java +++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/TreeNodeDirective.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.velocity.components; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/StrutsTabContainer.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/StrutsTabContainer.js index f7b1e44ad..d6c182041 100644 --- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/StrutsTabContainer.js +++ b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/StrutsTabContainer.js @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + dojo.provide("struts.widget.StrutsTabContainer"); dojo.require("dojo.widget.TabContainer"); diff --git a/plugins/dojo/src/main/resources/template/ajax/theme.properties b/plugins/dojo/src/main/resources/template/ajax/theme.properties index e69de29bb..4a1b3c11e 100644 --- a/plugins/dojo/src/main/resources/template/ajax/theme.properties +++ b/plugins/dojo/src/main/resources/template/ajax/theme.properties @@ -0,0 +1,20 @@ +# +# $Id$ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/TestAction.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/TestAction.java index 80e848689..01223204b 100644 --- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/TestAction.java +++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/TestAction.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo; import java.util.Collection; diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java index 44ddb1235..4aaf72e68 100644 --- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java +++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractTagTest.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.jsp.ui; import java.io.File; diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java index 6b9361e46..305513cd7 100644 --- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java +++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.jsp.ui; import java.beans.IntrospectionException; diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTest.java index d4498dcaf..e41ea468e 100644 --- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTest.java +++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTest.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.jsp.ui; import org.apache.struts2.dojo.TestAction; diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTest.java index fc3135d52..7dd503bf1 100644 --- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTest.java +++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTest.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.jsp.ui; /** diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/BindTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/BindTest.java index 01a3d12ab..e0358ff3f 100644 --- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/BindTest.java +++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/BindTest.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.jsp.ui; import org.apache.struts2.dojo.TestAction; diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/Category.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/Category.java index 518ca82f8..4295b205d 100644 --- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/Category.java +++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/Category.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.jsp.ui; import java.util.ArrayList; diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest.java index 80d2b9946..cedd72fee 100644 --- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest.java +++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.jsp.ui; import java.text.DateFormat; diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DivTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DivTest.java index 76db702b1..58a923030 100644 --- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DivTest.java +++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DivTest.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.jsp.ui; import org.apache.struts2.dojo.TestAction; diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest.java index 87486521c..f859c45b8 100644 --- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest.java +++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.jsp.ui; diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpServletRequest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpServletRequest.java index 605c75af2..5c29ee223 100644 --- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpServletRequest.java +++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpServletRequest.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.jsp.ui; import java.util.Collections; diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpServletResponse.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpServletResponse.java index eacec151a..6a1828d4b 100644 --- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpServletResponse.java +++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpServletResponse.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.jsp.ui; import java.io.ByteArrayOutputStream; diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpSession.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpSession.java index a91cde943..dfb868f4c 100644 --- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpSession.java +++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockHttpSession.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.jsp.ui; import java.util.Enumeration; diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockJspWriter.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockJspWriter.java index 46559d50a..75d422627 100644 --- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockJspWriter.java +++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockJspWriter.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.jsp.ui; import java.io.IOException; diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockPageContext.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockPageContext.java index 22e206cf5..c73a3f130 100644 --- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockPageContext.java +++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockPageContext.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.jsp.ui; import java.util.HashMap; diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockServletContext.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockServletContext.java index 5be38fada..981179af2 100644 --- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockServletContext.java +++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/StrutsMockServletContext.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.jsp.ui; import java.io.InputStream; diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/SubmitAjaxTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/SubmitAjaxTest.java index d58f1818f..e94144917 100644 --- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/SubmitAjaxTest.java +++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/SubmitAjaxTest.java @@ -1,20 +1,24 @@ /* * $Id$ * - * Copyright 2006 The Apache Software Foundation. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ + package org.apache.struts2.dojo.views.jsp.ui; import org.apache.struts2.dojo.TestAction; diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/TabbedPanelTagTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/TabbedPanelTagTest.java index 980b7cd5e..049f56aa1 100644 --- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/TabbedPanelTagTest.java +++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/TabbedPanelTagTest.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.jsp.ui; /** diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/TreeTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/TreeTest.java index 59b96cdfa..bec196fb4 100644 --- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/TreeTest.java +++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/TreeTest.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dojo.views.jsp.ui; diff --git a/plugins/dojo/src/test/resources/struts.properties b/plugins/dojo/src/test/resources/struts.properties index 5766ea515..281991bf2 100644 --- a/plugins/dojo/src/test/resources/struts.properties +++ b/plugins/dojo/src/test/resources/struts.properties @@ -1,3 +1,23 @@ +# +# $Id$ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# struts.i18n.encoding=ISO-8859-1 struts.locale=de_DE struts.multipart.saveDir=\temp diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml index 9593313cc..2c5479da4 100644 --- a/plugins/dwr/pom.xml +++ b/plugins/dwr/pom.xml @@ -1,7 +1,7 @@ - diff --git a/plugins/jfreechart/src/main/java/org/apache/struts2/dispatcher/ChartResult.java b/plugins/jfreechart/src/main/java/org/apache/struts2/dispatcher/ChartResult.java index 65a5d1a01..3e19fa570 100644 --- a/plugins/jfreechart/src/main/java/org/apache/struts2/dispatcher/ChartResult.java +++ b/plugins/jfreechart/src/main/java/org/apache/struts2/dispatcher/ChartResult.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dispatcher; import org.apache.struts2.ServletActionContext; diff --git a/plugins/jfreechart/src/main/resources/struts-plugin.xml b/plugins/jfreechart/src/main/resources/struts-plugin.xml index 8a0a56d08..727a60b94 100644 --- a/plugins/jfreechart/src/main/resources/struts-plugin.xml +++ b/plugins/jfreechart/src/main/resources/struts-plugin.xml @@ -21,7 +21,6 @@ * under the License. */ --> - diff --git a/plugins/jfreechart/src/test/java/org/apache/struts2/dispatcher/ChartResultTest.java b/plugins/jfreechart/src/test/java/org/apache/struts2/dispatcher/ChartResultTest.java index 022d47859..078d595d8 100644 --- a/plugins/jfreechart/src/test/java/org/apache/struts2/dispatcher/ChartResultTest.java +++ b/plugins/jfreechart/src/test/java/org/apache/struts2/dispatcher/ChartResultTest.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.dispatcher; import com.mockobjects.dynamic.Mock; diff --git a/plugins/jsf/src/main/java/org/apache/struts2/jsf/ApplyRequestValuesInterceptor.java b/plugins/jsf/src/main/java/org/apache/struts2/jsf/ApplyRequestValuesInterceptor.java index 7b604dd5e..0b6d3ab94 100644 --- a/plugins/jsf/src/main/java/org/apache/struts2/jsf/ApplyRequestValuesInterceptor.java +++ b/plugins/jsf/src/main/java/org/apache/struts2/jsf/ApplyRequestValuesInterceptor.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.jsf; import javax.faces.FacesException; diff --git a/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesInterceptor.java b/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesInterceptor.java index e6ea9913f..b3ab48ded 100644 --- a/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesInterceptor.java +++ b/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesInterceptor.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.jsf; import javax.faces.context.FacesContext; diff --git a/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesRender.java b/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesRender.java index 3499b7350..c9ce35f6b 100755 --- a/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesRender.java +++ b/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesRender.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.jsf; import java.io.IOException; diff --git a/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesResult.java b/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesResult.java index f98fa030b..1f3ec6a1e 100644 --- a/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesResult.java +++ b/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesResult.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.jsf; import javax.faces.application.ViewHandler; diff --git a/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java b/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java index 9d58303aa..18ac0df2b 100644 --- a/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java +++ b/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.jsf; import java.lang.reflect.Constructor; diff --git a/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSupport.java b/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSupport.java index 7453fb08f..aecfe9290 100644 --- a/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSupport.java +++ b/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSupport.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.jsf; import javax.faces.context.FacesContext; diff --git a/plugins/jsf/src/main/java/org/apache/struts2/jsf/InvokeApplicationInterceptor.java b/plugins/jsf/src/main/java/org/apache/struts2/jsf/InvokeApplicationInterceptor.java index b618de81d..857a03f2c 100644 --- a/plugins/jsf/src/main/java/org/apache/struts2/jsf/InvokeApplicationInterceptor.java +++ b/plugins/jsf/src/main/java/org/apache/struts2/jsf/InvokeApplicationInterceptor.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.jsf; import javax.faces.FacesException; diff --git a/plugins/jsf/src/main/java/org/apache/struts2/jsf/ProcessValidationsInterceptor.java b/plugins/jsf/src/main/java/org/apache/struts2/jsf/ProcessValidationsInterceptor.java index 16c6a93f1..3d99b9868 100644 --- a/plugins/jsf/src/main/java/org/apache/struts2/jsf/ProcessValidationsInterceptor.java +++ b/plugins/jsf/src/main/java/org/apache/struts2/jsf/ProcessValidationsInterceptor.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.jsf; import javax.faces.FacesException; diff --git a/plugins/jsf/src/main/java/org/apache/struts2/jsf/RestoreViewInterceptor.java b/plugins/jsf/src/main/java/org/apache/struts2/jsf/RestoreViewInterceptor.java index 91dfd5e0c..7d86e5edf 100644 --- a/plugins/jsf/src/main/java/org/apache/struts2/jsf/RestoreViewInterceptor.java +++ b/plugins/jsf/src/main/java/org/apache/struts2/jsf/RestoreViewInterceptor.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.jsf; import java.io.IOException; diff --git a/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java b/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java index bd258dc1e..1ad62a43d 100644 --- a/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java +++ b/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.jsf; import java.util.Map; diff --git a/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsVariableResolver.java b/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsVariableResolver.java index 04e488865..948700544 100644 --- a/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsVariableResolver.java +++ b/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsVariableResolver.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.jsf; import javax.faces.context.FacesContext; diff --git a/plugins/jsf/src/main/java/org/apache/struts2/jsf/UpdateModelValuesInterceptor.java b/plugins/jsf/src/main/java/org/apache/struts2/jsf/UpdateModelValuesInterceptor.java index 9640c9f5c..655a6b7e1 100644 --- a/plugins/jsf/src/main/java/org/apache/struts2/jsf/UpdateModelValuesInterceptor.java +++ b/plugins/jsf/src/main/java/org/apache/struts2/jsf/UpdateModelValuesInterceptor.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.jsf; import javax.faces.FacesException; diff --git a/plugins/jsf/src/main/resources/struts-plugin.xml b/plugins/jsf/src/main/resources/struts-plugin.xml index 9f730fe5f..5aee68d47 100644 --- a/plugins/jsf/src/main/resources/struts-plugin.xml +++ b/plugins/jsf/src/main/resources/struts-plugin.xml @@ -21,7 +21,6 @@ * under the License. */ --> - diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml index be49b5ffa..33f3c9e7c 100644 --- a/plugins/junit/pom.xml +++ b/plugins/junit/pom.xml @@ -1,7 +1,7 @@ - diff --git a/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusFilter.java b/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusFilter.java index dd5f6a7be..c1807efcc 100644 --- a/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusFilter.java +++ b/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusFilter.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.plexus; import java.io.IOException; diff --git a/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusLifecycleListener.java b/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusLifecycleListener.java index e101a4818..b38bbaac3 100644 --- a/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusLifecycleListener.java +++ b/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusLifecycleListener.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.plexus; import java.util.Collections; diff --git a/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java b/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java index 8b9ec85c8..e4625246e 100644 --- a/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java +++ b/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.plexus; import java.util.HashMap; diff --git a/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusThreadLocal.java b/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusThreadLocal.java index 8f63e4a45..5ee901023 100644 --- a/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusThreadLocal.java +++ b/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusThreadLocal.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.plexus; import org.codehaus.plexus.PlexusContainer; diff --git a/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusUtils.java b/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusUtils.java index 15337b144..a01bcd4dd 100644 --- a/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusUtils.java +++ b/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusUtils.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.plexus; import java.io.ByteArrayInputStream; diff --git a/plugins/plexus/src/main/resources/struts-plugin.xml b/plugins/plexus/src/main/resources/struts-plugin.xml index ef80482cc..d009c0415 100644 --- a/plugins/plexus/src/main/resources/struts-plugin.xml +++ b/plugins/plexus/src/main/resources/struts-plugin.xml @@ -21,7 +21,6 @@ * under the License. */ --> - diff --git a/plugins/pom.xml b/plugins/pom.xml index b2afaea69..807a9dacd 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -98,6 +98,9 @@ pom.xml src/** + + src/main/resources/*LICENSE.txt + diff --git a/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java b/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java index 1952dcae6..d0416b1de 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.components; import java.io.IOException; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletActionConstants.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletActionConstants.java index 1e9db2fe7..a2567b11c 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletActionConstants.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletActionConstants.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet; import org.apache.struts2.portlet.dispatcher.DispatcherServlet; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletApplicationMap.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletApplicationMap.java index 76ee49f38..436c2ae2a 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletApplicationMap.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletApplicationMap.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet; import java.io.Serializable; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletRequestMap.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletRequestMap.java index 58888d738..1ff6acba5 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletRequestMap.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletRequestMap.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet; import java.util.AbstractMap; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletSessionMap.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletSessionMap.java index eb6ce976e..c11d7fe86 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletSessionMap.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletSessionMap.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet; import java.util.AbstractMap; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java index 911c55720..a1bed7788 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet.context; import java.util.Map; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/PreparatorServlet.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/PreparatorServlet.java index 45d3e1c4e..718cd3e1f 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/PreparatorServlet.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/PreparatorServlet.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet.context; import javax.servlet.ServletConfig; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/ServletContextHolderListener.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/ServletContextHolderListener.java index e841734d5..809eb1c25 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/ServletContextHolderListener.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/context/ServletContextHolderListener.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet.context; import javax.servlet.ServletContext; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/DirectRenderFromEventAction.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/DirectRenderFromEventAction.java index 4266e405d..9e2ac6c5a 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/DirectRenderFromEventAction.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/DirectRenderFromEventAction.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet.dispatcher; import com.opensymphony.xwork2.Action; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/DispatcherServlet.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/DispatcherServlet.java index 2cb4aca9f..728568648 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/DispatcherServlet.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/DispatcherServlet.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet.dispatcher; import java.io.IOException; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java index d6d93d732..01522d892 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet.dispatcher; import java.io.IOException; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptor.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptor.java index 2fd710963..336b568bb 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptor.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptor.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet.interceptor; import javax.portlet.PortletContext; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletContextAware.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletContextAware.java index 72507368c..59b613e79 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletContextAware.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletContextAware.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet.interceptor; import javax.portlet.PortletContext; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletPreferencesAware.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletPreferencesAware.java index 4ae90cb64..f692b9c92 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletPreferencesAware.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletPreferencesAware.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet.interceptor; import javax.portlet.PortletPreferences; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletPrincipalProxy.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletPrincipalProxy.java index c87bf8039..e1cd0821c 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletPrincipalProxy.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletPrincipalProxy.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet.interceptor; import org.apache.struts2.interceptor.PrincipalProxy; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletRequestAware.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletRequestAware.java index 66b150dbb..5b3f9b410 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletRequestAware.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletRequestAware.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet.interceptor; import javax.portlet.PortletRequest; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletResponseAware.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletResponseAware.java index 13ee53edf..75a12e800 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletResponseAware.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletResponseAware.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet.interceptor; import javax.portlet.PortletResponse; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java index a713a7485..f76b4c960 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet.interceptor; import java.util.Map; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/ServletPortletPreferences.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/ServletPortletPreferences.java index 1df55f950..9a914b35d 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/ServletPortletPreferences.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/ServletPortletPreferences.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet.interceptor; import java.io.IOException; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletActionRedirectResult.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletActionRedirectResult.java index 942d92278..fa290fcbb 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletActionRedirectResult.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletActionRedirectResult.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet.result; import java.util.Arrays; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java index 5058283a7..483947281 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet.result; import java.io.IOException; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java index c0483f258..c486d5188 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet.result; import java.io.OutputStreamWriter; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletHttpSession.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletHttpSession.java index 6740b65a4..ebc39fa3a 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletHttpSession.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletHttpSession.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet.servlet; import java.util.ArrayList; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletConfig.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletConfig.java index f59031458..ea09237b1 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletConfig.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletConfig.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet.servlet; import java.util.Enumeration; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletContext.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletContext.java index a40867d2d..6b8628771 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletContext.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletContext.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet.servlet; import java.io.InputStream; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletInputStream.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletInputStream.java index ce9e9237e..a55f9663b 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletInputStream.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletInputStream.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet.servlet; import java.io.IOException; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletOutputStream.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletOutputStream.java index 45d663b78..871b3d2c2 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletOutputStream.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletOutputStream.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet.servlet; import java.io.IOException; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletRequest.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletRequest.java index c0a743bce..5d0437e20 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletRequest.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletRequest.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet.servlet; import java.io.BufferedReader; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletRequestDispatcher.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletRequestDispatcher.java index 16b8cf1bb..54238f9b3 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletRequestDispatcher.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletRequestDispatcher.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet.servlet; import java.io.IOException; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponse.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponse.java index 1a52942f9..7e4c12bce 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponse.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponse.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet.servlet; import java.io.IOException; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java index 4b4eaa789..b5d298243 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet.util; import java.io.UnsupportedEncodingException; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java b/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java index 844620353..0c14c6845 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.freemarker; import java.io.IOException; diff --git a/plugins/portlet/src/main/resources/struts-plugin.xml b/plugins/portlet/src/main/resources/struts-plugin.xml index fe2051813..fd3f59f3e 100644 --- a/plugins/portlet/src/main/resources/struts-plugin.xml +++ b/plugins/portlet/src/main/resources/struts-plugin.xml @@ -21,7 +21,6 @@ * under the License. */ --> - diff --git a/plugins/portlet/src/test/java/org/apache/struts2/components/PortletUrlRendererTest.java b/plugins/portlet/src/test/java/org/apache/struts2/components/PortletUrlRendererTest.java index 984cdbb30..c132e6ffe 100644 --- a/plugins/portlet/src/test/java/org/apache/struts2/components/PortletUrlRendererTest.java +++ b/plugins/portlet/src/test/java/org/apache/struts2/components/PortletUrlRendererTest.java @@ -1,23 +1,24 @@ -/* - * $Id: $ - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ +/* + * $Id$ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package org.apache.struts2.components; import java.io.StringWriter; diff --git a/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletApplicationMapTest.java b/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletApplicationMapTest.java index 558041881..2e7a320f8 100644 --- a/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletApplicationMapTest.java +++ b/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletApplicationMapTest.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet; import java.util.ArrayList; diff --git a/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletRequestMapTest.java b/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletRequestMapTest.java index c1c4a6a22..3c72543d8 100644 --- a/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletRequestMapTest.java +++ b/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletRequestMapTest.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet; import java.util.Iterator; diff --git a/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletSessionMapTest.java b/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletSessionMapTest.java index eb95c1eea..2c8825642 100644 --- a/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletSessionMapTest.java +++ b/plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletSessionMapTest.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet; import java.util.Iterator; diff --git a/plugins/portlet/src/test/java/org/apache/struts2/portlet/context/PortletActionContextTest.java b/plugins/portlet/src/test/java/org/apache/struts2/portlet/context/PortletActionContextTest.java index 8fa7855d8..25c95530c 100644 --- a/plugins/portlet/src/test/java/org/apache/struts2/portlet/context/PortletActionContextTest.java +++ b/plugins/portlet/src/test/java/org/apache/struts2/portlet/context/PortletActionContextTest.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet.context; import java.util.HashMap; diff --git a/plugins/portlet/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java b/plugins/portlet/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java index 7db7b9548..b65612dab 100644 --- a/plugins/portlet/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java +++ b/plugins/portlet/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet.dispatcher; import java.io.File; diff --git a/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptorTest.java b/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptorTest.java index e3665064e..35d9d7b57 100644 --- a/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptorTest.java +++ b/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptorTest.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet.interceptor; import java.util.HashMap; diff --git a/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptorTest.java b/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptorTest.java index 411c17762..c584f8a46 100644 --- a/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptorTest.java +++ b/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptorTest.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet.interceptor; import java.util.HashMap; diff --git a/plugins/portlet/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java b/plugins/portlet/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java index 28c30af20..570e17539 100644 --- a/plugins/portlet/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java +++ b/plugins/portlet/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet.result; import java.util.HashMap; diff --git a/plugins/portlet/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java b/plugins/portlet/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java index 43a7fd365..0a5266a0a 100644 --- a/plugins/portlet/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java +++ b/plugins/portlet/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.portlet.util; import java.util.HashMap; diff --git a/plugins/portlet/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java b/plugins/portlet/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java index ffaf58c19..568637055 100644 --- a/plugins/portlet/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java +++ b/plugins/portlet/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.views.jsp; import java.util.HashMap; diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml index 75edb7cdf..c077e92a2 100644 --- a/plugins/rest/pom.xml +++ b/plugins/rest/pom.xml @@ -1,4 +1,26 @@ + 4.0.0 diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeHandlerManager.java b/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeHandlerManager.java index 9176e0ced..edf94669b 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeHandlerManager.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeHandlerManager.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.rest; import com.opensymphony.xwork2.ModelDriven; diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeInterceptor.java b/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeInterceptor.java index 366aae3a3..7187d6f53 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeInterceptor.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/ContentTypeInterceptor.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.rest; import java.io.InputStream; diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/ControllerClasspathPackageProvider.java b/plugins/rest/src/main/java/org/apache/struts2/rest/ControllerClasspathPackageProvider.java index cb3bc474b..db00fe475 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/ControllerClasspathPackageProvider.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/ControllerClasspathPackageProvider.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.rest; import org.apache.struts2.config.ClasspathPackageProvider; diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/DefaultHttpHeaders.java b/plugins/rest/src/main/java/org/apache/struts2/rest/DefaultHttpHeaders.java index 0a496ede0..a1f64cce2 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/DefaultHttpHeaders.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/DefaultHttpHeaders.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.rest; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/HttpHeaders.java b/plugins/rest/src/main/java/org/apache/struts2/rest/HttpHeaders.java index 93f930808..3c5ded6b3 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/HttpHeaders.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/HttpHeaders.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.rest; import javax.servlet.http.HttpServletRequest; diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java index 51f8799a0..183b501c8 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.rest; import com.opensymphony.xwork2.ActionContext; diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java index 2481f6bbe..a0fdda001 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.rest; import com.opensymphony.xwork2.config.Configuration; diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionProxyFactory.java b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionProxyFactory.java index acb6b1e73..a9d61e374 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionProxyFactory.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionProxyFactory.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.rest; import java.util.Map; diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java b/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java index 55b128d50..a10e0c9cf 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.rest; import java.util.HashMap; diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/handler/ContentTypeHandler.java b/plugins/rest/src/main/java/org/apache/struts2/rest/handler/ContentTypeHandler.java index 34ae9eeef..0d84c3d52 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/handler/ContentTypeHandler.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/handler/ContentTypeHandler.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.rest.handler; import java.io.*; diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/handler/HtmlHandler.java b/plugins/rest/src/main/java/org/apache/struts2/rest/handler/HtmlHandler.java index 69a1316e5..32161fcc5 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/handler/HtmlHandler.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/handler/HtmlHandler.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.rest.handler; import java.io.IOException; diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/handler/JsonLibHandler.java b/plugins/rest/src/main/java/org/apache/struts2/rest/handler/JsonLibHandler.java index 63af23b57..ea6f98c81 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/handler/JsonLibHandler.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/handler/JsonLibHandler.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.rest.handler; import java.io.*; diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/handler/XStreamHandler.java b/plugins/rest/src/main/java/org/apache/struts2/rest/handler/XStreamHandler.java index 65aa7ff07..2d2894600 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/handler/XStreamHandler.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/handler/XStreamHandler.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.rest.handler; import java.io.IOException; diff --git a/plugins/rest/src/main/resources/struts-plugin.xml b/plugins/rest/src/main/resources/struts-plugin.xml index b4dfe6185..cf639569a 100644 --- a/plugins/rest/src/main/resources/struts-plugin.xml +++ b/plugins/rest/src/main/resources/struts-plugin.xml @@ -1,5 +1,26 @@ - + diff --git a/plugins/rest/src/test/java/org/apache/struts2/rest/ContentTypeHandlerManagerTest.java b/plugins/rest/src/test/java/org/apache/struts2/rest/ContentTypeHandlerManagerTest.java index e867c2f5c..fc25fbc20 100644 --- a/plugins/rest/src/test/java/org/apache/struts2/rest/ContentTypeHandlerManagerTest.java +++ b/plugins/rest/src/test/java/org/apache/struts2/rest/ContentTypeHandlerManagerTest.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.rest; import com.mockobjects.dynamic.C; diff --git a/plugins/rest/src/test/java/org/apache/struts2/rest/DefaultHttpHeadersTest.java b/plugins/rest/src/test/java/org/apache/struts2/rest/DefaultHttpHeadersTest.java index fad22090a..fac3f9144 100644 --- a/plugins/rest/src/test/java/org/apache/struts2/rest/DefaultHttpHeadersTest.java +++ b/plugins/rest/src/test/java/org/apache/struts2/rest/DefaultHttpHeadersTest.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.rest; import junit.framework.TestCase; diff --git a/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java b/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java index 7180a9d92..87349b18e 100644 --- a/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java +++ b/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java @@ -1,3 +1,24 @@ +/* + * $Id$ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package org.apache.struts2.rest; import com.opensymphony.xwork2.config.Configuration; diff --git a/plugins/rest/src/test/java/org/apache/struts2/rest/handler/Contact.java b/plugins/rest/src/test/java/org/apache/struts2/rest/handler/Contact.java index b8df55806..4fd10a2e1 100644 --- a/plugins/rest/src/test/java/org/apache/struts2/rest/handler/Contact.java +++ b/plugins/rest/src/test/java/org/apache/struts2/rest/handler/Contact.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.rest.handler; import java.util.HashMap; diff --git a/plugins/rest/src/test/java/org/apache/struts2/rest/handler/JsonLibHandlerTest.java b/plugins/rest/src/test/java/org/apache/struts2/rest/handler/JsonLibHandlerTest.java index d6091e91a..9b01c2956 100644 --- a/plugins/rest/src/test/java/org/apache/struts2/rest/handler/JsonLibHandlerTest.java +++ b/plugins/rest/src/test/java/org/apache/struts2/rest/handler/JsonLibHandlerTest.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.rest.handler; import junit.framework.TestCase; diff --git a/plugins/sitegraph/src/main/java/org/apache/struts2/Main.java b/plugins/sitegraph/src/main/java/org/apache/struts2/Main.java index ddadfa4b6..245004751 100644 --- a/plugins/sitegraph/src/main/java/org/apache/struts2/Main.java +++ b/plugins/sitegraph/src/main/java/org/apache/struts2/Main.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2; import java.io.File; diff --git a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java index 50abd34a9..881b6c9b1 100644 --- a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java +++ b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.sitegraph; import java.io.ByteArrayOutputStream; diff --git a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java index 5a8201eac..f70a454e1 100644 --- a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java +++ b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.sitegraph; import java.io.File; diff --git a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java index b4e3c0761..0ed8a7131 100644 --- a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java +++ b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.sitegraph.entities; import java.io.BufferedReader; diff --git a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FreeMarkerView.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FreeMarkerView.java index 4b05af72a..48aad8af8 100644 --- a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FreeMarkerView.java +++ b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/FreeMarkerView.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.sitegraph.entities; import java.io.File; diff --git a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/JspView.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/JspView.java index 004e4cff4..37f55f6d9 100644 --- a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/JspView.java +++ b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/JspView.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.sitegraph.entities; import java.io.File; diff --git a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/Target.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/Target.java index eb4d3dd98..cd50c5b1b 100644 --- a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/Target.java +++ b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/Target.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.sitegraph.entities; diff --git a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/VelocityView.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/VelocityView.java index 3cc0719e5..06f1f24d5 100644 --- a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/VelocityView.java +++ b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/VelocityView.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.sitegraph.entities; import java.io.File; diff --git a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/View.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/View.java index 1ca327064..087796945 100644 --- a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/View.java +++ b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/entities/View.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.sitegraph.entities; import java.util.Set; diff --git a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/ActionNode.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/ActionNode.java index 56bbf03b6..8aa0db139 100644 --- a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/ActionNode.java +++ b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/ActionNode.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.sitegraph.model; /** diff --git a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Graph.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Graph.java index 363150512..9bc214b20 100644 --- a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Graph.java +++ b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Graph.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.sitegraph.model; import java.io.IOException; diff --git a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/IndentWriter.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/IndentWriter.java index bea43695a..424c76214 100644 --- a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/IndentWriter.java +++ b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/IndentWriter.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.sitegraph.model; import java.io.IOException; diff --git a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Link.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Link.java index d60178c42..8c876cf26 100644 --- a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Link.java +++ b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Link.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.sitegraph.model; import java.io.IOException; diff --git a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Render.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Render.java index 7a3fe40c5..197725fc5 100644 --- a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Render.java +++ b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Render.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.sitegraph.model; import java.io.IOException; diff --git a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/SiteGraphNode.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/SiteGraphNode.java index 7bb8c21b1..9d06463a9 100644 --- a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/SiteGraphNode.java +++ b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/SiteGraphNode.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.sitegraph.model; import java.io.IOException; diff --git a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/SubGraph.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/SubGraph.java index b5ab30def..fd7a26124 100644 --- a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/SubGraph.java +++ b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/SubGraph.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.sitegraph.model; import java.io.IOException; diff --git a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/ViewNode.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/ViewNode.java index c813d7191..95e447ab2 100644 --- a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/ViewNode.java +++ b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/ViewNode.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.sitegraph.model; /** diff --git a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/renderers/DOTRenderer.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/renderers/DOTRenderer.java index 230adefe5..42bd81b2e 100644 --- a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/renderers/DOTRenderer.java +++ b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/renderers/DOTRenderer.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.sitegraph.renderers; import java.io.IOException; diff --git a/plugins/sitegraph/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java b/plugins/sitegraph/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java index 9a9de8557..0716db1c5 100644 --- a/plugins/sitegraph/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java +++ b/plugins/sitegraph/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.sitegraph; import java.io.File; diff --git a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java index 16194ed3e..75183293c 100644 --- a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java +++ b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.sitemesh; import java.io.IOException; diff --git a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/NoneDecoratorMapper.java b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/NoneDecoratorMapper.java index f83e4f52d..adcb4200e 100644 --- a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/NoneDecoratorMapper.java +++ b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/NoneDecoratorMapper.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.sitemesh; import com.opensymphony.module.sitemesh.mapper.AbstractDecoratorMapper; diff --git a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/TemplatePageFilter.java b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/TemplatePageFilter.java index 8df5d2a66..0c0af7120 100644 --- a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/TemplatePageFilter.java +++ b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/TemplatePageFilter.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.sitemesh; import java.io.IOException; diff --git a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java index e21583ec1..077f67427 100644 --- a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java +++ b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.sitemesh; import java.io.IOException; diff --git a/plugins/sitemesh/src/main/resources/struts-plugin.xml b/plugins/sitemesh/src/main/resources/struts-plugin.xml index 76ea790e3..9bf35f3cd 100644 --- a/plugins/sitemesh/src/main/resources/struts-plugin.xml +++ b/plugins/sitemesh/src/main/resources/struts-plugin.xml @@ -21,7 +21,6 @@ * under the License. */ --> - diff --git a/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java b/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java index c30c100c8..0a9ee9031 100644 --- a/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java +++ b/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.spring; import javax.servlet.ServletContext; diff --git a/plugins/spring/src/main/resources/struts-plugin.xml b/plugins/spring/src/main/resources/struts-plugin.xml index 2cc934a5e..a41a9f62d 100644 --- a/plugins/spring/src/main/resources/struts-plugin.xml +++ b/plugins/spring/src/main/resources/struts-plugin.xml @@ -21,7 +21,6 @@ * under the License. */ --> - diff --git a/plugins/spring/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java b/plugins/spring/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java index c8136964a..3246adab3 100644 --- a/plugins/spring/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java +++ b/plugins/spring/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.spring; import javax.servlet.ServletContext; diff --git a/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormResetInterceptor.java b/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormResetInterceptor.java index 9524a7eb3..909571b79 100644 --- a/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormResetInterceptor.java +++ b/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormResetInterceptor.java @@ -1,19 +1,22 @@ /* * $Id$ * - * Copyright 2000-2004 The Apache Software Foundation. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.struts2.s1; diff --git a/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormValidationInterceptor.java b/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormValidationInterceptor.java index 76b5fdfa2..b1be33521 100644 --- a/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormValidationInterceptor.java +++ b/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormValidationInterceptor.java @@ -1,19 +1,22 @@ /* * $Id$ * - * Copyright 2000-2004 The Apache Software Foundation. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.struts2.s1; diff --git a/plugins/struts1/src/main/java/org/apache/struts2/s1/DynaBeanPropertyAccessor.java b/plugins/struts1/src/main/java/org/apache/struts2/s1/DynaBeanPropertyAccessor.java index 0758d2550..873bb2cb8 100644 --- a/plugins/struts1/src/main/java/org/apache/struts2/s1/DynaBeanPropertyAccessor.java +++ b/plugins/struts1/src/main/java/org/apache/struts2/s1/DynaBeanPropertyAccessor.java @@ -1,19 +1,22 @@ /* * $Id$ - * Copyright 2004 The Apache Software Foundation. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.struts2.s1; diff --git a/plugins/struts1/src/main/java/org/apache/struts2/s1/Struts1Action.java b/plugins/struts1/src/main/java/org/apache/struts2/s1/Struts1Action.java index 71410b218..e9422f9a8 100644 --- a/plugins/struts1/src/main/java/org/apache/struts2/s1/Struts1Action.java +++ b/plugins/struts1/src/main/java/org/apache/struts2/s1/Struts1Action.java @@ -1,20 +1,24 @@ /* - * Copyright 2004 The Apache Software Foundation. + * $Id$ * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * $Header:$ + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ + package org.apache.struts2.s1; import java.util.Arrays; diff --git a/plugins/struts1/src/main/java/org/apache/struts2/s1/Struts1Factory.java b/plugins/struts1/src/main/java/org/apache/struts2/s1/Struts1Factory.java index 29bfe2841..962246936 100644 --- a/plugins/struts1/src/main/java/org/apache/struts2/s1/Struts1Factory.java +++ b/plugins/struts1/src/main/java/org/apache/struts2/s1/Struts1Factory.java @@ -1,20 +1,24 @@ /* * $Id$ - * Copyright 2004 The Apache Software Foundation. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ + package org.apache.struts2.s1; import com.opensymphony.xwork2.*; diff --git a/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperActionForward.java b/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperActionForward.java index e3226ba37..44c22fb84 100644 --- a/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperActionForward.java +++ b/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperActionForward.java @@ -1,20 +1,24 @@ /* - * Copyright 2004 The Apache Software Foundation. + * $Id$ * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * $Header:$ + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ + package org.apache.struts2.s1; import org.apache.struts.action.ActionForward; diff --git a/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperActionMapping.java b/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperActionMapping.java index 48214481d..9e75803b6 100644 --- a/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperActionMapping.java +++ b/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperActionMapping.java @@ -1,20 +1,24 @@ /* - * Copyright 2004 The Apache Software Foundation. + * $Id$ * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * $Header:$ + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ + package org.apache.struts2.s1; import org.apache.struts.action.ActionMapping; diff --git a/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperExceptionConfig.java b/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperExceptionConfig.java index a2ddf0b34..e0f0dc5f3 100644 --- a/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperExceptionConfig.java +++ b/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperExceptionConfig.java @@ -1,20 +1,24 @@ /* - * Copyright 2004 The Apache Software Foundation. + * $Id$ * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * $Header:$ + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ + package org.apache.struts2.s1; import com.opensymphony.xwork2.config.entities.ExceptionMappingConfig; diff --git a/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperMessageResources.java b/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperMessageResources.java index 9146c870d..839fa820f 100644 --- a/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperMessageResources.java +++ b/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperMessageResources.java @@ -1,20 +1,24 @@ /* * $Id$ - * Copyright 2004 The Apache Software Foundation. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ + package org.apache.struts2.s1; import java.util.Locale; diff --git a/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperModuleConfig.java b/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperModuleConfig.java index 51a1f931d..9b10cc230 100644 --- a/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperModuleConfig.java +++ b/plugins/struts1/src/main/java/org/apache/struts2/s1/WrapperModuleConfig.java @@ -1,20 +1,24 @@ /* - * Copyright 2004 The Apache Software Foundation. + * $Id$ * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * $Header:$ + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ + package org.apache.struts2.s1; import java.util.HashMap; diff --git a/plugins/struts1/src/main/resources/struts-plugin.xml b/plugins/struts1/src/main/resources/struts-plugin.xml index 711d122bf..4617f506b 100644 --- a/plugins/struts1/src/main/resources/struts-plugin.xml +++ b/plugins/struts1/src/main/resources/struts-plugin.xml @@ -21,7 +21,6 @@ * under the License. */ --> - diff --git a/plugins/struts1/src/test/java/org/apache/struts2/s1/DynaBeanPropertyAccessorTest.java b/plugins/struts1/src/test/java/org/apache/struts2/s1/DynaBeanPropertyAccessorTest.java index 922f739cb..deff07486 100644 --- a/plugins/struts1/src/test/java/org/apache/struts2/s1/DynaBeanPropertyAccessorTest.java +++ b/plugins/struts1/src/test/java/org/apache/struts2/s1/DynaBeanPropertyAccessorTest.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.s1; import junit.framework.*; diff --git a/plugins/struts1/src/test/java/org/apache/struts2/s1/Struts1FactoryTest.java b/plugins/struts1/src/test/java/org/apache/struts2/s1/Struts1FactoryTest.java index 25fb4d232..1854b7e69 100644 --- a/plugins/struts1/src/test/java/org/apache/struts2/s1/Struts1FactoryTest.java +++ b/plugins/struts1/src/test/java/org/apache/struts2/s1/Struts1FactoryTest.java @@ -18,6 +18,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.struts2.s1; import java.lang.reflect.InvocationTargetException; diff --git a/plugins/struts1/src/test/resources/org/apache/struts2/s1/test-struts-factory.xml b/plugins/struts1/src/test/resources/org/apache/struts2/s1/test-struts-factory.xml index c1d51aa51..c2ccd9f31 100644 --- a/plugins/struts1/src/test/resources/org/apache/struts2/s1/test-struts-factory.xml +++ b/plugins/struts1/src/test/resources/org/apache/struts2/s1/test-struts-factory.xml @@ -21,7 +21,6 @@ * under the License. */ --> - diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml index efc8361d2..3ec4437e4 100644 --- a/plugins/testng/pom.xml +++ b/plugins/testng/pom.xml @@ -1,7 +1,7 @@ - diff --git a/pom.xml b/pom.xml index 079fc6205..bfa84bf2b 100644 --- a/pom.xml +++ b/pom.xml @@ -199,7 +199,6 @@ - @@ -311,6 +309,39 @@ + install diff --git a/src/etc/header.txt b/src/etc/header.txt new file mode 100644 index 000000000..3470b3ccd --- /dev/null +++ b/src/etc/header.txt @@ -0,0 +1,18 @@ +$Id$ + +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. \ No newline at end of file diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml index 5c78553a2..3a84f8a1c 100644 --- a/src/site/xdoc/index.xml +++ b/src/site/xdoc/index.xml @@ -1,5 +1,27 @@ + diff --git a/src/site/xdoc/jxr.xml b/src/site/xdoc/jxr.xml index 2b6d3edae..f7f1024ce 100755 --- a/src/site/xdoc/jxr.xml +++ b/src/site/xdoc/jxr.xml @@ -1,17 +1,25 @@