angler-fishThe Vulnerability History Project

Cleanup take two: fixed a misnaming bug, cleaned imports, fixed a few

      deprecations, removed deprecations related to using the method
name in building a url, removed unused variables, general minor cleanup
fixed all core non-generics warnings that Eclipse reports


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@439747 13f79535-47bb-0310-9956-ffa450edef68
by Isaac the Iguana 2006-09-03 09:22:46 UTC
commit b95c8ae8383d43ef15788322f3a981808827f689
Struts
core/src/main/java/org/apache/struts2/ServletActionContext.java
+3 -5
core/src/main/java/org/apache/struts2/StrutsException.java
-3
core/src/main/java/org/apache/struts2/components/ActionComponent.java
+12 -13
core/src/main/java/org/apache/struts2/components/ActionError.java
+2 -2
core/src/main/java/org/apache/struts2/components/ActionMessage.java
+2 -2
core/src/main/java/org/apache/struts2/components/Anchor.java
+2 -2
core/src/main/java/org/apache/struts2/components/AppendIterator.java
+1 -1
core/src/main/java/org/apache/struts2/components/Bean.java
+4 -5
core/src/main/java/org/apache/struts2/components/Checkbox.java
+2 -2
core/src/main/java/org/apache/struts2/components/CheckboxList.java
+2 -2
core/src/main/java/org/apache/struts2/components/ClosingUIBean.java
+4 -6
core/src/main/java/org/apache/struts2/components/ComboBox.java
+4 -2
core/src/main/java/org/apache/struts2/components/Component.java
+37 -15
core/src/main/java/org/apache/struts2/components/Date.java
+6 -7
core/src/main/java/org/apache/struts2/components/DatePicker.java
+2 -2
core/src/main/java/org/apache/struts2/components/Debug.java
+6 -8
core/src/main/java/org/apache/struts2/components/Div.java
+3 -3
core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
+2 -2
core/src/main/java/org/apache/struts2/components/DoubleSelect.java
+2 -2
core/src/main/java/org/apache/struts2/components/Else.java
+2 -2
core/src/main/java/org/apache/struts2/components/ElseIf.java
+2 -2
core/src/main/java/org/apache/struts2/components/FieldError.java
+4 -6
core/src/main/java/org/apache/struts2/components/File.java
+2 -2
core/src/main/java/org/apache/struts2/components/Form.java
+14 -19
core/src/main/java/org/apache/struts2/components/FormButton.java
+2 -2
core/src/main/java/org/apache/struts2/components/GenericUIBean.java
+3 -4
core/src/main/java/org/apache/struts2/components/Head.java
+4 -5
core/src/main/java/org/apache/struts2/components/Hidden.java
+2 -2
core/src/main/java/org/apache/struts2/components/I18n.java
+9 -6
core/src/main/java/org/apache/struts2/components/If.java
+2 -2
core/src/main/java/org/apache/struts2/components/Include.java
+14 -20
core/src/main/java/org/apache/struts2/components/IteratorComponent.java
+3 -4
core/src/main/java/org/apache/struts2/components/Label.java
+2 -2
core/src/main/java/org/apache/struts2/components/ListUIBean.java
+6 -8
core/src/main/java/org/apache/struts2/components/MergeIterator.java
+1 -1
core/src/main/java/org/apache/struts2/components/Panel.java
+2 -3
core/src/main/java/org/apache/struts2/components/Param.java
+2 -2
core/src/main/java/org/apache/struts2/components/Password.java
+2 -2
core/src/main/java/org/apache/struts2/components/Property.java
+4 -4
core/src/main/java/org/apache/struts2/components/Push.java
+2 -2
core/src/main/java/org/apache/struts2/components/Radio.java
+2 -2
core/src/main/java/org/apache/struts2/components/RemoteCallUIBean.java
+2 -2
core/src/main/java/org/apache/struts2/components/Reset.java
+2 -2
core/src/main/java/org/apache/struts2/components/Select.java
+2 -2
core/src/main/java/org/apache/struts2/components/Set.java
+2 -2
core/src/main/java/org/apache/struts2/components/Submit.java
+2 -2
core/src/main/java/org/apache/struts2/components/TabbedPanel.java
+3 -4
core/src/main/java/org/apache/struts2/components/TextArea.java
+2 -2
core/src/main/java/org/apache/struts2/components/TextField.java
+2 -2
core/src/main/java/org/apache/struts2/components/Token.java
+3 -5
core/src/main/java/org/apache/struts2/components/Tree.java
+2 -3
core/src/main/java/org/apache/struts2/components/TreeNode.java
+2 -2
core/src/main/java/org/apache/struts2/components/UIBean.java
+10 -12
core/src/main/java/org/apache/struts2/components/URL.java
+15 -15
core/src/main/java/org/apache/struts2/components/table/AbstractFilterModel.java
+1 -2
core/src/main/java/org/apache/struts2/components/table/SortFilterModel.java
+4 -5
core/src/main/java/org/apache/struts2/components/table/WebTable.java
+10 -12
core/src/main/java/org/apache/struts2/components/table/renderer/DateCellRenderer.java
+2 -2
core/src/main/java/org/apache/struts2/components/table/renderer/NumericCellRenderer.java
+2 -2
core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java
+4 -5
core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
+12 -15
core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java
+7 -9
core/src/main/java/org/apache/struts2/components/template/TemplateEngineManager.java
+2 -2
core/src/main/java/org/apache/struts2/components/template/TemplateRenderingContext.java
+3 -4
core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java
+10 -11
core/src/main/java/org/apache/struts2/config/DefaultSettings.java
+5 -6
core/src/main/java/org/apache/struts2/config/Settings.java
+5 -6
core/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java
+5 -6
core/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java
+2 -2
core/src/main/java/org/apache/struts2/config_browser/ListValidatorsAction.java
+5 -6
core/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java
+5 -7
core/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java
+7 -11
core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java
+5 -13
core/src/main/java/org/apache/struts2/dispatcher/ApplicationMap.java
+2 -7
core/src/main/java/org/apache/struts2/dispatcher/DefaultActionSupport.java
-1
core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
+20 -34
core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcherCompatWeblogic61.java
+4 -4
core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java
+5 -7
core/src/main/java/org/apache/struts2/dispatcher/RequestMap.java
+1 -2
core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
+1 -1
core/src/main/java/org/apache/struts2/dispatcher/ServletDispatcherResult.java
+5 -6
core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
+5 -6
core/src/main/java/org/apache/struts2/dispatcher/SessionMap.java
+2 -9
core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java
+3 -4
core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java
+3 -3
core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java
-1
core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java
+13 -15
core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapperFactory.java
+5 -5
core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapping.java
+2 -2
core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
+6 -7
core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java
+8 -8
core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
+7 -15
core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java
+9 -16
core/src/main/java/org/apache/struts2/impl/ActionContextImpl.java
+4 -5
core/src/main/java/org/apache/struts2/impl/InterceptorAdapter.java
+2 -4
core/src/main/java/org/apache/struts2/impl/MessagesImpl.java
+3 -11
core/src/main/java/org/apache/struts2/impl/RequestContextImpl.java
+11 -16
core/src/main/java/org/apache/struts2/impl/ResultAdapter.java
+1 -2
core/src/main/java/org/apache/struts2/impl/StrutsActionProxy.java
+4 -6
core/src/main/java/org/apache/struts2/impl/StrutsActionProxyFactory.java
+2 -2
core/src/main/java/org/apache/struts2/impl/StrutsObjectFactory.java
+5 -5
core/src/main/java/org/apache/struts2/impl/ValueStackAdapter.java
+2 -3
core/src/main/java/org/apache/struts2/interceptor/BackgroundProcess.java
+2 -2
core/src/main/java/org/apache/struts2/interceptor/CreateSessionInterceptor.java
+1 -1
core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java
+1
core/src/main/java/org/apache/struts2/interceptor/PrincipalProxy.java
+1 -2
core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java
+8 -9
core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java
+4 -5
core/src/main/java/org/apache/struts2/interceptor/TokenInterceptor.java
-1
core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java
+3 -5
core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java
+12 -19
core/src/main/java/org/apache/struts2/jsf/FacesInterceptor.java
+4
core/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java
+1
core/src/main/java/org/apache/struts2/plexus/PlexusFilter.java
+6 -13
core/src/main/java/org/apache/struts2/plexus/PlexusLifecycleListener.java
+5 -6
core/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java
+8 -10
core/src/main/java/org/apache/struts2/plexus/PlexusUtils.java
+6 -6
core/src/main/java/org/apache/struts2/portlet/PortletApplicationMap.java
+1 -3
core/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java
-1
core/src/main/java/org/apache/struts2/portlet/context/PreparatorServlet.java
+1 -1
core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
+1
core/src/main/java/org/apache/struts2/portlet/result/PortletResult.java
+1 -1
core/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java
+19 -19
core/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java
+2 -11
core/src/main/java/org/apache/struts2/quickstart/Configuration.java
+9 -15
core/src/main/java/org/apache/struts2/quickstart/JettyServer.java
+4 -4
core/src/main/java/org/apache/struts2/quickstart/MultiDirClassLoader.java
+3 -3
core/src/main/java/org/apache/struts2/quickstart/MultiDirResource.java
+5 -14
core/src/main/java/org/apache/struts2/quickstart/MultiWebApplicationContext.java
+9 -9
core/src/main/java/org/apache/struts2/quickstart/QuickStart.java
+9 -13
core/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java
+4 -8
core/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java
+11 -11
core/src/main/java/org/apache/struts2/sitegraph/entities/FileBasedView.java
+5 -6
core/src/main/java/org/apache/struts2/sitegraph/model/Graph.java
+1 -5
core/src/main/java/org/apache/struts2/sitegraph/renderers/DOTRenderer.java
+6 -19
core/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java
+12 -17
core/src/main/java/org/apache/struts2/sitemesh/TemplatePageFilter.java
+12 -17
core/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java
+11 -13
core/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java
+5 -6
core/src/main/java/org/apache/struts2/spring/lifecycle/SpringExternalReferenceResolverSetupListener.java
+12 -11
core/src/main/java/org/apache/struts2/util/AppendIteratorFilter.java
+2 -2
core/src/main/java/org/apache/struts2/util/AttributeMap.java
+3 -4
core/src/main/java/org/apache/struts2/util/InvocationSessionStore.java
+4 -4
core/src/main/java/org/apache/struts2/util/IteratorGenerator.java
+2 -2
core/src/main/java/org/apache/struts2/util/MakeIterator.java
+2 -6
core/src/main/java/org/apache/struts2/util/MergeIteratorFilter.java
+2 -2
core/src/main/java/org/apache/struts2/util/ResolverSetupServletContextListener.java
+5 -5
core/src/main/java/org/apache/struts2/util/SortIteratorFilter.java
+2 -7
core/src/main/java/org/apache/struts2/util/Sorter.java
+2 -2
core/src/main/java/org/apache/struts2/util/StrutsTypeConverter.java
+2 -2
core/src/main/java/org/apache/struts2/util/StrutsUtil.java
+13 -21
core/src/main/java/org/apache/struts2/util/SubsetIteratorFilter.java
+4 -4
core/src/main/java/org/apache/struts2/util/TokenHelper.java
+4 -5
core/src/main/java/org/apache/struts2/util/URLBean.java
+3 -4
core/src/main/java/org/apache/struts2/util/VelocityStrutsUtil.java
+5 -7
core/src/main/java/org/apache/struts2/util/classloader/CompilingClassLoader.java
+2 -3
core/src/main/java/org/apache/struts2/util/classloader/ReloadingClassLoader.java
+8 -10
core/src/main/java/org/apache/struts2/util/classloader/compilers/eclipse/EclipseJavaCompiler.java
+10 -19
core/src/main/java/org/apache/struts2/util/classloader/compilers/eclipse/EclipseJavaCompilerSettings.java
+3 -3
core/src/main/java/org/apache/struts2/util/classloader/listeners/CompilingListener.java
+8 -8
core/src/main/java/org/apache/struts2/util/classloader/listeners/ReloadingListener.java
+6 -6
core/src/main/java/org/apache/struts2/util/classloader/monitor/FilesystemAlterationMonitor.java
+5 -10
core/src/main/java/org/apache/struts2/util/classloader/readers/FileResourceReader.java
+2 -2
core/src/main/java/org/apache/struts2/util/classloader/stores/FileResourceStore.java
+2 -8
core/src/main/java/org/apache/struts2/util/classloader/stores/MemoryResourceStore.java
+3 -3
core/src/main/java/org/apache/struts2/validators/DWRValidator.java
+14 -25
core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
+19 -23
core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
+7 -15
core/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java
+3 -1
core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java
+5 -5
core/src/main/java/org/apache/struts2/views/freemarker/StrutsBeanWrapper.java
+4 -10
core/src/main/java/org/apache/struts2/views/freemarker/StrutsClassTemplateLoader.java
+2 -3
core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionErrorModel.java
+4 -5
core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionMessageModel.java
+4 -5
core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/AnchorModel.java
+4 -5
core/src/main/java/org/apache/struts2/views/freemarker/tags/BeanModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/CallbackWriter.java
+4 -5
core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxListModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/ComboBoxModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/ComponentModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/DateModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/DatePickerModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/DivModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/DoubleSelectModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/FieldErrorModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/FileModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/FormModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/HeadModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/HiddenModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/I18nModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/IncludeModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/IteratorModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/LabelModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/OptGroupModel.java
-1
core/src/main/java/org/apache/struts2/views/freemarker/tags/OptionTransferSelectModel.java
-1
core/src/main/java/org/apache/struts2/views/freemarker/tags/PanelModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/ParamModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/PasswordModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/PropertyModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/PushModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/RadioModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/ResetModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/SelectModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/SetModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java
+2 -2
core/src/main/java/org/apache/struts2/views/freemarker/tags/SubmitModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/TabbedPanelModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java
+9 -11
core/src/main/java/org/apache/struts2/views/freemarker/tags/TextAreaModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/TextFieldModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/TextModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/TokenModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/TreeModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/TreeNodeModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/URLModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/freemarker/tags/UpDownSelectModel.java
-1
core/src/main/java/org/apache/struts2/views/freemarker/tags/WebTableModel.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/ActionTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java
+5 -6
core/src/main/java/org/apache/struts2/views/jsp/ComponentTagSupport.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/DateTag.java
-1
core/src/main/java/org/apache/struts2/views/jsp/ElseIfTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/ElseTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/I18nTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/IfTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/IncludeTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java
+4 -5
core/src/main/java/org/apache/struts2/views/jsp/ParamTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/PropertyTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/PushTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/SetTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java
+3 -5
core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java
+5 -7
core/src/main/java/org/apache/struts2/views/jsp/TextTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/URLTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/iterator/AppendIteratorTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java
+4 -3
core/src/main/java/org/apache/struts2/views/jsp/iterator/MergeIteratorTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java
+4 -4
core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java
+4 -3
core/src/main/java/org/apache/struts2/views/jsp/ui/ActionErrorTag.java
-1
core/src/main/java/org/apache/struts2/views/jsp/ui/ActionMessageTag.java
-1
core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java
+4 -5
core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxListTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/ui/ComboBoxTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/ui/ComponentTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/ui/DatePickerTag.java
+4 -5
core/src/main/java/org/apache/struts2/views/jsp/ui/DebugTag.java
+3 -6
core/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/ui/DoubleSelectTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/ui/FieldErrorTag.java
-1
core/src/main/java/org/apache/struts2/views/jsp/ui/FileTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/ui/FormTag.java
-1
core/src/main/java/org/apache/struts2/views/jsp/ui/HeadTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/ui/HiddenTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/ui/LabelTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/ui/OgnlTool.java
+1 -2
core/src/main/java/org/apache/struts2/views/jsp/ui/OptGroupTag.java
-1
core/src/main/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTag.java
-1
core/src/main/java/org/apache/struts2/views/jsp/ui/PanelTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/ui/PasswordTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/ui/RadioTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/ui/ResetTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/ui/SelectTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/ui/TabbedPanelTag.java
+4 -6
core/src/main/java/org/apache/struts2/views/jsp/ui/TextFieldTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/ui/TextareaTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/ui/TokenTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/ui/TreeNodeTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/ui/TreeTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/jsp/ui/UpDownSelectTag.java
-1
core/src/main/java/org/apache/struts2/views/jsp/ui/table/WebTableTag.java
+3 -4
core/src/main/java/org/apache/struts2/views/tiles/TilesResult.java
+8 -15
core/src/main/java/org/apache/struts2/views/util/ContextUtil.java
+9 -11
core/src/main/java/org/apache/struts2/views/util/UrlHelper.java
+12 -14
core/src/main/java/org/apache/struts2/views/velocity/StrutsResourceLoader.java
+2 -2
core/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityContext.java
+1 -3
core/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityServlet.java
+12 -15
core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java
+14 -61
core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java
+7 -9
core/src/main/java/org/apache/struts2/views/velocity/components/ActionDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/ActionErrorDirective.java
+4 -5
core/src/main/java/org/apache/struts2/views/velocity/components/ActionMessageDirective.java
+4 -5
core/src/main/java/org/apache/struts2/views/velocity/components/AnchorDirective.java
+4 -5
core/src/main/java/org/apache/struts2/views/velocity/components/BeanDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxListDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/ComboBoxDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/ComponentDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/DateDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/DatePickerDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/DoubleSelectDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/FieldErrorDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/FileDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/FormDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/HeadDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/HiddenDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/I18nDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/IncludeDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/LabelDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/OptGroupDirective.java
-1
core/src/main/java/org/apache/struts2/views/velocity/components/OptionTransferSelectDirective.java
-1
core/src/main/java/org/apache/struts2/views/velocity/components/PanelDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/ParamDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/PropertyDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/PushDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/RadioDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/ResetDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/SelectDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/SetDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/SubmitDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/TabbedPanelDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/TextAreaDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/TextDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/TextFieldDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/TokenDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/TreeDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/TreeNodeDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/URLDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/velocity/components/UpDownSelectDirective.java
-1
core/src/main/java/org/apache/struts2/views/velocity/components/WebTableDirective.java
+3 -4
core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterElement.java
+3 -7
core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterNode.java
+5 -10
core/src/main/java/org/apache/struts2/views/xslt/AdapterFactory.java
+5 -10
core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java
+3 -3
core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java
+7 -7
core/src/main/java/org/apache/struts2/views/xslt/CollectionAdapter.java
+5 -4
core/src/main/java/org/apache/struts2/views/xslt/MapAdapter.java
+4 -4
core/src/main/java/org/apache/struts2/views/xslt/ProxyElementAdapter.java
+4 -9
core/src/main/java/org/apache/struts2/views/xslt/ProxyNamedNodeMap.java
+1 -1
core/src/main/java/org/apache/struts2/views/xslt/ProxyNodeAdapter.java
+2 -2
core/src/main/java/org/apache/struts2/views/xslt/ProxyTextNodeAdapter.java
+1 -1
core/src/main/java/org/apache/struts2/views/xslt/ServletURIResolver.java
+3 -4
core/src/main/java/org/apache/struts2/views/xslt/SimpleAdapterDocument.java
+4 -18
core/src/main/java/org/apache/struts2/views/xslt/SimpleNodeList.java
+4 -4
core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java
+6 -6
core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
+14 -23
core/src/test/java/org/apache/struts2/ExecutionCountTestAction.java
+1 -2
core/src/test/java/org/apache/struts2/RequestUtilsTest.java
+2 -2
core/src/test/java/org/apache/struts2/ServletActionContextTest.java
+6 -8
core/src/test/java/org/apache/struts2/TestAction.java
+4 -5
core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
+6 -7
core/src/test/java/org/apache/struts2/TestResult.java
+6 -8
core/src/test/java/org/apache/struts2/components/ComponentTest.java
+1 -2
core/src/test/java/org/apache/struts2/components/FormButtonTest.java
+2
core/src/test/java/org/apache/struts2/components/FormTest.java
+3 -4
core/src/test/java/org/apache/struts2/components/PropertyTest.java
+6 -7
core/src/test/java/org/apache/struts2/components/UIComponentTest.java
+2 -22
core/src/test/java/org/apache/struts2/components/template/BaseTemplateEngineTest.java
+5
core/src/test/java/org/apache/struts2/config/SettingsTest.java
+4 -5
core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java
+3 -2
core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
+13 -13
core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java
+7 -8
core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java
+3 -4
core/src/test/java/org/apache/struts2/dispatcher/ServletDispatchedTestAssertInterceptor.java
+1 -3
core/src/test/java/org/apache/struts2/dispatcher/ServletDispatcherResultTest.java
+7 -9
core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java
+7 -8
core/src/test/java/org/apache/struts2/dispatcher/SessionMapTest.java
+6 -8
core/src/test/java/org/apache/struts2/dispatcher/StreamResultTest.java
+9 -11
core/src/test/java/org/apache/struts2/dispatcher/StrutsResultSupportTest.java
+17
core/src/test/java/org/apache/struts2/dispatcher/VelocityResultTest.java
+5 -7
core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
+7 -7
core/src/test/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapperTest.java
+3 -3
core/src/test/java/org/apache/struts2/impl/MessagesTest.java
-1
core/src/test/java/org/apache/struts2/impl/RequestContextTest.java
+7 -12
core/src/test/java/org/apache/struts2/interceptor/CreateSessionInterceptorTest.java
+2 -2
core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java
+11 -16
core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
+9 -13
core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java
+8 -10
core/src/test/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptorTest.java
+4 -5
core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java
+6 -11
core/src/test/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptorTest.java
+2 -3
core/src/test/java/org/apache/struts2/portlet/context/PortletActionContextTest.java
+1 -1
core/src/test/java/org/apache/struts2/portlet/context/PreparatorServletTest.java
+4 -1
core/src/test/java/org/apache/struts2/portlet/context/ServletContextHolderListenerTest.java
+2 -2
core/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java
+7 -2
core/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java
+2 -1
core/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java
+1 -1
core/src/test/java/org/apache/struts2/portlet/util/StrutsUtilTest.java
+6 -4
core/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java
+6 -5
core/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java
+3 -2
core/src/test/java/org/apache/struts2/util/InvocationSessionStoreTest.java
+4 -5
core/src/test/java/org/apache/struts2/util/TokenHelperTest.java
+2
core/src/test/java/org/apache/struts2/views/TemplateEngineManagerTest.java
+2 -8
core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerTest.java
+3 -6
core/src/test/java/org/apache/struts2/views/freemarker/TestAction.java
+2 -2
core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java
+7 -9
core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java
+7 -14
core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java
+6 -13
core/src/test/java/org/apache/struts2/views/jsp/AnchorTagTest.java
+3 -4
core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java
-1
core/src/test/java/org/apache/struts2/views/jsp/ElseIfTagTest.java
+4 -5
core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java
+6 -6
core/src/test/java/org/apache/struts2/views/jsp/IfTagTest.java
+5 -7
core/src/test/java/org/apache/struts2/views/jsp/IncludeTagTest.java
+2 -2
core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java
-1
core/src/test/java/org/apache/struts2/views/jsp/IteratorTagTest.java
+5 -6
core/src/test/java/org/apache/struts2/views/jsp/MergeIteratorTagTest.java
-1
core/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java
+10 -4
core/src/test/java/org/apache/struts2/views/jsp/PropertyTagTest.java
+5 -6
core/src/test/java/org/apache/struts2/views/jsp/SortIteratorTagTest.java
+4 -5
core/src/test/java/org/apache/struts2/views/jsp/StrutsMockBodyContent.java
+2 -3
core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletRequest.java
+4 -11
core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletResponse.java
+2 -2
core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpSession.java
+2 -2
core/src/test/java/org/apache/struts2/views/jsp/StrutsMockJspWriter.java
+1 -2
core/src/test/java/org/apache/struts2/views/jsp/StrutsMockPageContext.java
+3 -4
core/src/test/java/org/apache/struts2/views/jsp/StrutsMockServletContext.java
+4 -9
core/src/test/java/org/apache/struts2/views/jsp/SubsetIteratorTagTest.java
-1
core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java
+13 -10
core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java
+5
core/src/test/java/org/apache/struts2/views/jsp/ui/ActionErrorTagTest.java
+1 -1
core/src/test/java/org/apache/struts2/views/jsp/ui/ActionMessageTagTest.java
-1
core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxListTest.java
+3 -3
core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java
+2 -2
core/src/test/java/org/apache/struts2/views/jsp/ui/ComboBoxTest.java
+3 -3
core/src/test/java/org/apache/struts2/views/jsp/ui/DatePickerTagTest.java
+2 -3
core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java
+4 -5
core/src/test/java/org/apache/struts2/views/jsp/ui/DoubleSelectTest.java
+3 -3
core/src/test/java/org/apache/struts2/views/jsp/ui/FieldErrorTagTest.java
-1
core/src/test/java/org/apache/struts2/views/jsp/ui/FileTest.java
+2 -2
core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java
+14 -11
core/src/test/java/org/apache/struts2/views/jsp/ui/HeadTagTest.java
+1 -1
core/src/test/java/org/apache/struts2/views/jsp/ui/HiddenTest.java
+3 -3
core/src/test/java/org/apache/struts2/views/jsp/ui/JspTemplateTest.java
+5 -6
core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java
+3 -3
core/src/test/java/org/apache/struts2/views/jsp/ui/MockTag.java
+1 -2
core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java
+3 -3
core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java
+3 -3
core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java
+3 -3
core/src/test/java/org/apache/struts2/views/jsp/ui/StrutsBodyContent.java
+2 -3
core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitAjaxTest.java
+2
core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java
+3 -3
core/src/test/java/org/apache/struts2/views/jsp/ui/TextareaTest.java
+2 -2
core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java
+3 -4
core/src/test/java/org/apache/struts2/views/jsp/ui/TokenTagTest.java
+2 -2
core/src/test/java/org/apache/struts2/views/jsp/ui/TooltipTest.java
+1 -2
core/src/test/java/org/apache/struts2/views/jsp/ui/UpDownSelectTagTest.java
-1
core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java
+2 -4
core/src/test/java/org/apache/struts2/views/util/ResourceUtilTest.java
+2 -3
core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java
+9 -9
core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java
+8 -9
expand_less