svn commit: r420385 [1/6] - in /struts/struts2/trunk: apps/ apps/blank/src/main/java/org/apache/struts2/example/ apps/portlet/src/main/java/ apps/portlet/src/main/java/org/apache/struts2/portlet/example/ apps/portlet/src/main/java/org/apache/struts2/po...

[mr...@apache.org]

Author: mrdon
Date: Sun Jul  9 17:57:05 2006
New Revision: 420385

URL: http://svn.apache.org/viewvc?rev=420385&view=rev
Log:
Changing xwork package from com.opensymphony.xwork to
com.opensymphony.xwork2, adding rife as optional
XW-399

Modified:
    struts/struts2/trunk/apps/blank/src/main/java/org/apache/struts2/example/HomeAction.java
    struts/struts2/trunk/apps/pom.xml
    struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/ExampleAction.java
    struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExample.java
    struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExampleWithValidation.java
    struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormResultAction.java
    struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormTestAction.java
    struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/SavePrefsAction.java
    struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/spring/SpringAction.java
    struts/struts2/trunk/apps/portlet/src/main/java/validators.xml
    struts/struts2/trunk/apps/portlet/src/main/java/xwork.xml
    struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/dwr.xml
    struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/ActiveCategory.java
    struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/SetActiveCategory.java
    struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/ShowCart.java
    struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/ShowCatalog.java
    struts/struts2/trunk/apps/shopping-cart/src/main/resources/validators.xml
    struts/struts2/trunk/apps/shopping-cart/src/main/resources/xwork.xml
    struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/classes/validators.xml
    struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/classes/xwork.xml
    struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/dwr.xml
    struts/struts2/trunk/apps/showcase/pom.xml
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/DynamicTreeSelectAction.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/Guess.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfOptiontransferselectAction.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfRichtexteditorAction.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ShowDynamicTreeAction.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/AbstractCRUDAction.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain1.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain2.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain3.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AjaxTestAction.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/GetCategory.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Toggle.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatAuthenticationInterceptor.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatInterceptor.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLoginAction.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ChatLogoutAction.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/CrudRoomAction.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/EnterRoomAction.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ExitRoomAction.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/MessagesAvailableInRoomAction.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/RoomsAvailableAction.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/SendMessageToRoomAction.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/UsersAvailableAction.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/chat/UsersAvailableInRoomAction.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/PersonAction.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/CustomFreemarkerManager.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/GetUpdatedHangmanAction.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/GuessCharacterAction.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/StartHangmanAction.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/CreatePerson.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPerson.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeople.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actionPrefix/SubmitAction.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actiontag/ActionTagDemo.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/token/TokenAction.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/AbstractValidationActionSupport.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/QuizAction.java
    struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/wait/LongProcessAction.java
    struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/dwr.xml
    struts/struts2/trunk/apps/showcase/src/main/webapp/conversion/PersonAction.java.txt
    struts/struts2/trunk/apps/starter/src/main/java/com/foo/example/HelloMatrixAction.java
    struts/struts2/trunk/apps/starter/src/main/java/com/foo/example/HomeAction.java
    struts/struts2/trunk/core/pom.xml
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/ServletActionContext.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsStatics.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsTestCase.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/AbstractRichtexteditorConnector.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionError.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionMessage.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Anchor.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/AppendIterator.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Checkbox.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/CheckboxList.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ComboBox.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Date.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DatePicker.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Div.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleSelect.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Else.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ElseIf.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/FieldError.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/File.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Form.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/FormButton.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/GenericUIBean.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Head.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Hidden.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/I18n.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/If.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Include.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/IteratorComponent.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Label.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ListUIBean.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/MergeIterator.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptGroup.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Panel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Param.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Password.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Property.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Push.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Radio.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/RemoteCallUIBean.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Reset.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/RichTextEditor.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Select.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Set.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Submit.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TabbedPanel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Text.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TextArea.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TextField.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Token.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Tree.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TreeNode.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/URL.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UpDownSelect.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/table/WebTable.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/template/TemplateRenderingContext.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Configuration.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/DefaultConfiguration.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/config_browser/ListValidatorsAction.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DefaultActionSupport.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DispatcherUtils.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletDispatcherResult.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapperFactory.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapping.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/BackgroundProcess.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CreateSessionInterceptor.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/NoParameters.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptor.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/TokenInterceptor.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesInterceptor.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesResult.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesSupport.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/StrutsVariableResolver.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/context/PreparatorServlet.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/dispatcher/DirectRenderFromEventAction.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/result/PortletResult.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitegraph/XWorkConfigRetriever.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitegraph/collectors/ArbitraryXMLConfigurationProvider.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitegraph/renderers/DOTRenderer.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitemesh/TemplatePageFilter.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/spring/lifecycle/SpringExternalReferenceResolverSetupListener.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/AppendIteratorFilter.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/InvocationSessionStore.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/IteratorGenerator.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/MergeIteratorFilter.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ObjectFactoryLifecycle.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/ResolverSetupServletContextListener.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/SortIteratorFilter.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/Sorter.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsUtil.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/SubsetIteratorFilter.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/TokenHelper.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/VelocityStrutsUtil.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/validators/DWRValidator.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/ScopesHashModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionErrorModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionMessageModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/AnchorModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/BeanModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxListModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ComboBoxModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ComponentModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/DateModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/DatePickerModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/DivModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/DoubleSelectModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/FieldErrorModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/FileModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/FormModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/HeadModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/HiddenModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/I18nModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/IncludeModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/IteratorModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/LabelModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptGroupModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/OptionTransferSelectModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/PanelModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ParamModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/PasswordModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/PropertyModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/PushModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/RadioModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ResetModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/RichTextEditorModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/SelectModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/SetModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/SubmitModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TabbedPanelModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextAreaModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextFieldModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TextModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TokenModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TreeModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TreeNodeModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/URLModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/UpDownSelectModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/WebTableModel.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ActionTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/BeanTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ComponentTagSupport.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/DateTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ElseIfTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ElseTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/I18nTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IfTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IncludeTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/IteratorTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ParamTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/PropertyTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/PushTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/SetTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TextTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/URLTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/AppendIteratorTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/MergeIteratorTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractRichtexteditorResult.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/ActionErrorTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/ActionMessageTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxListTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/CheckboxTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/ComboBoxTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/ComponentTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/DatePickerTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/DivTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/DoubleSelectTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/FieldErrorTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/FileTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/FormTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/HeadTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/HiddenTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/LabelTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/OgnlTool.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/OptGroupTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/PanelTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/PasswordTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/RadioTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/ResetTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/RichTextEditorTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/SelectTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TabbedPanelTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TextFieldTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TextareaTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TokenTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TreeNodeTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/TreeTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/UpDownSelectTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/table/WebTableTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/tiles/TilesResult.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityContext.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityServlet.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ActionDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ActionErrorDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ActionMessageDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AnchorDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/BeanDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxListDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ComboBoxDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ComponentDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DateDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DatePickerDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DoubleSelectDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/FieldErrorDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/FileDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/FormDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/HeadDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/HiddenDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/I18nDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/IncludeDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/LabelDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/OptGroupDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/OptionTransferSelectDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/PanelDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ParamDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/PropertyDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/PushDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/RadioDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/ResetDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/RichTextEditorDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/SelectDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/SetDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/SubmitDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TabbedPanelDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TextAreaDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TextDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TextFieldDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TokenDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TreeDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/TreeNodeDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/URLDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/UpDownSelectDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/WebTableDirective.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
    struts/struts2/trunk/core/src/main/resources/config-browser.xml
    struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties
    struts/struts2/trunk/core/src/main/resources/struts-default.xml
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/ExecutionCountTestAction.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/ServletActionContextTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestAction.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestActionTagResult.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestResult.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/AbstractRichtexteditorConnectorTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ComponentTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/FormTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/PropertyTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/UIComponentTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/ConfigurationTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/DispatcherUtilsTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatchedTestAssertInterceptor.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatcherResultTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/StreamResultTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/StrutsResultSupportTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/VelocityResultTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/CreateSessionInterceptorTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitDelayAction.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptorTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptorTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/context/PortletActionContextTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/context/PreparatorServletTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/portlet/util/StrutsUtilTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/InvocationSessionStoreTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/freemarker/TestAction.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ElseIfTagTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IfTagTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/MergeIteratorTagTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/PropertyTagTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/SortIteratorTagTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/SubsetIteratorTagTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AbstractRichtexteditorTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionErrorTagTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionMessageTagTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DatePickerTagTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FieldErrorTagTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RichTextEditorTagTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TestAction1.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TreeTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/UpDownSelectTagTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java
    struts/struts2/trunk/core/src/test/resources/org/apache/struts2/sitegraph/xwork.xml
    struts/struts2/trunk/core/src/test/resources/validators.xml
    struts/struts2/trunk/core/src/test/resources/xwork.xml

Modified: struts/struts2/trunk/apps/blank/src/main/java/org/apache/struts2/example/HomeAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/java/org/apache/struts2/example/HomeAction.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/blank/src/main/java/org/apache/struts2/example/HomeAction.java (original)
+++ struts/struts2/trunk/apps/blank/src/main/java/org/apache/struts2/example/HomeAction.java Sun Jul  9 17:57:05 2006
@@ -17,7 +17,7 @@
  */
 package org.apache.struts2.example;
 
-import com.opensymphony.xwork.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 
 /**
  * <code>HomeAction</code>

Modified: struts/struts2/trunk/apps/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/pom.xml?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/pom.xml (original)
+++ struts/struts2/trunk/apps/pom.xml Sun Jul  9 17:57:05 2006
@@ -90,6 +90,11 @@
                             </dependency>
                         </dependencies>
                     </plugin>
+                    <plugin>
+                        <groupId>org.mortbay.jetty</groupId>
+                        <artifactId>maven-jetty-plugin</artifactId>
+                        <version>6.0.0beta18</version>
+                     </plugin>
                 </plugins>
             </build>
         </profile>

Modified: struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/ExampleAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/ExampleAction.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/ExampleAction.java (original)
+++ struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/ExampleAction.java Sun Jul  9 17:57:05 2006
@@ -19,8 +19,8 @@
 
 import java.util.Map;
 
-import com.opensymphony.xwork.ActionContext;
-import com.opensymphony.xwork.ActionSupport;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionSupport;
 
 public class ExampleAction extends ActionSupport {
     

Modified: struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExample.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExample.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExample.java (original)
+++ struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExample.java Sun Jul  9 17:57:05 2006
@@ -17,7 +17,7 @@
  */
 package org.apache.struts2.portlet.example;
 
-import com.opensymphony.xwork.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 
 /**
  */

Modified: struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExampleWithValidation.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExampleWithValidation.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExampleWithValidation.java (original)
+++ struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExampleWithValidation.java Sun Jul  9 17:57:05 2006
@@ -17,7 +17,7 @@
  */
 package org.apache.struts2.portlet.example;
 
-import com.opensymphony.xwork.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 
 /**
  */

Modified: struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormResultAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormResultAction.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormResultAction.java (original)
+++ struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormResultAction.java Sun Jul  9 17:57:05 2006
@@ -23,7 +23,7 @@
 import javax.portlet.RenderRequest;
 
 import org.apache.struts2.portlet.context.PortletActionContext;
-import com.opensymphony.xwork.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 
 /**
  */

Modified: struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormTestAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormTestAction.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormTestAction.java (original)
+++ struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormTestAction.java Sun Jul  9 17:57:05 2006
@@ -17,7 +17,7 @@
  */
 package org.apache.struts2.portlet.example;
 
-import com.opensymphony.xwork.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 
 /**
  */

Modified: struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/SavePrefsAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/SavePrefsAction.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/SavePrefsAction.java (original)
+++ struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/SavePrefsAction.java Sun Jul  9 17:57:05 2006
@@ -21,7 +21,7 @@
 import javax.portlet.PortletPreferences;
 
 import org.apache.struts2.portlet.context.PortletActionContext;
-import com.opensymphony.xwork.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 
 /**
  */

Modified: struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/spring/SpringAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/spring/SpringAction.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/spring/SpringAction.java (original)
+++ struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/spring/SpringAction.java Sun Jul  9 17:57:05 2006
@@ -21,7 +21,7 @@
 
 import org.apache.commons.lang.StringUtils;
 
-import com.opensymphony.xwork.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 
 /**
  */

Modified: struts/struts2/trunk/apps/portlet/src/main/java/validators.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/java/validators.xml?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/java/validators.xml (original)
+++ struts/struts2/trunk/apps/portlet/src/main/java/validators.xml Sun Jul  9 17:57:05 2006
@@ -1,13 +1,13 @@
 <validators>
-    <validator name="required" class="com.opensymphony.xwork.validator.validators.RequiredFieldValidator"/>
-    <validator name="requiredstring" class="com.opensymphony.xwork.validator.validators.RequiredStringValidator"/>
-    <validator name="int" class="com.opensymphony.xwork.validator.validators.IntRangeFieldValidator"/>
-    <validator name="double" class="com.opensymphony.xwork.validator.validators.DoubleRangeFieldValidator"/>
-    <validator name="date" class="com.opensymphony.xwork.validator.validators.DateRangeFieldValidator"/>
-    <validator name="expression" class="com.opensymphony.xwork.validator.validators.ExpressionValidator"/>
-    <validator name="fieldexpression" class="com.opensymphony.xwork.validator.validators.FieldExpressionValidator"/>
-    <validator name="email" class="com.opensymphony.xwork.validator.validators.EmailValidator"/>
-    <validator name="url" class="com.opensymphony.xwork.validator.validators.URLValidator"/>
-    <validator name="visitor" class="com.opensymphony.xwork.validator.validators.VisitorFieldValidator"/>
-    <validator name="conversion" class="com.opensymphony.xwork.validator.validators.ConversionErrorFieldValidator"/>
+    <validator name="required" class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/>
+    <validator name="requiredstring" class="com.opensymphony.xwork2.validator.validators.RequiredStringValidator"/>
+    <validator name="int" class="com.opensymphony.xwork2.validator.validators.IntRangeFieldValidator"/>
+    <validator name="double" class="com.opensymphony.xwork2.validator.validators.DoubleRangeFieldValidator"/>
+    <validator name="date" class="com.opensymphony.xwork2.validator.validators.DateRangeFieldValidator"/>
+    <validator name="expression" class="com.opensymphony.xwork2.validator.validators.ExpressionValidator"/>
+    <validator name="fieldexpression" class="com.opensymphony.xwork2.validator.validators.FieldExpressionValidator"/>
+    <validator name="email" class="com.opensymphony.xwork2.validator.validators.EmailValidator"/>
+    <validator name="url" class="com.opensymphony.xwork2.validator.validators.URLValidator"/>
+    <validator name="visitor" class="com.opensymphony.xwork2.validator.validators.VisitorFieldValidator"/>
+    <validator name="conversion" class="com.opensymphony.xwork2.validator.validators.ConversionErrorFieldValidator"/>
 </validators>

Modified: struts/struts2/trunk/apps/portlet/src/main/java/xwork.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/java/xwork.xml?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/java/xwork.xml (original)
+++ struts/struts2/trunk/apps/portlet/src/main/java/xwork.xml Sun Jul  9 17:57:05 2006
@@ -8,7 +8,7 @@
 	<package name="view" extends="struts-portlet-default"
 		namespace="/view">
 		<action name="index"
-			class="com.opensymphony.xwork.ActionSupport">
+			class="com.opensymphony.xwork2.ActionSupport">
 			<result name="success">/WEB-INF/view/index.jsp</result>
 		</action>
 
@@ -48,14 +48,14 @@
 		</action>
 
 		<action name="tokenExample"
-			class="com.opensymphony.xwork.ActionSupport" method="input">
+			class="com.opensymphony.xwork2.ActionSupport" method="input">
 			<result name="input">
 				/WEB-INF/view/tokenExampleInput.jsp
 			</result>
 		</action>
 
 		<action name="processTokenExample"
-			class="com.opensymphony.xwork.ActionSupport">
+			class="com.opensymphony.xwork2.ActionSupport">
 			<result name="input">
 				/WEB-INF/view/tokenExampleInput.jsp
 			</result>
@@ -76,19 +76,19 @@
 		</action>
 
 		<action name="ajaxExample"
-			class="com.opensymphony.xwork.ActionSupport">
+			class="com.opensymphony.xwork2.ActionSupport">
 			<result name="success">
 				/WEB-INF/view/ajaxExample.jsp
 			</result>
 		</action>
 
 		<action name="ajaxData"
-			class="com.opensymphony.xwork.ActionSupport">
+			class="com.opensymphony.xwork2.ActionSupport">
 			<result name="success">/WEB-INF/view/ajaxData.jsp</result>
 		</action>
 
 		<action name="freeMarkerExample"
-			class="com.opensymphony.xwork.ActionSupport" method="input">
+			class="com.opensymphony.xwork2.ActionSupport" method="input">
 			<result type="freemarker" name="input">
 				/WEB-INF/view/freeMarkerExampleInput.ftl
 			</result>
@@ -103,7 +103,7 @@
 			<result type="freemarker" name="success">/WEB-INF/view/freeMarkerExample.ftl</result>
 		</action>
 		
-		<action name="velocityHelloWorld" class="com.opensymphony.xwork.ActionSupport">
+		<action name="velocityHelloWorld" class="com.opensymphony.xwork2.ActionSupport">
 			<result type="velocity" name="success">/WEB-INF/view/helloWorld.vm</result>
 		</action>
 
@@ -112,11 +112,11 @@
 	<package name="edit" extends="struts-portlet-default"
 		namespace="/edit">
 		<action name="index"
-			class="com.opensymphony.xwork.ActionSupport">
+			class="com.opensymphony.xwork2.ActionSupport">
 			<result name="success">/WEB-INF/edit/index.jsp</result>
 		</action>
 		<action name="test"
-			class="com.opensymphony.xwork.ActionSupport">
+			class="com.opensymphony.xwork2.ActionSupport">
 			<result name="success">/WEB-INF/edit/test.jsp</result>
 		</action>
 		<action name="formExampleEdit"
@@ -146,7 +146,7 @@
 
 	<package name="editTest" extends="edit" namespace="/edit/dummy/test">
 		<action name="testAction"
-			class="com.opensymphony.xwork.ActionSupport">
+			class="com.opensymphony.xwork2.ActionSupport">
 			<result name="success">/WEB-INF/edit/namespaceTest.jsp</result>
 		</action>
 	</package>
@@ -154,7 +154,7 @@
 	<package name="help" extends="struts-portlet-default"
 		namespace="/help">
 		<action name="index"
-			class="com.opensymphony.xwork.ActionSupport">
+			class="com.opensymphony.xwork2.ActionSupport">
 			<result name="success">/WEB-INF/help/index.jsp</result>
 		</action>
 	</package>

Modified: struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/dwr.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/dwr.xml?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/dwr.xml (original)
+++ struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/dwr.xml Sun Jul  9 17:57:05 2006
@@ -7,7 +7,7 @@
         <create creator="new" javascript="validator">
             <param name="class" value="org.apache.struts2.validators.DWRValidator"/>
         </create>
-        <convert converter="bean" match="com.opensymphony.xwork.ValidationAwareSupport"/>
+        <convert converter="bean" match="com.opensymphony.xwork2.ValidationAwareSupport"/>
     </allow>
 
     <signatures>

Modified: struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/ActiveCategory.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/ActiveCategory.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/ActiveCategory.java (original)
+++ struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/ActiveCategory.java Sun Jul  9 17:57:05 2006
@@ -21,7 +21,7 @@
 import org.apache.struts2.example.ajax.catalog.Catalog;
 import org.apache.struts2.example.ajax.catalog.Category;
 import org.apache.struts2.interceptor.SessionAware;
-import com.opensymphony.xwork.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 
 import java.util.Map;
 

Modified: struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/SetActiveCategory.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/SetActiveCategory.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/SetActiveCategory.java (original)
+++ struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/SetActiveCategory.java Sun Jul  9 17:57:05 2006
@@ -18,7 +18,7 @@
 package org.apache.struts2.example.ajax.actions;
 
 import org.apache.struts2.interceptor.SessionAware;
-import com.opensymphony.xwork.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/ShowCart.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/ShowCart.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/ShowCart.java (original)
+++ struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/ShowCart.java Sun Jul  9 17:57:05 2006
@@ -18,7 +18,7 @@
 package org.apache.struts2.example.ajax.actions;
 
 import org.apache.struts2.example.ajax.cart.ShoppingCart;
-import com.opensymphony.xwork.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 
 import java.util.Iterator;
 import java.util.Set;

Modified: struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/ShowCatalog.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/ShowCatalog.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/ShowCatalog.java (original)
+++ struts/struts2/trunk/apps/shopping-cart/src/main/java/org/apache/struts2/example/ajax/actions/ShowCatalog.java Sun Jul  9 17:57:05 2006
@@ -18,7 +18,7 @@
 package org.apache.struts2.example.ajax.actions;
 
 import org.apache.struts2.example.ajax.catalog.Catalog;
-import com.opensymphony.xwork.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 
 /**
  * ShowCatalog

Modified: struts/struts2/trunk/apps/shopping-cart/src/main/resources/validators.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/shopping-cart/src/main/resources/validators.xml?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/shopping-cart/src/main/resources/validators.xml (original)
+++ struts/struts2/trunk/apps/shopping-cart/src/main/resources/validators.xml Sun Jul  9 17:57:05 2006
@@ -1,14 +1,14 @@
 <validators>
-    <validator name="required" class="com.opensymphony.xwork.validator.validators.RequiredFieldValidator"/>
-    <validator name="requiredstring" class="com.opensymphony.xwork.validator.validators.RequiredStringValidator"/>
-    <validator name="int" class="com.opensymphony.xwork.validator.validators.IntRangeFieldValidator"/>
-    <validator name="double" class="com.opensymphony.xwork.validator.validators.DoubleRangeFieldValidator"/>
-    <validator name="date" class="com.opensymphony.xwork.validator.validators.DateRangeFieldValidator"/>
-    <validator name="expression" class="com.opensymphony.xwork.validator.validators.ExpressionValidator"/>
-    <validator name="fieldexpression" class="com.opensymphony.xwork.validator.validators.FieldExpressionValidator"/>
-    <validator name="email" class="com.opensymphony.xwork.validator.validators.EmailValidator"/>
-    <validator name="url" class="com.opensymphony.xwork.validator.validators.URLValidator"/>
-    <validator name="visitor" class="com.opensymphony.xwork.validator.validators.VisitorFieldValidator"/>
-    <validator name="conversion" class="com.opensymphony.xwork.validator.validators.ConversionErrorFieldValidator"/>
-    <validator name="stringlength" class="com.opensymphony.xwork.validator.validators.StringLengthFieldValidator"/>
+    <validator name="required" class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/>
+    <validator name="requiredstring" class="com.opensymphony.xwork2.validator.validators.RequiredStringValidator"/>
+    <validator name="int" class="com.opensymphony.xwork2.validator.validators.IntRangeFieldValidator"/>
+    <validator name="double" class="com.opensymphony.xwork2.validator.validators.DoubleRangeFieldValidator"/>
+    <validator name="date" class="com.opensymphony.xwork2.validator.validators.DateRangeFieldValidator"/>
+    <validator name="expression" class="com.opensymphony.xwork2.validator.validators.ExpressionValidator"/>
+    <validator name="fieldexpression" class="com.opensymphony.xwork2.validator.validators.FieldExpressionValidator"/>
+    <validator name="email" class="com.opensymphony.xwork2.validator.validators.EmailValidator"/>
+    <validator name="url" class="com.opensymphony.xwork2.validator.validators.URLValidator"/>
+    <validator name="visitor" class="com.opensymphony.xwork2.validator.validators.VisitorFieldValidator"/>
+    <validator name="conversion" class="com.opensymphony.xwork2.validator.validators.ConversionErrorFieldValidator"/>
+    <validator name="stringlength" class="com.opensymphony.xwork2.validator.validators.StringLengthFieldValidator"/>
 </validators>

Modified: struts/struts2/trunk/apps/shopping-cart/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/shopping-cart/src/main/resources/xwork.xml?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/shopping-cart/src/main/resources/xwork.xml (original)
+++ struts/struts2/trunk/apps/shopping-cart/src/main/resources/xwork.xml Sun Jul  9 17:57:05 2006
@@ -1,14 +1,49 @@
-<validators>
-    <validator name="required" class="com.opensymphony.xwork.validator.validators.RequiredFieldValidator"/>
-    <validator name="requiredstring" class="com.opensymphony.xwork.validator.validators.RequiredStringValidator"/>
-    <validator name="int" class="com.opensymphony.xwork.validator.validators.IntRangeFieldValidator"/>
-    <validator name="double" class="com.opensymphony.xwork.validator.validators.DoubleRangeFieldValidator"/>
-    <validator name="date" class="com.opensymphony.xwork.validator.validators.DateRangeFieldValidator"/>
-    <validator name="expression" class="com.opensymphony.xwork.validator.validators.ExpressionValidator"/>
-    <validator name="fieldexpression" class="com.opensymphony.xwork.validator.validators.FieldExpressionValidator"/>
-    <validator name="email" class="com.opensymphony.xwork.validator.validators.EmailValidator"/>
-    <validator name="url" class="com.opensymphony.xwork.validator.validators.URLValidator"/>
-    <validator name="visitor" class="com.opensymphony.xwork.validator.validators.VisitorFieldValidator"/>
-    <validator name="conversion" class="com.opensymphony.xwork.validator.validators.ConversionErrorFieldValidator"/>
-    <validator name="stringlength" class="com.opensymphony.xwork.validator.validators.StringLengthFieldValidator"/>
-</validators>
+<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN" "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd">
+
+<xwork>
+    <include file="struts-default.xml"/>
+    <include file="config-browser.xml"/>
+
+    <package name="catalog" namespace="/catalog" extends="struts-default">
+        <interceptors>
+            <!-- Basic stack -->
+            <interceptor-stack name="catalogStack">
+                <interceptor-ref name="logger"/>
+                <interceptor-ref name="servlet-config"/>
+                <interceptor-ref name="static-params"/>
+                <interceptor-ref name="params"/>
+                <interceptor-ref name="conversionError"/>
+                <interceptor-ref name="validation"/>
+                <interceptor-ref name="workflow"/>
+            </interceptor-stack>
+        </interceptors>
+
+        <default-interceptor-ref name="catalogStack"/>
+
+        <action name="catalog" class="org.apache.struts2.example.ajax.actions.ShowCatalog">
+            <result name="success">/category.jsp</result>
+        </action>
+
+        <action name="cart" class="org.apache.struts2.example.ajax.actions.ShowCart">
+            <result name="success">/cart.jsp</result>
+        </action>
+
+        <action name="main" class="org.apache.struts2.example.ajax.actions.ActiveCategory">
+            <result name="success">/category-main.jsp</result>
+        </action>
+
+
+    </package>
+    <package name="catalog-remote" namespace="/catalog/remote" extends="catalog">
+        <action name="activeCategory" class="org.apache.struts2.example.ajax.actions.ActiveCategory">
+            <result name="success">/category.jsp</result>
+        </action>
+
+        <action name="setActiveCategory" class="org.apache.struts2.example.ajax.actions.SetActiveCategory">
+            <result name="success" type="chain">activeCategory</result>
+        </action>
+
+        <action name="updateQuantity" class="org.apache.struts2.example.ajax.actions.UpdateQuantityInCart"/>
+
+    </package>
+</xwork>

Modified: struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/classes/validators.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/classes/validators.xml?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/classes/validators.xml (original)
+++ struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/classes/validators.xml Sun Jul  9 17:57:05 2006
@@ -1,14 +1,14 @@
 <validators>
-    <validator name="required" class="com.opensymphony.xwork.validator.validators.RequiredFieldValidator"/>
-    <validator name="requiredstring" class="com.opensymphony.xwork.validator.validators.RequiredStringValidator"/>
-    <validator name="int" class="com.opensymphony.xwork.validator.validators.IntRangeFieldValidator"/>
-    <validator name="double" class="com.opensymphony.xwork.validator.validators.DoubleRangeFieldValidator"/>
-    <validator name="date" class="com.opensymphony.xwork.validator.validators.DateRangeFieldValidator"/>
-    <validator name="expression" class="com.opensymphony.xwork.validator.validators.ExpressionValidator"/>
-    <validator name="fieldexpression" class="com.opensymphony.xwork.validator.validators.FieldExpressionValidator"/>
-    <validator name="email" class="com.opensymphony.xwork.validator.validators.EmailValidator"/>
-    <validator name="url" class="com.opensymphony.xwork.validator.validators.URLValidator"/>
-    <validator name="visitor" class="com.opensymphony.xwork.validator.validators.VisitorFieldValidator"/>
-    <validator name="conversion" class="com.opensymphony.xwork.validator.validators.ConversionErrorFieldValidator"/>
-    <validator name="stringlength" class="com.opensymphony.xwork.validator.validators.StringLengthFieldValidator"/>
+    <validator name="required" class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/>
+    <validator name="requiredstring" class="com.opensymphony.xwork2.validator.validators.RequiredStringValidator"/>
+    <validator name="int" class="com.opensymphony.xwork2.validator.validators.IntRangeFieldValidator"/>
+    <validator name="double" class="com.opensymphony.xwork2.validator.validators.DoubleRangeFieldValidator"/>
+    <validator name="date" class="com.opensymphony.xwork2.validator.validators.DateRangeFieldValidator"/>
+    <validator name="expression" class="com.opensymphony.xwork2.validator.validators.ExpressionValidator"/>
+    <validator name="fieldexpression" class="com.opensymphony.xwork2.validator.validators.FieldExpressionValidator"/>
+    <validator name="email" class="com.opensymphony.xwork2.validator.validators.EmailValidator"/>
+    <validator name="url" class="com.opensymphony.xwork2.validator.validators.URLValidator"/>
+    <validator name="visitor" class="com.opensymphony.xwork2.validator.validators.VisitorFieldValidator"/>
+    <validator name="conversion" class="com.opensymphony.xwork2.validator.validators.ConversionErrorFieldValidator"/>
+    <validator name="stringlength" class="com.opensymphony.xwork2.validator.validators.StringLengthFieldValidator"/>
 </validators>

Modified: struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/classes/xwork.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/classes/xwork.xml?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/classes/xwork.xml (original)
+++ struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/classes/xwork.xml Sun Jul  9 17:57:05 2006
@@ -1,14 +1,14 @@
 <validators>
-    <validator name="required" class="com.opensymphony.xwork.validator.validators.RequiredFieldValidator"/>
-    <validator name="requiredstring" class="com.opensymphony.xwork.validator.validators.RequiredStringValidator"/>
-    <validator name="int" class="com.opensymphony.xwork.validator.validators.IntRangeFieldValidator"/>
-    <validator name="double" class="com.opensymphony.xwork.validator.validators.DoubleRangeFieldValidator"/>
-    <validator name="date" class="com.opensymphony.xwork.validator.validators.DateRangeFieldValidator"/>
-    <validator name="expression" class="com.opensymphony.xwork.validator.validators.ExpressionValidator"/>
-    <validator name="fieldexpression" class="com.opensymphony.xwork.validator.validators.FieldExpressionValidator"/>
-    <validator name="email" class="com.opensymphony.xwork.validator.validators.EmailValidator"/>
-    <validator name="url" class="com.opensymphony.xwork.validator.validators.URLValidator"/>
-    <validator name="visitor" class="com.opensymphony.xwork.validator.validators.VisitorFieldValidator"/>
-    <validator name="conversion" class="com.opensymphony.xwork.validator.validators.ConversionErrorFieldValidator"/>
-    <validator name="stringlength" class="com.opensymphony.xwork.validator.validators.StringLengthFieldValidator"/>
+    <validator name="required" class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/>
+    <validator name="requiredstring" class="com.opensymphony.xwork2.validator.validators.RequiredStringValidator"/>
+    <validator name="int" class="com.opensymphony.xwork2.validator.validators.IntRangeFieldValidator"/>
+    <validator name="double" class="com.opensymphony.xwork2.validator.validators.DoubleRangeFieldValidator"/>
+    <validator name="date" class="com.opensymphony.xwork2.validator.validators.DateRangeFieldValidator"/>
+    <validator name="expression" class="com.opensymphony.xwork2.validator.validators.ExpressionValidator"/>
+    <validator name="fieldexpression" class="com.opensymphony.xwork2.validator.validators.FieldExpressionValidator"/>
+    <validator name="email" class="com.opensymphony.xwork2.validator.validators.EmailValidator"/>
+    <validator name="url" class="com.opensymphony.xwork2.validator.validators.URLValidator"/>
+    <validator name="visitor" class="com.opensymphony.xwork2.validator.validators.VisitorFieldValidator"/>
+    <validator name="conversion" class="com.opensymphony.xwork2.validator.validators.ConversionErrorFieldValidator"/>
+    <validator name="stringlength" class="com.opensymphony.xwork2.validator.validators.StringLengthFieldValidator"/>
 </validators>

Modified: struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/dwr.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/dwr.xml?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/dwr.xml (original)
+++ struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/dwr.xml Sun Jul  9 17:57:05 2006
@@ -6,7 +6,7 @@
         <create creator="new" javascript="validator">
             <param name="class" value="org.apache.struts2.validators.DWRValidator"/>
         </create>
-        <convert converter="bean" match="com.opensymphony.xwork.ValidationAwareSupport"/>
+        <convert converter="bean" match="com.opensymphony.xwork2.ValidationAwareSupport"/>
     </allow>
 
     <signatures>

Modified: struts/struts2/trunk/apps/showcase/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/pom.xml?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/pom.xml (original)
+++ struts/struts2/trunk/apps/showcase/pom.xml Sun Jul  9 17:57:05 2006
@@ -56,6 +56,11 @@
 	     <artifactId>myfaces-api</artifactId>
 	     <version>1.1.2</version>
 	  </dependency>
+      <dependency>
+         <groupId>org.rifers</groupId>
+         <artifactId>rife-continuations</artifactId>
+         <version>0.0.2</version>
+     </dependency>
  
     </dependencies>
     

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.java Sun Jul  9 17:57:05 2006
@@ -17,7 +17,7 @@
  */
 package org.apache.struts2.showcase;
 
-import com.opensymphony.xwork.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 
 import java.text.DateFormat;
 import java.util.Date;
@@ -82,7 +82,7 @@
     }
 
     /**
-     * @see com.opensymphony.xwork.ActionSupport#execute()
+     * @see com.opensymphony.xwork2.ActionSupport#execute()
      */
     public String execute() throws Exception {
         Calendar cal = GregorianCalendar.getInstance();

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/DynamicTreeSelectAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/DynamicTreeSelectAction.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/DynamicTreeSelectAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/DynamicTreeSelectAction.java Sun Jul  9 17:57:05 2006
@@ -2,7 +2,7 @@
 
 import org.apache.struts2.showcase.ajax.tree.Category;
 
-import com.opensymphony.xwork.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 
 //START SNIPPET: treeExampleDynamicJavaSelected
 

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/Guess.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/Guess.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/Guess.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/Guess.java Sun Jul  9 17:57:05 2006
@@ -17,14 +17,15 @@
  */
 package org.apache.struts2.showcase;
 
-import com.opensymphony.xwork.ActionSupport;
-import com.opensymphony.xwork.Action;
-import com.opensymphony.xwork.Preparable;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.Preparable;
+import com.uwyn.rife.continuations.ContinuableObject;
 
 import java.util.Random;
 
 // START SNIPPET: example
-public class Guess extends ActionSupport implements Preparable {
+public class Guess extends ActionSupport implements Preparable, ContinuableObject {
     int guess;
 
     public void prepare() throws Exception {

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfOptiontransferselectAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfOptiontransferselectAction.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfOptiontransferselectAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfOptiontransferselectAction.java Sun Jul  9 17:57:05 2006
@@ -21,7 +21,7 @@
 import java.util.List;
 import java.util.Map;
 
-import com.opensymphony.xwork.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 
 /**
  */

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfRichtexteditorAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfRichtexteditorAction.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfRichtexteditorAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfRichtexteditorAction.java Sun Jul  9 17:57:05 2006
@@ -17,7 +17,7 @@
  */
 package org.apache.struts2.showcase;
 
-import com.opensymphony.xwork.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 
 /**
  * 

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ShowDynamicTreeAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ShowDynamicTreeAction.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ShowDynamicTreeAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ShowDynamicTreeAction.java Sun Jul  9 17:57:05 2006
@@ -2,7 +2,7 @@
 
 import org.apache.struts2.showcase.ajax.tree.Category;
 
-import com.opensymphony.xwork.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 
 // START SNIPPET: treeExampleDynamicJavaShow 
 

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java Sun Jul  9 17:57:05 2006
@@ -18,9 +18,9 @@
 package org.apache.struts2.showcase;
 
 import org.apache.struts2.ServletActionContext;
-import com.opensymphony.xwork.ActionSupport;
-import com.opensymphony.xwork.Validateable;
-import com.opensymphony.xwork.util.OgnlValueStack;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.Validateable;
+import com.opensymphony.xwork2.util.OgnlValueStack;
 
 import java.util.ArrayList;
 import java.util.Collections;

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/AbstractCRUDAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/AbstractCRUDAction.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/AbstractCRUDAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/AbstractCRUDAction.java Sun Jul  9 17:57:05 2006
@@ -18,7 +18,7 @@
 package org.apache.struts2.showcase.action;
 
 import org.apache.log4j.Logger;
-import com.opensymphony.xwork.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.showcase.dao.Dao;
 import org.apache.struts2.showcase.model.IdEntity;
 

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.java Sun Jul  9 17:57:05 2006
@@ -17,7 +17,7 @@
  */
 package org.apache.struts2.showcase.action;
 
-import com.opensymphony.xwork.Preparable;
+import com.opensymphony.xwork2.Preparable;
 import org.apache.log4j.Logger;
 import org.apache.struts2.showcase.application.TestDataProvider;
 import org.apache.struts2.showcase.dao.Dao;

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.java Sun Jul  9 17:57:05 2006
@@ -20,7 +20,7 @@
 import org.apache.struts2.showcase.dao.Dao;
 import org.apache.struts2.showcase.dao.SkillDao;
 import org.apache.struts2.showcase.model.Skill;
-import com.opensymphony.xwork.Preparable;
+import com.opensymphony.xwork2.Preparable;
 import org.apache.log4j.Logger;
 
 /**

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain1.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain1.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain1.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain1.java Sun Jul  9 17:57:05 2006
@@ -17,7 +17,7 @@
  */
 package org.apache.struts2.showcase.actionchaining;
 
-import com.opensymphony.xwork.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 
 /**
  * 

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain2.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain2.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain2.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain2.java Sun Jul  9 17:57:05 2006
@@ -17,7 +17,7 @@
  */
 package org.apache.struts2.showcase.actionchaining;
 
-import com.opensymphony.xwork.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 
 /**
  * 

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain3.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain3.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain3.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/actionchaining/ActionChain3.java Sun Jul  9 17:57:05 2006
@@ -17,7 +17,7 @@
  */
 package org.apache.struts2.showcase.actionchaining;
 
-import com.opensymphony.xwork.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
 
 /**
  * 

Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AjaxTestAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AjaxTestAction.java?rev=420385&r1=420384&r2=420385&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AjaxTestAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/AjaxTestAction.java Sun Jul  9 17:57:05 2006
@@ -17,7 +17,7 @@
  */
 package org.apache.struts2.showcase.ajax;
 
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
 
 
 /**