You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by mr...@apache.org on 2006/03/29 02:52:51 UTC
svn commit: r389643 [1/4] - in /incubator/webwork2: ./ src/etc/ src/java/
src/java/org/apache/struts/action2/
src/java/org/apache/struts/action2/components/
src/java/org/apache/struts/action2/components/ajax/
src/java/org/apache/struts/action2/componen...
Author: mrdon
Date: Tue Mar 28 16:52:39 2006
New Revision: 389643
URL: http://svn.apache.org/viewcvs?rev=389643&view=rev
Log:
Removed empty directories; changed webwork to struts in messages, configuration settings, dojo, etc;
renamed classes with WebWork in their name to Struts, changed taglib uri to /struts-action,
all tests pass
Added:
incubator/webwork2/src/java/org/apache/struts/action2/StrutsConstants.java
- copied, changed from r389620, incubator/webwork2/src/java/org/apache/struts/action2/WebWorkConstants.java
incubator/webwork2/src/java/org/apache/struts/action2/StrutsStatics.java
- copied, changed from r389620, incubator/webwork2/src/java/org/apache/struts/action2/WebWorkStatics.java
incubator/webwork2/src/java/org/apache/struts/action2/StrutsTestCase.java
- copied, changed from r389620, incubator/webwork2/src/java/org/apache/struts/action2/WebWorkTestCase.java
incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/StrutsRequestWrapper.java
- copied, changed from r389620, incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/WebWorkRequestWrapper.java
incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/StrutsResultSupport.java
- copied, changed from r389620, incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/WebWorkResultSupport.java
incubator/webwork2/src/java/org/apache/struts/action2/interceptor/StrutsConversionErrorInterceptor.java
- copied, changed from r389620, incubator/webwork2/src/java/org/apache/struts/action2/interceptor/WebWorkConversionErrorInterceptor.java
incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoStrutsServletDispatcher.java
- copied, changed from r389620, incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoWebWork2ServletDispatcher.java
incubator/webwork2/src/java/org/apache/struts/action2/spring/StrutsSpringObjectFactory.java
- copied, changed from r389620, incubator/webwork2/src/java/org/apache/struts/action2/spring/WebWorkSpringObjectFactory.java
incubator/webwork2/src/java/org/apache/struts/action2/static/dojo/struts/
- copied from r389620, incubator/webwork2/src/java/org/apache/struts/action2/static/dojo/webwork/
incubator/webwork2/src/java/org/apache/struts/action2/struts-messages.properties
- copied, changed from r389620, incubator/webwork2/src/java/org/apache/struts/action2/webwork-messages.properties
incubator/webwork2/src/java/org/apache/struts/action2/struts-messages_da.properties
- copied, changed from r389620, incubator/webwork2/src/java/org/apache/struts/action2/webwork-messages_da.properties
incubator/webwork2/src/java/org/apache/struts/action2/struts-messages_de.properties
- copied, changed from r389620, incubator/webwork2/src/java/org/apache/struts/action2/webwork-messages_de.properties
incubator/webwork2/src/java/org/apache/struts/action2/util/StrutsTypeConverter.java
- copied, changed from r389620, incubator/webwork2/src/java/org/apache/struts/action2/util/WebWorkTypeConverter.java
incubator/webwork2/src/java/org/apache/struts/action2/util/StrutsUtil.java
- copied, changed from r389620, incubator/webwork2/src/java/org/apache/struts/action2/util/WebWorkUtil.java
incubator/webwork2/src/java/org/apache/struts/action2/util/VelocityStrutsUtil.java
- copied, changed from r389620, incubator/webwork2/src/java/org/apache/struts/action2/util/VelocityWebWorkUtil.java
incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/StrutsBeanWrapper.java
- copied, changed from r389620, incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/WebWorkBeanWrapper.java
incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/StrutsClassTemplateLoader.java
- copied, changed from r389620, incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/WebWorkClassTemplateLoader.java
incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/StrutsModels.java
- copied, changed from r389620, incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/WebWorkModels.java
incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/StrutsBodyTagSupport.java
- copied, changed from r389620, incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/WebWorkBodyTagSupport.java
incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/StrutsResourceLoader.java
- copied, changed from r389620, incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/WebWorkResourceLoader.java
incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/StrutsVelocityContext.java
- copied, changed from r389620, incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/WebWorkVelocityContext.java
incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/StrutsVelocityServlet.java
- copied, changed from r389620, incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/WebWorkVelocityServlet.java
incubator/webwork2/src/java/struts-default.xml
- copied, changed from r389620, incubator/webwork2/src/java/webwork-default.xml
incubator/webwork2/src/java/struts.vm
- copied unchanged from r389620, incubator/webwork2/src/java/webwork.vm
incubator/webwork2/src/test/org/apache/struts/action2/interceptor/StrutsConversionErrorInterceptorTest.java
- copied, changed from r389620, incubator/webwork2/src/test/org/apache/struts/action2/interceptor/WebWorkConversionErrorInterceptorTest.java
incubator/webwork2/src/test/org/apache/struts/action2/portlet/util/StrutsUtilTest.java
- copied, changed from r389620, incubator/webwork2/src/test/org/apache/struts/action2/portlet/util/WebWorkUtilTest.java
incubator/webwork2/src/test/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest-applicationContext.xml
- copied unchanged from r389620, incubator/webwork2/src/test/org/apache/struts/action2/spring/WebWorkSpringObjectFactoryTest-applicationContext.xml
incubator/webwork2/src/test/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest.java
- copied, changed from r389620, incubator/webwork2/src/test/org/apache/struts/action2/spring/WebWorkSpringObjectFactoryTest.java
incubator/webwork2/src/test/org/apache/struts/action2/util/StrutsTypeConverterTest.java
- copied, changed from r389620, incubator/webwork2/src/test/org/apache/struts/action2/util/WebWorkTypeConverterTest.java
incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockBodyContent.java
- copied, changed from r389620, incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockBodyContent.java
incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockHttpServletRequest.java
- copied, changed from r389620, incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockHttpServletRequest.java
incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockHttpServletResponse.java
- copied, changed from r389620, incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockHttpServletResponse.java
incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockHttpSession.java
- copied, changed from r389620, incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockHttpSession.java
incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockJspWriter.java
- copied, changed from r389620, incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockJspWriter.java
incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockPageContext.java
- copied, changed from r389620, incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockPageContext.java
incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/StrutsMockServletContext.java
- copied, changed from r389620, incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockServletContext.java
incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ui/StrutsBodyContent.java
- copied, changed from r389620, incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ui/WebWorkBodyContent.java
incubator/webwork2/src/test/struts.properties
- copied, changed from r389620, incubator/webwork2/src/test/webwork.properties
Removed:
incubator/webwork2/src/java/org/apache/struts/action2/WebWorkConstants.java
incubator/webwork2/src/java/org/apache/struts/action2/WebWorkStatics.java
incubator/webwork2/src/java/org/apache/struts/action2/WebWorkTestCase.java
incubator/webwork2/src/java/org/apache/struts/action2/components/ajax/
incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/WebWorkRequestWrapper.java
incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/WebWorkResultSupport.java
incubator/webwork2/src/java/org/apache/struts/action2/interceptor/WebWorkConversionErrorInterceptor.java
incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoWebWork2ServletDispatcher.java
incubator/webwork2/src/java/org/apache/struts/action2/portlet/servlet/
incubator/webwork2/src/java/org/apache/struts/action2/portlet/sitemesh/
incubator/webwork2/src/java/org/apache/struts/action2/portlet/velocity/
incubator/webwork2/src/java/org/apache/struts/action2/portlet/views/
incubator/webwork2/src/java/org/apache/struts/action2/spring/WebWorkSpringObjectFactory.java
incubator/webwork2/src/java/org/apache/struts/action2/static/dojo/webwork/
incubator/webwork2/src/java/org/apache/struts/action2/util/VelocityWebWorkUtil.java
incubator/webwork2/src/java/org/apache/struts/action2/util/WebWorkTypeConverter.java
incubator/webwork2/src/java/org/apache/struts/action2/util/WebWorkUtil.java
incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/WebWorkBeanWrapper.java
incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/WebWorkClassTemplateLoader.java
incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/tags/WebWorkModels.java
incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/WebWorkBodyTagSupport.java
incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/WebWorkResourceLoader.java
incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/WebWorkVelocityContext.java
incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/WebWorkVelocityServlet.java
incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/ui/
incubator/webwork2/src/java/org/apache/struts/action2/webwork-messages.properties
incubator/webwork2/src/java/org/apache/struts/action2/webwork-messages_da.properties
incubator/webwork2/src/java/org/apache/struts/action2/webwork-messages_de.properties
incubator/webwork2/src/java/webwork-default.xml
incubator/webwork2/src/java/webwork.vm
incubator/webwork2/src/test/org/apache/struts/action2/interceptor/WebWorkConversionErrorInterceptorTest.java
incubator/webwork2/src/test/org/apache/struts/action2/portlet/util/WebWorkUtilTest.java
incubator/webwork2/src/test/org/apache/struts/action2/spring/WebWorkSpringObjectFactoryTest-applicationContext.xml
incubator/webwork2/src/test/org/apache/struts/action2/spring/WebWorkSpringObjectFactoryTest.java
incubator/webwork2/src/test/org/apache/struts/action2/util/WebWorkTypeConverterTest.java
incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockBodyContent.java
incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockHttpServletRequest.java
incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockHttpServletResponse.java
incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockHttpSession.java
incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockJspWriter.java
incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockPageContext.java
incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/WebWorkMockServletContext.java
incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ui/WebWorkBodyContent.java
incubator/webwork2/src/test/webwork.properties
Modified:
incubator/webwork2/build.properties
incubator/webwork2/build.xml
incubator/webwork2/src/etc/taglib-settings.xml
incubator/webwork2/src/java/config-browser.xml
incubator/webwork2/src/java/org/apache/struts/action2/Main.java
incubator/webwork2/src/java/org/apache/struts/action2/ServletActionContext.java
incubator/webwork2/src/java/org/apache/struts/action2/components/ActionComponent.java
incubator/webwork2/src/java/org/apache/struts/action2/components/ComboBox.java
incubator/webwork2/src/java/org/apache/struts/action2/components/Component.java
incubator/webwork2/src/java/org/apache/struts/action2/components/Date.java
incubator/webwork2/src/java/org/apache/struts/action2/components/Head.java
incubator/webwork2/src/java/org/apache/struts/action2/components/If.java
incubator/webwork2/src/java/org/apache/struts/action2/components/Include.java
incubator/webwork2/src/java/org/apache/struts/action2/components/Text.java
incubator/webwork2/src/java/org/apache/struts/action2/components/UIBean.java
incubator/webwork2/src/java/org/apache/struts/action2/components/template/TemplateEngineManager.java
incubator/webwork2/src/java/org/apache/struts/action2/config/Configuration.java
incubator/webwork2/src/java/org/apache/struts/action2/config/DefaultConfiguration.java
incubator/webwork2/src/java/org/apache/struts/action2/config_browser/ActionNamesAction.java
incubator/webwork2/src/java/org/apache/struts/action2/default.properties
incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/DispatcherUtils.java
incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/FilterDispatcher.java
incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/PlainTextResult.java
incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/ServletDispatcher.java
incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/ServletDispatcherResult.java
incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/ServletRedirectResult.java
incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/StreamResult.java
incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/VelocityResult.java
incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/mapper/ActionMapperFactory.java
incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapper.java
incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/multipart/MultiPartRequestWrapper.java
incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/multipart/PellMultiPartRequest.java
incubator/webwork2/src/java/org/apache/struts/action2/interceptor/FileUploadInterceptor.java
incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ScopeInterceptor.java
incubator/webwork2/src/java/org/apache/struts/action2/interceptor/ServletConfigInterceptor.java
incubator/webwork2/src/java/org/apache/struts/action2/interceptor/TokenInterceptor.java
incubator/webwork2/src/java/org/apache/struts/action2/interceptor/TokenSessionStoreInterceptor.java
incubator/webwork2/src/java/org/apache/struts/action2/pico/PicoServletDispatcher.java
incubator/webwork2/src/java/org/apache/struts/action2/plexus/PlexusLifecycleListener.java
incubator/webwork2/src/java/org/apache/struts/action2/plexus/PlexusObjectFactory.java
incubator/webwork2/src/java/org/apache/struts/action2/portlet/PortletActionConstants.java
incubator/webwork2/src/java/org/apache/struts/action2/portlet/context/PreparatorServlet.java
incubator/webwork2/src/java/org/apache/struts/action2/portlet/dispatcher/Jsr168Dispatcher.java
incubator/webwork2/src/java/org/apache/struts/action2/portlet/result/PortletResult.java
incubator/webwork2/src/java/org/apache/struts/action2/portlet/result/PortletVelocityResult.java
incubator/webwork2/src/java/org/apache/struts/action2/quickstart/QuickStart.java
incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/entities/FileBasedView.java
incubator/webwork2/src/java/org/apache/struts/action2/sitegraph/renderers/DOTRenderer.java
incubator/webwork2/src/java/org/apache/struts/action2/sitemesh/TemplatePageFilter.java
incubator/webwork2/src/java/org/apache/struts/action2/spring/lifecycle/SpringObjectFactoryListener.java
incubator/webwork2/src/java/org/apache/struts/action2/static/dojo/struts/Util.js
incubator/webwork2/src/java/org/apache/struts/action2/static/dojo/struts/widgets/Bind.js
incubator/webwork2/src/java/org/apache/struts/action2/static/dojo/struts/widgets/BindAnchor.js
incubator/webwork2/src/java/org/apache/struts/action2/static/dojo/struts/widgets/BindButton.js
incubator/webwork2/src/java/org/apache/struts/action2/static/dojo/struts/widgets/BindDiv.js
incubator/webwork2/src/java/org/apache/struts/action2/static/dojo/struts/widgets/DynArchCalendar.js
incubator/webwork2/src/java/org/apache/struts/action2/static/dojo/struts/widgets/ToggleBindDiv.js
incubator/webwork2/src/java/org/apache/struts/action2/util/TokenHelper.java
incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java
incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/FreemarkerResult.java
incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/FreemarkerServlet.java
incubator/webwork2/src/java/org/apache/struts/action2/views/freemarker/PortletFreemarkerResult.java
incubator/webwork2/src/java/org/apache/struts/action2/views/jasperreports/JasperReportsResult.java
incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/ComponentTagSupport.java
incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/TagUtils.java
incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/iterator/IteratorGeneratorTag.java
incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/iterator/SortIteratorTag.java
incubator/webwork2/src/java/org/apache/struts/action2/views/jsp/iterator/SubsetIteratorTag.java
incubator/webwork2/src/java/org/apache/struts/action2/views/util/ContextUtil.java
incubator/webwork2/src/java/org/apache/struts/action2/views/util/UrlHelper.java
incubator/webwork2/src/java/org/apache/struts/action2/views/velocity/VelocityManager.java
incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/BeanAdapter.java
incubator/webwork2/src/java/org/apache/struts/action2/views/xslt/XSLTResult.java
incubator/webwork2/src/test/org/apache/struts/action2/ServletActionContextTest.java
incubator/webwork2/src/test/org/apache/struts/action2/components/PropertyTest.java
incubator/webwork2/src/test/org/apache/struts/action2/config/ConfigurationTest.java
incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/AbstractServletDispatcherTestCase.java
incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/DefautActionMapperTest.java
incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/DispatcherUtilsTest.java
incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/FilterDispatcherTest.java
incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/PlainTextResultTest.java
incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/ServletDispatcherResultTest.java
incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/ServletDispatcherTest-xwork.xml
incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/ServletDispatcherTest.java
incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/ServletRedirectResultTest.java
incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/VelocityResultTest.java
incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapperTest.java
incubator/webwork2/src/test/org/apache/struts/action2/dispatcher/mapper/RestfulActionMapperTest.java
incubator/webwork2/src/test/org/apache/struts/action2/interceptor/CreateSessionInterceptorTest.java
incubator/webwork2/src/test/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptorTest.java
incubator/webwork2/src/test/org/apache/struts/action2/interceptor/FileUploadInterceptor.properties
incubator/webwork2/src/test/org/apache/struts/action2/interceptor/FileUploadInterceptorTest.java
incubator/webwork2/src/test/org/apache/struts/action2/interceptor/ServletConfigInterceptorTest.java
incubator/webwork2/src/test/org/apache/struts/action2/interceptor/TokenInterceptorTest.java
incubator/webwork2/src/test/org/apache/struts/action2/sitegraph/SiteGraphTest.java
incubator/webwork2/src/test/org/apache/struts/action2/sitegraph/xwork.xml
incubator/webwork2/src/test/org/apache/struts/action2/util/InvocationSessionStoreTest.java
incubator/webwork2/src/test/org/apache/struts/action2/views/freemarker/FreemarkerManagerTest.java
incubator/webwork2/src/test/org/apache/struts/action2/views/freemarker/FreemarkerTest.java
incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/AbstractTagTest.java
incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/AnchorTagTest.java
incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ElseIfTagTest.java
incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ElseTagTest.java
incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/IfTagTest.java
incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/PortletUrlTagTest.java
incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/PropertyTagTest.java
incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/SetTagTest.java
incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/TextTagTest.java
incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/URLTagTest.java
incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ui/FormTagTest.java
incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ui/HeadTagTest.java
incubator/webwork2/src/test/org/apache/struts/action2/views/jsp/ui/TooltipTest.java
incubator/webwork2/src/test/org/apache/struts/action2/views/util/ContextUtilTest.java
incubator/webwork2/src/test/org/apache/struts/action2/views/util/UrlHelperTest.java
incubator/webwork2/src/test/org/apache/struts/action2/views/xslt/XSLTResultTest.java
incubator/webwork2/src/test/testmessages.properties
Modified: incubator/webwork2/build.properties
URL: http://svn.apache.org/viewcvs/incubator/webwork2/build.properties?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/build.properties (original)
+++ incubator/webwork2/build.properties Tue Mar 28 16:52:39 2006
@@ -1,5 +1,5 @@
-name = webwork
-fullname = WebWork
-version = 2.3
+name = struts-action
+fullname = Struts Action 2
+version = 2.0-dev
status = integration
-cvs.tag = webwork_2-3
+cvs.tag = action_2-0
Modified: incubator/webwork2/build.xml
URL: http://svn.apache.org/viewcvs/incubator/webwork2/build.xml?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/build.xml (original)
+++ incubator/webwork2/build.xml Tue Mar 28 16:52:39 2006
@@ -1,4 +1,4 @@
-<project name="webwork" default="jar" basedir=".">
+<project name="action" default="jar" basedir=".">
<!-- overridden properties (must be before the import!) -->
<property name="src.test" value="src/test"/>
<property name="src.xdt" value="src/xdt"/>
@@ -37,7 +37,7 @@
<echo>
The default build only retrieves dependencies that released under a license compatible
with the Apache Software Foundation. To optionally download the optional LGPL dependencies
- and compile the dependent Action 2 code, run the 'compile-optional' task.
+ and compile the dependent Struts Action 2 code, run the 'compile-optional' task.
</echo>
<taskdef name="ivy-configure" classname="fr.jayasoft.ivy.ant.IvyConfigure" classpathref="cp"/>
@@ -122,12 +122,12 @@
</fileset>
<configParam name="Jspversion" value="1.2"/>
<configParam name="Taglibversion" value="${version}"/>
- <configParam name="Description" value="WebWork JSP Taglib"/>
- <configParam name="Shortname" value="WebWork Taglib"/>
- <configParam name="Displayname" value="WebWork Taglib"/>
+ <configParam name="Description" value="Struts Action 2 JSP Taglib"/>
+ <configParam name="Shortname" value="Struts Action 2 Taglib"/>
+ <configParam name="Displayname" value="Struts Action 2 Taglib"/>
<configParam name="Smallicon" value=""/>
<configParam name="Largeicon" value=""/>
- <configParam name="Uri" value="/webwork"/>
+ <configParam name="Uri" value="/struts-action"/>
<xmlTemplate templateFile="${src.xdt}/taglib_tld.xdt" destinationfile="taglib.tld"/>
</xdoclet>
</target>
@@ -232,7 +232,9 @@
not endorsed by the Apache Software Foundation. In particular, these dependencies
use the LGPL license - http://opensource.org/licenses/lgpl-license.php
</echo>
+ <!--
<taskdef name="ivy-retrieve" classname="fr.jayasoft.ivy.ant.IvyRetrieve" classpathref="cp"/>
+ -->
<ivy-retrieve conf="fileupload-pell,jasperreports,jfree,cewolf" />
</target>
Modified: incubator/webwork2/src/etc/taglib-settings.xml
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/etc/taglib-settings.xml?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/etc/taglib-settings.xml (original)
+++ incubator/webwork2/src/etc/taglib-settings.xml Tue Mar 28 16:52:39 2006
@@ -1,5 +1,5 @@
- <tlibversion>1.1</tlibversion>
+ <tlibversion>1.1</tlibversion>
<jspversion>1.2</jspversion>
- <shortname>webwork</shortname>
- <uri>/webwork</uri>
+ <shortname>struts-action</shortname>
+ <uri>/struts-action</uri>
<info>A tag library for processing Model-2 command results</info>
Modified: incubator/webwork2/src/java/config-browser.xml
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/config-browser.xml?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/java/config-browser.xml (original)
+++ incubator/webwork2/src/java/config-browser.xml Tue Mar 28 16:52:39 2006
@@ -1,9 +1,9 @@
<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN" "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd">
<xwork>
- <include file="webwork-default.xml"/>
+ <include file="struts-default.xml"/>
- <package name="config" extends="webwork-default" namespace="/config-browser">
+ <package name="config" extends="struts-default" namespace="/config-browser">
<interceptors>
<interceptor-stack name="config-browser-default">
<interceptor-ref name="component"/>
Modified: incubator/webwork2/src/java/org/apache/struts/action2/Main.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/Main.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/Main.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/Main.java Tue Mar 28 16:52:39 2006
@@ -14,8 +14,8 @@
* <!-- START SNIPPET: javadoc -->
*
* WebWork comes with various related tools included in the webwork jar file. You can access these tools by simply
- * unpacking the WebWork distribution and running <b>java -jar webwork.jar</b>. WebWork will automatically include all
- * jars in the same directory as the webwork.jar file as well as all jars in the <i>lib</i> directory. This means you
+ * unpacking the WebWork distribution and running <b>java -jar struts.jar</b>. WebWork will automatically include all
+ * jars in the same directory as the struts.jar file as well as all jars in the <i>lib</i> directory. This means you
* can invoke these tools either from within the standard directory structure found in the WebWork distribution, or from
* within your WEB-INF/lib directory.
*
@@ -27,7 +27,7 @@
public static void main(String[] args) {
if (args.length == 0) {
System.out.println("Usage:");
- System.out.println(" java -jar webwork.jar [command] (optional command args)");
+ System.out.println(" java -jar struts.jar [command] (optional command args)");
System.out.println("");
System.out.println("Where [command] is one of the following:");
System.out.println(" quickstart");
@@ -65,7 +65,7 @@
}
// ... but there might not be any (ie: we're in development in IDEA), so use this as backup
- urls.add(new File(System.getProperty("webwork.classes", "build/java")).toURL());
+ urls.add(new File(System.getProperty("struts.classes", "build/java")).toURL());
urls.add(new File(System.getProperty("xwork.classes", "../xwork/build/java/")).toURL());
// load tools.jar from JAVA_HOME
@@ -157,7 +157,7 @@
System.out.println(" to deploy. The webapp name must be the");
System.out.println(" name of the directory found in webapps/.");
System.out.println("");
- System.out.println("Example: java -jar webwork.jar quickstart:sandbox");
+ System.out.println("Example: java -jar struts.jar quickstart:sandbox");
System.exit(1);
}
@@ -202,8 +202,8 @@
/**
* Reverses the typical order of classloading to defer only to the parent if the current class loader can't be
- * found. This is required to allow for the launcher to be embedded within webwork.jar (otherwise the dependencies
- * wouldn't be found by the system ClassLoader when invoking using "java -jar webwork.jar ...").
+ * found. This is required to allow for the launcher to be embedded within struts.jar (otherwise the dependencies
+ * wouldn't be found by the system ClassLoader when invoking using "java -jar struts.jar ...").
*/
public static class MainClassLoader extends URLClassLoader {
public MainClassLoader(URL[] urls) {
Modified: incubator/webwork2/src/java/org/apache/struts/action2/ServletActionContext.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/ServletActionContext.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/ServletActionContext.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/ServletActionContext.java Tue Mar 28 16:52:39 2006
@@ -22,8 +22,8 @@
* @author <a href="mailto:nightfal@etherlands.net">Erik Beeson</a>
* @author Bill Lynch (docs)
*/
-public class ServletActionContext extends ActionContext implements WebWorkStatics {
- public static final String WEBWORK_VALUESTACK_KEY = "webwork.valueStack";
+public class ServletActionContext extends ActionContext implements StrutsStatics {
+ public static final String STRUTS_VALUESTACK_KEY = "struts.valueStack";
private ServletActionContext(Map context) {
super(context);
@@ -40,7 +40,7 @@
}
public static OgnlValueStack getValueStack(HttpServletRequest req) {
- return (OgnlValueStack) req.getAttribute(WEBWORK_VALUESTACK_KEY);
+ return (OgnlValueStack) req.getAttribute(STRUTS_VALUESTACK_KEY);
}
/**
Copied: incubator/webwork2/src/java/org/apache/struts/action2/StrutsConstants.java (from r389620, incubator/webwork2/src/java/org/apache/struts/action2/WebWorkConstants.java)
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/StrutsConstants.java?p2=incubator/webwork2/src/java/org/apache/struts/action2/StrutsConstants.java&p1=incubator/webwork2/src/java/org/apache/struts/action2/WebWorkConstants.java&r1=389620&r2=389643&rev=389643&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/WebWorkConstants.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/StrutsConstants.java Tue Mar 28 16:52:39 2006
@@ -9,58 +9,58 @@
* webwork configurations.
*
* @author Onyeje Bose (digi9ten@yahoo.com)
- * @version $Date: 2006/03/20 01:09:37 $ $Id: WebWorkConstants.java,v 1.7 2006/03/20 01:09:37 the_mindstorm Exp $
+ * @version $Date: 2006/03/20 01:09:37 $ $Id: StrutsConstants.java,v 1.7 2006/03/20 01:09:37 the_mindstorm Exp $
*/
-public final class WebWorkConstants {
+public final class StrutsConstants {
- public static final String WEBWORK_DEVMODE = "webwork.devMode";
+ public static final String STRUTS_DEVMODE = "struts.devMode";
- public static final String WEBWORK_I18N_RELOAD = "webwork.i18n.reload";
- public static final String WEBWORK_I18N_ENCODING = "webwork.i18n.encoding";
+ public static final String STRUTS_I18N_RELOAD = "struts.i18n.reload";
+ public static final String STRUTS_I18N_ENCODING = "struts.i18n.encoding";
- public static final String WEBWORK_CONFIGURATION_XML_RELOAD = "webwork.configuration.xml.reload";
+ public static final String STRUTS_CONFIGURATION_XML_RELOAD = "struts.configuration.xml.reload";
- public static final String WEBWORK_ACTION_EXTENSION = "webwork.action.extension";
+ public static final String STRUTS_ACTION_EXTENSION = "struts.action.extension";
- public static final String WEBWORK_TAG_ALTSYNTAX = "webwork.tag.altSyntax";
+ public static final String STRUTS_TAG_ALTSYNTAX = "struts.tag.altSyntax";
- public static final String WEBWORK_URL_HTTP_PORT = "webwork.url.http.port";
- public static final String WEBWORK_URL_HTTPS_PORT = "webwork.url.https.port";
+ public static final String STRUTS_URL_HTTP_PORT = "struts.url.http.port";
+ public static final String STRUTS_URL_HTTPS_PORT = "struts.url.https.port";
- public static final String WEBWORK_OBJECTFACTORY = "webwork.objectFactory";
- public static final String WEBWORK_OBJECTTYPEDETERMINER = "webwork.objectTypeDeterminer";
+ public static final String STRUTS_OBJECTFACTORY = "struts.objectFactory";
+ public static final String STRUTS_OBJECTTYPEDETERMINER = "struts.objectTypeDeterminer";
- public static final String WEBWORK_CONTINUATIONS_PACKAGE = "webwork.continuations.package";
+ public static final String STRUTS_CONTINUATIONS_PACKAGE = "struts.continuations.package";
- public static final String WEBWORK_CONFIGURATION = "webwork.configuration";
+ public static final String STRUTS_CONFIGURATION = "struts.configuration";
- public static final String WEBWORK_LOCALE = "webwork.locale";
+ public static final String STRUTS_LOCALE = "struts.locale";
- public static final String WEBWORK_DISPATCHER_PARAMETERSWORKAROUND = "webwork.dispatcher.parametersWorkaround";
+ public static final String STRUTS_DISPATCHER_PARAMETERSWORKAROUND = "struts.dispatcher.parametersWorkaround";
- public static final String WEBWORK_FREEMARKER_MANAGER_CLASSNAME = "webwork.freemarker.manager.classname";
+ public static final String STRUTS_FREEMARKER_MANAGER_CLASSNAME = "struts.freemarker.manager.classname";
- public static final String WEBWORK_VELOCITY_MANAGER_CLASSNAME = "webwork.velocity.manager.classname";
- public static final String WEBWORK_VELOCITY_CONFIGFILE = "webwork.velocity.configfile";
- public static final String WEBWORK_VELOCITY_TOOLBOXLOCATION = "webwork.velocity.toolboxlocation";
- public static final String WEBWORK_VELOCITY_CONTEXTS = "webwork.velocity.contexts";
+ public static final String STRUTS_VELOCITY_MANAGER_CLASSNAME = "struts.velocity.manager.classname";
+ public static final String STRUTS_VELOCITY_CONFIGFILE = "struts.velocity.configfile";
+ public static final String STRUTS_VELOCITY_TOOLBOXLOCATION = "struts.velocity.toolboxlocation";
+ public static final String STRUTS_VELOCITY_CONTEXTS = "struts.velocity.contexts";
- public static final String WEBWORK_UI_TEMPLATEDIR = "webwork.ui.templateDir";
- public static final String WEBWORK_UI_THEME = "webwork.ui.theme";
+ public static final String STRUTS_UI_TEMPLATEDIR = "struts.ui.templateDir";
+ public static final String STRUTS_UI_THEME = "struts.ui.theme";
- public static final String WEBWORK_MULTIPART_MAXSIZE = "webwork.multipart.maxSize";
- public static final String WEBWORK_MULTIPART_SAVEDIR = "webwork.multipart.saveDir";
- public static final String WEBWORK_MULTIPART_PARSER = "webwork.multipart.parser";
+ public static final String STRUTS_MULTIPART_MAXSIZE = "struts.multipart.maxSize";
+ public static final String STRUTS_MULTIPART_SAVEDIR = "struts.multipart.saveDir";
+ public static final String STRUTS_MULTIPART_PARSER = "struts.multipart.parser";
- public static final String WEBWORK_OBJECTFACTORY_SPRING_AUTOWIRE = "webwork.objectFactory.spring.autoWire";
- public static final String WEBWORK_OBJECTFACTORY_SPRING_USE_CLASS_CACHE = "webwork.objectFactory.spring.useClassCache";
+ public static final String STRUTS_OBJECTFACTORY_SPRING_AUTOWIRE = "struts.objectFactory.spring.autoWire";
+ public static final String STRUTS_OBJECTFACTORY_SPRING_USE_CLASS_CACHE = "struts.objectFactory.spring.useClassCache";
- public static final String WEBWORK_XSLT_NOCACHE = "webwork.xslt.nocache";
+ public static final String STRUTS_XSLT_NOCACHE = "struts.xslt.nocache";
- public static final String WEBWORK_CUSTOM_PROPERTIES = "webwork.custom.properties";
- public static final String WEBWORK_CUSTOM_I18N_RESOURCES = "webwork.custom.i18n.resources";
- public static final String WEBWORK_MAPPER_CLASS = "webwork.mapper.class";
+ public static final String STRUTS_CUSTOM_PROPERTIES = "struts.custom.properties";
+ public static final String STRUTS_CUSTOM_I18N_RESOURCES = "struts.custom.i18n.resources";
+ public static final String STRUTS_MAPPER_CLASS = "struts.mapper.class";
- public static final String WEBWORK_PORTLET_CONTEXT = "webwork.portlet.context";
- public static final String WEBWORK_SERVE_STATIC_CONTENT = "webwork.serve.static";
+ public static final String STRUTS_PORTLET_CONTEXT = "struts.portlet.context";
+ public static final String STRUTS_SERVE_STATIC_CONTENT = "struts.serve.static";
}
Copied: incubator/webwork2/src/java/org/apache/struts/action2/StrutsStatics.java (from r389620, incubator/webwork2/src/java/org/apache/struts/action2/WebWorkStatics.java)
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/StrutsStatics.java?p2=incubator/webwork2/src/java/org/apache/struts/action2/StrutsStatics.java&p1=incubator/webwork2/src/java/org/apache/struts/action2/WebWorkStatics.java&r1=389620&r2=389643&rev=389643&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/WebWorkStatics.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/StrutsStatics.java Tue Mar 28 16:52:39 2006
@@ -21,7 +21,7 @@
* @author Patrick Lightbody
* @author Bill Lynch (docs)
*/
-public interface WebWorkStatics {
+public interface StrutsStatics {
/**
* Constant for the HTTP request object.
Copied: incubator/webwork2/src/java/org/apache/struts/action2/StrutsTestCase.java (from r389620, incubator/webwork2/src/java/org/apache/struts/action2/WebWorkTestCase.java)
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/StrutsTestCase.java?p2=incubator/webwork2/src/java/org/apache/struts/action2/StrutsTestCase.java&p1=incubator/webwork2/src/java/org/apache/struts/action2/WebWorkTestCase.java&r1=389620&r2=389643&rev=389643&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/WebWorkTestCase.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/StrutsTestCase.java Tue Mar 28 16:52:39 2006
@@ -8,7 +8,7 @@
*
* @author plightbo
*/
-public abstract class WebWorkTestCase extends XWorkTestCase {
+public abstract class StrutsTestCase extends XWorkTestCase {
protected void setUp() throws Exception {
super.setUp();
Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/ActionComponent.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/ActionComponent.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/ActionComponent.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/ActionComponent.java Tue Mar 28 16:52:39 2006
@@ -210,7 +210,7 @@
proxy.setMethod(methodName);
}
// set the new stack into the request for the taglib to use
- req.setAttribute(ServletActionContext.WEBWORK_VALUESTACK_KEY, proxy.getInvocation().getStack());
+ req.setAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY, proxy.getInvocation().getStack());
proxy.execute();
} catch (Exception e) {
@@ -218,7 +218,7 @@
LOG.error(message, e);
} finally {
// set the old stack back on the request
- req.setAttribute(ServletActionContext.WEBWORK_VALUESTACK_KEY, stack);
+ req.setAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY, stack);
}
if ((getId() != null) && (proxy != null)) {
Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/ComboBox.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/ComboBox.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/ComboBox.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/ComboBox.java Tue Mar 28 16:52:39 2006
@@ -26,7 +26,7 @@
* <pre>
* <!-- START SNIPPET: example -->
* JSP:
- * <ww:bean name="webwork.util.Counter" id="year">
+ * <ww:bean name="struts.util.Counter" id="year">
* <ww:param name="first" value="text('firstBirthYear')"/>
* <ww:param name="last" value="2000"/>
*
Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/Component.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/Component.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/Component.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/Component.java Tue Mar 28 16:52:39 2006
@@ -233,7 +233,7 @@
/**
* Is the altSyntax enabled?
* <p/>
- * See <code>webwork.properties</code> where the altSyntax flag is defined.
+ * See <code>struts.properties</code> where the altSyntax flag is defined.
* <b>Note:</b> Since WebWork 2.17 the altSyntax is default <tt>true</tt>.
* @return true if the altSyntax is enabled.
*/
Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/Date.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/Date.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/Date.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/Date.java Tue Mar 28 16:52:39 2006
@@ -26,7 +26,7 @@
* The date tag will allow you to format a Date in a quick and easy way.
* You can specify a <b>custom format</b> (eg. "dd/MM/yyyy hh:mm"), you can generate
* <b>easy readable notations</b> (like "in 2 hours, 14 minutes"), or you can just fall back
- * on a <b>predefined format</b> with key 'webwork.date.format' in your properties file.
+ * on a <b>predefined format</b> with key 'struts.date.format' in your properties file.
*
* If that key is not defined, it will finally fall back to the default DateFormat.MEDIUM
* formatting.
@@ -55,31 +55,31 @@
* <td>default</td>
* </tr>
* <tr>
- * <td>webwork.date.format.past</td>
+ * <td>struts.date.format.past</td>
* <td>{0} ago</td>
* </tr>
* <tr>
- * <td>webwork.date.format.future</td>
+ * <td>struts.date.format.future</td>
* <td>in {0}</td>
* </tr>
* <tr>
- * <td>webwork.date.format.seconds</td>
+ * <td>struts.date.format.seconds</td>
* <td>an instant</td>
* </tr>
* <tr>
- * <td>webwork.date.format.minutes</td>
+ * <td>struts.date.format.minutes</td>
* <td>{0,choice,1#one minute|1<{0} minutes}</td>
* </tr>
* <tr>
- * <td>webwork.date.format.hours</td>
+ * <td>struts.date.format.hours</td>
* <td>{0,choice,1#one hour|1<{0} hours}{1,choice,0#|1#, one minute|1<, {1} minutes}</td>
* </tr>
* <tr>
- * <td>webwork.date.format.days</td>
+ * <td>struts.date.format.days</td>
* <td>{0,choice,1#one day|1<{0} days}{1,choice,0#|1#, one hour|1<, {1} hours}</td>
* </tr>
* <tr>
- * <td>webwork.date.format.years</td>
+ * <td>struts.date.format.years</td>
* <td>{0,choice,1#one year|1<{0} years}{1,choice,0#|1#, one day|1<, {1} days}</td>
* </tr>
* </table>
@@ -98,7 +98,7 @@
* <td>default</td>
* </tr>
* <tr>
- * <td>webwork.date.format</td>
+ * <td>struts.date.format</td>
* <td>if one is not found DateFormat.MEDIUM format will be used</td>
* </tr>
* </table>
@@ -133,44 +133,44 @@
/**
* Property name to fall back when no format is specified
*/
- public static final String DATETAG_PROPERTY = "webwork.date.format";
+ public static final String DATETAG_PROPERTY = "struts.date.format";
/**
* Property name that defines the past notation (default: {0} ago)
*/
- public static final String DATETAG_PROPERTY_PAST = "webwork.date.format.past";
+ public static final String DATETAG_PROPERTY_PAST = "struts.date.format.past";
private static final String DATETAG_DEFAULT_PAST = "{0} ago";
/**
* Property name that defines the future notation (default: in {0})
*/
- public static final String DATETAG_PROPERTY_FUTURE = "webwork.date.format.future";
+ public static final String DATETAG_PROPERTY_FUTURE = "struts.date.format.future";
private static final String DATETAG_DEFAULT_FUTURE = "in {0}";
/**
* Property name that defines the seconds notation (default: in instant)
*/
- public static final String DATETAG_PROPERTY_SECONDS = "webwork.date.format.seconds";
+ public static final String DATETAG_PROPERTY_SECONDS = "struts.date.format.seconds";
private static final String DATETAG_DEFAULT_SECONDS = "an instant";
/**
* Property name that defines the minutes notation (default: {0,choice,1#one minute|1<{0} minutes})
*/
- public static final String DATETAG_PROPERTY_MINUTES = "webwork.date.format.minutes";
+ public static final String DATETAG_PROPERTY_MINUTES = "struts.date.format.minutes";
private static final String DATETAG_DEFAULT_MINUTES = "{0,choice,1#one minute|1<{0} minutes}";
/**
* Property name that defines the hours notation (default: {0,choice,1#one hour|1<{0} hours}{1,choice,0#|1#, one
* minute|1<, {1} minutes})
*/
- public static final String DATETAG_PROPERTY_HOURS = "webwork.date.format.hours";
+ public static final String DATETAG_PROPERTY_HOURS = "struts.date.format.hours";
private static final String DATETAG_DEFAULT_HOURS = "{0,choice,1#one hour|1<{0} hours}{1,choice,0#|1#, one minute|1<, {1} minutes}";
/**
* Property name that defines the days notation (default: {0,choice,1#one day|1<{0} days}{1,choice,0#|1#, one hour|1<,
* {1} hours})
*/
- public static final String DATETAG_PROPERTY_DAYS = "webwork.date.format.days";
+ public static final String DATETAG_PROPERTY_DAYS = "struts.date.format.days";
private static final String DATETAG_DEFAULT_DAYS = "{0,choice,1#one day|1<{0} days}{1,choice,0#|1#, one hour|1<, {1} hours}";
/**
* Property name that defines the years notation (default: {0,choice,1#one year|1<{0} years}{1,choice,0#|1#, one
* day|1<, {1} days})
*/
- public static final String DATETAG_PROPERTY_YEARS = "webwork.date.format.years";
+ public static final String DATETAG_PROPERTY_YEARS = "struts.date.format.years";
private static final String DATETAG_DEFAULT_YEARS = "{0,choice,1#one year|1<{0} years}{1,choice,0#|1#, one day|1<, {1} days}";
private String name;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/Head.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/Head.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/Head.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/Head.java Tue Mar 28 16:52:39 2006
@@ -6,7 +6,7 @@
import com.opensymphony.xwork.util.OgnlValueStack;
import org.apache.struts.action2.config.Configuration;
-import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.StrutsConstants;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -92,7 +92,7 @@
}
}
- addParameter("encoding", Configuration.get(WebWorkConstants.WEBWORK_I18N_ENCODING));
+ addParameter("encoding", Configuration.get(StrutsConstants.STRUTS_I18N_ENCODING));
addParameter("debug", Boolean.valueOf(debug).toString());
}
Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/If.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/If.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/If.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/If.java Tue Mar 28 16:52:39 2006
@@ -46,7 +46,7 @@
* @ww.tag name="if" tld-body-content="JSP" description="If tag" tld-tag-class="org.apache.struts.action2.views.jsp.IfTag"
*/
public class If extends Component {
- public static final String ANSWER = "webwork.if.answer";
+ public static final String ANSWER = "struts.if.answer";
Boolean answer;
String test;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/Include.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/Include.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/Include.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/Include.java Tue Mar 28 16:52:39 2006
@@ -3,7 +3,7 @@
import org.apache.struts.action2.config.Configuration;
import org.apache.struts.action2.util.FastByteArrayOutputStream;
import org.apache.struts.action2.RequestUtils;
-import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.StrutsConstants;
import com.opensymphony.xwork.util.OgnlValueStack;
import org.apache.commons.logging.Log;
@@ -236,7 +236,7 @@
}
/**
- * Get the encoding specified by the property 'webwork.i18n.encoding' in webwork.properties,
+ * Get the encoding specified by the property 'struts.i18n.encoding' in struts.properties,
* or return the default platform encoding if not specified.
* <p/>
* Note that if the property is not initially defined, this will return the system default,
@@ -254,7 +254,7 @@
private static String getEncoding() {
if (encodingDefined) {
try {
- encoding = Configuration.getString(WebWorkConstants.WEBWORK_I18N_ENCODING);
+ encoding = Configuration.getString(StrutsConstants.STRUTS_I18N_ENCODING);
} catch (IllegalArgumentException e) {
encoding = System.getProperty("file.encoding");
encodingDefined = false;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/Text.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/Text.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/Text.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/Text.java Tue Mar 28 16:52:39 2006
@@ -58,7 +58,7 @@
* <!-- START SNIPPET: example -->
*
* <!-- First Example -->
- * <ww:i18n name="webwork.action.test.i18n.Shop">
+ * <ww:i18n name="struts.action.test.i18n.Shop">
* <ww:text name="main.title"/>
* </ww:i18n>
*
Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/UIBean.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/UIBean.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/UIBean.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/UIBean.java Tue Mar 28 16:52:39 2006
@@ -4,7 +4,7 @@
*/
package org.apache.struts.action2.components;
-import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.StrutsConstants;
import org.apache.struts.action2.components.template.Template;
import org.apache.struts.action2.components.template.TemplateEngine;
import org.apache.struts.action2.components.template.TemplateEngineManager;
@@ -652,7 +652,7 @@
// Default template set
if ((templateDir == null) || (templateDir.equals(""))) {
- templateDir = Configuration.getString(WebWorkConstants.WEBWORK_UI_TEMPLATEDIR);
+ templateDir = Configuration.getString(StrutsConstants.STRUTS_UI_TEMPLATEDIR);
}
// Defaults to 'template'
@@ -685,7 +685,7 @@
// Default theme set
if ((theme == null) || (theme.equals(""))) {
- theme = Configuration.getString(WebWorkConstants.WEBWORK_UI_THEME);
+ theme = Configuration.getString(StrutsConstants.STRUTS_UI_THEME);
}
return theme;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/components/template/TemplateEngineManager.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/components/template/TemplateEngineManager.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/components/template/TemplateEngineManager.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/components/template/TemplateEngineManager.java Tue Mar 28 16:52:39 2006
@@ -15,7 +15,7 @@
* @author jcarreira
*/
public class TemplateEngineManager {
- public static final String DEFAULT_TEMPLATE_TYPE_CONFIG_KEY = "webwork.ui.templateSuffix";
+ public static final String DEFAULT_TEMPLATE_TYPE_CONFIG_KEY = "struts.ui.templateSuffix";
private static final TemplateEngineManager MANAGER = new TemplateEngineManager();
@@ -44,7 +44,7 @@
/**
* Gets the TemplateEngine for the template name. If the template name has an extension (for instance foo.jsp), then
* this extension will be used to look up the appropriate TemplateEngine. If it does not have an extension, it will
- * look for a Configuration setting "webwork.ui.templateSuffix" for the extension, and if that is not set, it
+ * look for a Configuration setting "struts.ui.templateSuffix" for the extension, and if that is not set, it
* will fall back to "ftl" as the default.
*
* @param template Template used to determine which TemplateEngine to return
Modified: incubator/webwork2/src/java/org/apache/struts/action2/config/Configuration.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/config/Configuration.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/config/Configuration.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/config/Configuration.java Tue Mar 28 16:52:39 2006
@@ -5,7 +5,7 @@
package org.apache.struts.action2.config;
import com.opensymphony.xwork.ObjectFactory;
-import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.StrutsConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -67,7 +67,7 @@
}
/**
- * Returns the WebWork2 locale. Keys off the property <tt>webwork.locale</tt> which should be set
+ * Returns the WebWork2 locale. Keys off the property <tt>struts.locale</tt> which should be set
* as the Java {@link java.util.Locale#toString() toString()} representation of a Locale object (i.e.,
* "en", "de_DE", "_GB", "en_US_WIN", "de__POSIX", "fr_MAC", etc). <p>
* <p/>
@@ -78,7 +78,7 @@
public static Locale getLocale() {
if (locale == null) {
try {
- StringTokenizer localeTokens = new StringTokenizer(getString(WebWorkConstants.WEBWORK_LOCALE), "_");
+ StringTokenizer localeTokens = new StringTokenizer(getString(StrutsConstants.STRUTS_LOCALE), "_");
String lang = null;
String country = null;
@@ -207,7 +207,7 @@
// Create default implementation
try {
- String className = getString(WebWorkConstants.WEBWORK_CONFIGURATION);
+ String className = getString(StrutsConstants.STRUTS_CONFIGURATION);
if (!className.equals(defaultImpl.getClass().getName())) {
try {
Modified: incubator/webwork2/src/java/org/apache/struts/action2/config/DefaultConfiguration.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/config/DefaultConfiguration.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/config/DefaultConfiguration.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/config/DefaultConfiguration.java Tue Mar 28 16:52:39 2006
@@ -5,7 +5,7 @@
package org.apache.struts.action2.config;
import com.opensymphony.xwork.util.LocalizedTextUtil;
-import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.StrutsConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -35,13 +35,13 @@
*/
public DefaultConfiguration() {
// Create default implementations
- // Use default properties and webwork.properties
+ // Use default properties and struts.properties
ArrayList list = new ArrayList();
try {
- list.add(new PropertiesConfiguration("webwork"));
+ list.add(new PropertiesConfiguration("struts"));
} catch (Exception e) {
- log.warn("Could not find webwork.properties");
+ log.warn("Could not find struts.properties");
}
try {
@@ -55,7 +55,7 @@
// Add list of additional properties configurations
try {
- StringTokenizer configFiles = new StringTokenizer((String) config.getImpl(WebWorkConstants.WEBWORK_CUSTOM_PROPERTIES), ",");
+ StringTokenizer configFiles = new StringTokenizer((String) config.getImpl(StrutsConstants.STRUTS_CUSTOM_PROPERTIES), ",");
while (configFiles.hasMoreTokens()) {
String name = configFiles.nextToken();
@@ -75,8 +75,8 @@
// Add addtional list of i18n global resource bundles
try {
- LocalizedTextUtil.addDefaultResourceBundle("org/apache/struts/action2/webwork-messages");
- StringTokenizer bundleFiles = new StringTokenizer((String) config.getImpl(WebWorkConstants.WEBWORK_CUSTOM_I18N_RESOURCES), ", ");
+ LocalizedTextUtil.addDefaultResourceBundle("org/apache/struts/action2/struts-messages");
+ StringTokenizer bundleFiles = new StringTokenizer((String) config.getImpl(StrutsConstants.STRUTS_CUSTOM_I18N_RESOURCES), ", ");
while (bundleFiles.hasMoreTokens()) {
String name = bundleFiles.nextToken();
@@ -89,7 +89,7 @@
}
}
} catch (IllegalArgumentException e) {
- // webwork.custom.i18n.resources wasn't provided
+ // struts.custom.i18n.resources wasn't provided
}
}
Modified: incubator/webwork2/src/java/org/apache/struts/action2/config_browser/ActionNamesAction.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/config_browser/ActionNamesAction.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/config_browser/ActionNamesAction.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/config_browser/ActionNamesAction.java Tue Mar 28 16:52:39 2006
@@ -3,7 +3,7 @@
import com.opensymphony.xwork.ActionSupport;
import com.opensymphony.xwork.config.entities.ActionConfig;
import org.apache.struts.action2.config.Configuration;
-import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.StrutsConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -45,7 +45,7 @@
public String getExtension() {
if ( extension == null) {
- String ext = (String) Configuration.get(WebWorkConstants.WEBWORK_ACTION_EXTENSION);
+ String ext = (String) Configuration.get(StrutsConstants.STRUTS_ACTION_EXTENSION);
if ( ext == null || ext.equals("")) {
extension = "action";
} else {
Modified: incubator/webwork2/src/java/org/apache/struts/action2/default.properties
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/default.properties?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/default.properties (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/default.properties Tue Mar 28 16:52:39 2006
@@ -1,122 +1,122 @@
### START SNIPPET: complete_file
### Webwork default properties
-###(can be overridden by a webwork.properties file in the root of the classpath)
+###(can be overridden by a struts.properties file in the root of the classpath)
###
### Specifies the Configuration used to configure webwork
### one could extend org.apache.struts.action2.config.Configuration
### to build one's customize way of getting the configurations parameters into webwork
-# webwork.configuration=org.apache.struts.action2.config.DefaultConfiguration
+# struts.configuration=org.apache.struts.action2.config.DefaultConfiguration
### This can be used to set your default locale and encoding scheme
-# webwork.locale=en_US
-webwork.i18n.encoding=UTF-8
+# struts.locale=en_US
+struts.i18n.encoding=UTF-8
### if specified, the default object factory can be overridden here
### Note: short-hand notation is supported in some cases, such as "spring"
### Alternatively, you can provide a com.opensymphony.xwork.ObjectFactory subclass name here
-# webwork.objectFactory = spring
+# struts.objectFactory = spring
### specifies the autoWiring logic when using the SpringObjectFactory.
### valid values are: name, type, auto, and constructor (name is the default)
-webwork.objectFactory.spring.autoWire = name
+struts.objectFactory.spring.autoWire = name
### indicates to the webwork-spring integration if Class instances should be cached
### this should, until a future Spring release makes it possible, be left as true
### unless you know exactly what you are doing!
### valid values are: true, false (true is the default)
-webwork.objectFactory.spring.useClassCache = true
+struts.objectFactory.spring.useClassCache = true
### if specified, the default object type determiner can be overridden here
### Note: short-hand notation is supported in some cases, such as "tiger" or "notiger"
### Alternatively, you can provide a com.opensymphony.xwork.util.ObjectTypeDeterminer implementation name here
### Note: if you have the xwork-tiger.jar within your classpath, GenericsObjectTypeDeterminer is used by default
### To disable tiger support use the "notiger" property value here.
-#webwork.objectTypeDeterminer = tiger
-#webwork.objectTypeDeterminer = notiger
+#struts.objectTypeDeterminer = tiger
+#struts.objectTypeDeterminer = notiger
### Parser to handle HTTP POST requests, encoded using the MIME-type multipart/form-data
-# webwork.multipart.parser=cos
-# webwork.multipart.parser=pell
-webwork.multipart.parser=jakarta
+# struts.multipart.parser=cos
+# struts.multipart.parser=pell
+struts.multipart.parser=jakarta
# uses javax.servlet.context.tempdir by default
-webwork.multipart.saveDir=
-webwork.multipart.maxSize=2097152
+struts.multipart.saveDir=
+struts.multipart.maxSize=2097152
-### Load custom property files (does not override webwork.properties!)
-# webwork.custom.properties=application,com/webwork/extension/custom
+### Load custom property files (does not override struts.properties!)
+# struts.custom.properties=application,com/webwork/extension/custom
### How request URLs are mapped to and from actions
-webwork.mapper.class=org.apache.struts.action2.dispatcher.mapper.DefaultActionMapper
+struts.mapper.class=org.apache.struts.action2.dispatcher.mapper.DefaultActionMapper
### Used by the DefaultActionMapper
-### You may provide a comma separated list, e.g. webwork.action.extension=action,jnlp,do
-webwork.action.extension=action
+### You may provide a comma separated list, e.g. struts.action.extension=action,jnlp,do
+struts.action.extension=action
### Used by FilterDispatcher
### If true than WW serves static content from inside its jar.
### If false than the static content must be available at <context_path>/webwork
-webwork.serve.static=true
+struts.serve.static=true
### use alternative syntax that requires %{} in most places
### to evaluate expressions for String attributes for tags
-webwork.tag.altSyntax=true
+struts.tag.altSyntax=true
### when set to true, WebWork will act much more friendly for developers. This
### includes:
-### - webwork.i18n.reload = true
-### - webwork.configuration.xml.reload = true
+### - struts.i18n.reload = true
+### - struts.configuration.xml.reload = true
### - raising various debug or ignorable problems to errors
### For example: normally a request to foo.action?someUnknownField=true should
### be ignored (given that any value can come from the web and it
### should not be trusted). However, during development, it may be
### useful to know when these errors are happening and be told of
### them right away.
-webwork.devMode = false
+struts.devMode = false
### when set to true, resource bundles will be reloaded on _every_ request.
### this is good during development, but should never be used in production
-webwork.i18n.reload=false
+struts.i18n.reload=false
### Standard UI theme
### Change this to reflect which path should be used for JSP control tag templates by default
-webwork.ui.theme=xhtml
-webwork.ui.templateDir=template
+struts.ui.theme=xhtml
+struts.ui.templateDir=template
#sets the default template type. Either ftl, vm, or jsp
-webwork.ui.templateSuffix=ftl
+struts.ui.templateSuffix=ftl
### Configuration reloading
### This will cause the configuration to reload xwork.xml when it is changed
-webwork.configuration.xml.reload=false
+struts.configuration.xml.reload=false
### Location of velocity.properties file. defaults to velocity.properties
-# webwork.velocity.configfile = velocity.properties
+# struts.velocity.configfile = velocity.properties
### Comma separated list of VelocityContext classnames to chain to the WebWorkVelocityContext
-# webwork.velocity.contexts =
+# struts.velocity.contexts =
### used to build URLs, such as the UrlTag
-webwork.url.http.port = 80
-webwork.url.https.port = 443
+struts.url.http.port = 80
+struts.url.https.port = 443
### Load custom default resource bundles
-# webwork.custom.i18n.resources=testmessages,testmessages2
+# struts.custom.i18n.resources=testmessages,testmessages2
### workaround for some app servers that don't handle HttpServletRequest.getParameterMap()
### often used for WebLogic, Orion, and OC4J
-webwork.dispatcher.parametersWorkaround = false
+struts.dispatcher.parametersWorkaround = false
### configure the Freemarker Manager class to be used
### Allows user to plug-in customised Freemarker Manager if necessary
### MUST extends off org.apache.struts.action2.views.freemarker.FreemarkerManager
-#webwork.freemarker.manager.classname=org.apache.struts.action2.views.freemarker.FreemarkerManager
+#struts.freemarker.manager.classname=org.apache.struts.action2.views.freemarker.FreemarkerManager
### See the WebWorkBeanWrapper javadocs for more information
-webwork.freemarker.wrapper.altMap=true
+struts.freemarker.wrapper.altMap=true
### configure the XSLTResult class to use stylesheet caching.
### Set to true for developers and false for production.
-webwork.xslt.nocache=false
+struts.xslt.nocache=false
### END SNIPPET: complete_file
Modified: incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/DispatcherUtils.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/DispatcherUtils.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/DispatcherUtils.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/DispatcherUtils.java Tue Mar 28 16:52:39 2006
@@ -7,8 +7,8 @@
import com.opensymphony.util.ClassLoaderUtil;
import com.opensymphony.util.FileManager;
import org.apache.struts.action2.ServletActionContext;
-import org.apache.struts.action2.WebWorkStatics;
-import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.StrutsStatics;
+import org.apache.struts.action2.StrutsConstants;
import org.apache.struts.action2.config.Configuration;
import org.apache.struts.action2.dispatcher.mapper.ActionMapping;
import org.apache.struts.action2.dispatcher.multipart.MultiPartRequest;
@@ -96,11 +96,11 @@
}
protected void init(ServletContext servletContext) {
- boolean reloadi18n = Boolean.valueOf((String) Configuration.get(WebWorkConstants.WEBWORK_I18N_RELOAD)).booleanValue();
+ boolean reloadi18n = Boolean.valueOf((String) Configuration.get(StrutsConstants.STRUTS_I18N_RELOAD)).booleanValue();
LocalizedTextUtil.setReloadBundles(reloadi18n);
- if (Configuration.isSet(WebWorkConstants.WEBWORK_OBJECTFACTORY)) {
- String className = (String) Configuration.get(WebWorkConstants.WEBWORK_OBJECTFACTORY);
+ if (Configuration.isSet(StrutsConstants.STRUTS_OBJECTFACTORY)) {
+ String className = (String) Configuration.get(StrutsConstants.STRUTS_OBJECTFACTORY);
if (className.equals("spring")) {
// note: this class name needs to be in string form so we don't put hard
// dependencies on spring, since it isn't technically required.
@@ -123,8 +123,8 @@
}
}
- if (Configuration.isSet(WebWorkConstants.WEBWORK_OBJECTTYPEDETERMINER)) {
- String className = (String) Configuration.get(WebWorkConstants.WEBWORK_OBJECTTYPEDETERMINER);
+ if (Configuration.isSet(StrutsConstants.STRUTS_OBJECTTYPEDETERMINER)) {
+ String className = (String) Configuration.get(StrutsConstants.STRUTS_OBJECTTYPEDETERMINER);
if (className.equals("tiger")) {
// note: this class name needs to be in string form so we don't put hard
// dependencies on xwork-tiger, since it isn't technically required.
@@ -143,19 +143,19 @@
}
}
- if ("true".equals(Configuration.get(WebWorkConstants.WEBWORK_DEVMODE))) {
+ if ("true".equals(Configuration.get(StrutsConstants.STRUTS_DEVMODE))) {
devMode = true;
- Configuration.set(WebWorkConstants.WEBWORK_I18N_RELOAD, "true");
- Configuration.set(WebWorkConstants.WEBWORK_CONFIGURATION_XML_RELOAD, "true");
+ Configuration.set(StrutsConstants.STRUTS_I18N_RELOAD, "true");
+ Configuration.set(StrutsConstants.STRUTS_CONFIGURATION_XML_RELOAD, "true");
}
//check for configuration reloading
- if ("true".equalsIgnoreCase(Configuration.getString(WebWorkConstants.WEBWORK_CONFIGURATION_XML_RELOAD))) {
+ if ("true".equalsIgnoreCase(Configuration.getString(StrutsConstants.STRUTS_CONFIGURATION_XML_RELOAD))) {
FileManager.setReloadingConfigs(true);
}
- if (Configuration.isSet(WebWorkConstants.WEBWORK_CONTINUATIONS_PACKAGE)) {
- String pkg = Configuration.getString(WebWorkConstants.WEBWORK_CONTINUATIONS_PACKAGE);
+ if (Configuration.isSet(StrutsConstants.STRUTS_CONTINUATIONS_PACKAGE)) {
+ String pkg = Configuration.getString(StrutsConstants.STRUTS_CONTINUATIONS_PACKAGE);
ObjectFactory.setContinuationPackage(pkg);
}
@@ -163,8 +163,8 @@
if (servletContext.getServerInfo().indexOf("WebLogic") >= 0) {
LOG.info("WebLogic server detected. Enabling WebWork parameter access work-around.");
paramsWorkaroundEnabled = true;
- } else if (Configuration.isSet(WebWorkConstants.WEBWORK_DISPATCHER_PARAMETERSWORKAROUND)) {
- paramsWorkaroundEnabled = "true".equals(Configuration.get(WebWorkConstants.WEBWORK_DISPATCHER_PARAMETERSWORKAROUND));
+ } else if (Configuration.isSet(StrutsConstants.STRUTS_DISPATCHER_PARAMETERSWORKAROUND)) {
+ paramsWorkaroundEnabled = "true".equals(Configuration.get(StrutsConstants.STRUTS_DISPATCHER_PARAMETERSWORKAROUND));
} else {
LOG.debug("Parameter access work-around disabled.");
}
@@ -200,7 +200,7 @@
Map extraContext = createContextMap(request, response, mapping, context);
// If there was a previous value stack, then create a new copy and pass it in to be used by the new Action
- OgnlValueStack stack = (OgnlValueStack) request.getAttribute(ServletActionContext.WEBWORK_VALUESTACK_KEY);
+ OgnlValueStack stack = (OgnlValueStack) request.getAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY);
if (stack != null) {
extraContext.put(ActionContext.VALUE_STACK, new OgnlValueStack(stack));
}
@@ -223,7 +223,7 @@
ActionProxy proxy = ActionProxyFactory.getFactory().createActionProxy(namespace, name, extraContext, true, false);
proxy.setMethod(method);
- request.setAttribute(ServletActionContext.WEBWORK_VALUESTACK_KEY, proxy.getInvocation().getStack());
+ request.setAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY, proxy.getInvocation().getStack());
// if the ActionMapping says to go straight to a result, do it!
if (mapping.getResult() != null) {
@@ -235,7 +235,7 @@
// If there was a previous value stack then set it back onto the request
if (stack != null) {
- request.setAttribute(ServletActionContext.WEBWORK_VALUESTACK_KEY, stack);
+ request.setAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY, stack);
}
} catch (ConfigurationException e) {
LOG.error("Could not find action", e);
@@ -298,8 +298,8 @@
extraContext.put(ActionContext.APPLICATION, applicationMap);
Locale locale = null;
- if (Configuration.isSet(WebWorkConstants.WEBWORK_LOCALE)) {
- locale = LocalizedTextUtil.localeFromString(Configuration.getString(WebWorkConstants.WEBWORK_LOCALE), request.getLocale());
+ if (Configuration.isSet(StrutsConstants.STRUTS_LOCALE)) {
+ locale = LocalizedTextUtil.localeFromString(Configuration.getString(StrutsConstants.STRUTS_LOCALE), request.getLocale());
} else {
locale = request.getLocale();
}
@@ -307,9 +307,9 @@
extraContext.put(ActionContext.LOCALE, locale);
extraContext.put(ActionContext.DEV_MODE, Boolean.valueOf(devMode));
- extraContext.put(WebWorkStatics.HTTP_REQUEST, request);
- extraContext.put(WebWorkStatics.HTTP_RESPONSE, response);
- extraContext.put(WebWorkStatics.SERVLET_CONTEXT, servletContext);
+ extraContext.put(StrutsStatics.HTTP_REQUEST, request);
+ extraContext.put(StrutsStatics.HTTP_RESPONSE, response);
+ extraContext.put(StrutsStatics.SERVLET_CONTEXT, servletContext);
extraContext.put(ComponentInterceptor.COMPONENT_MANAGER, request.getAttribute(ComponentManager.COMPONENT_MANAGER_KEY));
// helpers to get access to request/session/application scope
@@ -332,19 +332,19 @@
public static int getMaxSize() {
Integer maxSize = new Integer(Integer.MAX_VALUE);
try {
- String maxSizeStr = Configuration.getString(WebWorkConstants.WEBWORK_MULTIPART_MAXSIZE);
+ String maxSizeStr = Configuration.getString(StrutsConstants.STRUTS_MULTIPART_MAXSIZE);
if (maxSizeStr != null) {
try {
maxSize = new Integer(maxSizeStr);
} catch (NumberFormatException e) {
- LOG.warn("Unable to format 'webwork.multipart.maxSize' property setting. Defaulting to Integer.MAX_VALUE");
+ LOG.warn("Unable to format 'struts.multipart.maxSize' property setting. Defaulting to Integer.MAX_VALUE");
}
} else {
- LOG.warn("Unable to format 'webwork.multipart.maxSize' property setting. Defaulting to Integer.MAX_VALUE");
+ LOG.warn("Unable to format 'struts.multipart.maxSize' property setting. Defaulting to Integer.MAX_VALUE");
}
} catch (IllegalArgumentException e1) {
- LOG.warn("Unable to format 'webwork.multipart.maxSize' property setting. Defaulting to Integer.MAX_VALUE");
+ LOG.warn("Unable to format 'struts.multipart.maxSize' property setting. Defaulting to Integer.MAX_VALUE");
}
if (LOG.isDebugEnabled()) {
@@ -360,11 +360,11 @@
* @return the path to save uploaded files to
*/
public String getSaveDir(ServletContext servletContext) {
- String saveDir = Configuration.getString(WebWorkConstants.WEBWORK_MULTIPART_SAVEDIR).trim();
+ String saveDir = Configuration.getString(StrutsConstants.STRUTS_MULTIPART_SAVEDIR).trim();
if (saveDir.equals("")) {
File tempdir = (File) servletContext.getAttribute("javax.servlet.context.tempdir");
- LOG.info("Unable to find 'webwork.multipart.saveDir' property setting. Defaulting to javax.servlet.context.tempdir");
+ LOG.info("Unable to find 'struts.multipart.saveDir' property setting. Defaulting to javax.servlet.context.tempdir");
if (tempdir != null) {
saveDir = tempdir.toString();
@@ -386,13 +386,13 @@
public void prepare(HttpServletRequest request, HttpServletResponse response) {
String encoding = null;
- if (Configuration.isSet(WebWorkConstants.WEBWORK_I18N_ENCODING)) {
- encoding = Configuration.getString(WebWorkConstants.WEBWORK_I18N_ENCODING);
+ if (Configuration.isSet(StrutsConstants.STRUTS_I18N_ENCODING)) {
+ encoding = Configuration.getString(StrutsConstants.STRUTS_I18N_ENCODING);
}
Locale locale = null;
- if (Configuration.isSet(WebWorkConstants.WEBWORK_LOCALE)) {
- locale = LocalizedTextUtil.localeFromString(Configuration.getString(WebWorkConstants.WEBWORK_LOCALE), request.getLocale());
+ if (Configuration.isSet(StrutsConstants.STRUTS_LOCALE)) {
+ locale = LocalizedTextUtil.localeFromString(Configuration.getString(StrutsConstants.STRUTS_LOCALE), request.getLocale());
}
if (encoding != null && !MultiPartRequest.isMultiPart(request)) {
@@ -424,14 +424,14 @@
*/
public HttpServletRequest wrapRequest(HttpServletRequest request, ServletContext servletContext) throws IOException {
// don't wrap more than once
- if (request instanceof WebWorkRequestWrapper) {
+ if (request instanceof StrutsRequestWrapper) {
return request;
}
if (MultiPartRequest.isMultiPart(request)) {
request = new MultiPartRequestWrapper(request, getSaveDir(servletContext), getMaxSize());
} else {
- request = new WebWorkRequestWrapper(request);
+ request = new StrutsRequestWrapper(request);
}
return request;
Modified: incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/FilterDispatcher.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/FilterDispatcher.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/FilterDispatcher.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/FilterDispatcher.java Tue Mar 28 16:52:39 2006
@@ -6,8 +6,8 @@
import com.opensymphony.util.ClassLoaderUtil;
import org.apache.struts.action2.RequestUtils;
-import org.apache.struts.action2.WebWorkConstants;
-import org.apache.struts.action2.WebWorkStatics;
+import org.apache.struts.action2.StrutsConstants;
+import org.apache.struts.action2.StrutsStatics;
import org.apache.struts.action2.config.Configuration;
import org.apache.struts.action2.dispatcher.mapper.ActionMapper;
import org.apache.struts.action2.dispatcher.mapper.ActionMapperFactory;
@@ -96,7 +96,7 @@
* @see ActionContextCleanUp
* @since 2.2
*/
-public class FilterDispatcher implements Filter, WebWorkStatics {
+public class FilterDispatcher implements Filter, StrutsStatics {
private static final Log LOG = LogFactory.getLog(FilterDispatcher.class);
protected FilterConfig filterConfig;
@@ -168,7 +168,7 @@
resourcePath = request.getPathInfo();
}
- if ("true".equals(Configuration.get(WebWorkConstants.WEBWORK_SERVE_STATIC_CONTENT))
+ if ("true".equals(Configuration.get(StrutsConstants.STRUTS_SERVE_STATIC_CONTENT))
&& resourcePath.startsWith("/webwork")) {
String name = resourcePath.substring("/webwork".length());
findStaticResource(name, response);
@@ -323,7 +323,7 @@
resourcePath = packagePrefix + name;
}
- String enc = (String) Configuration.get(WebWorkConstants.WEBWORK_I18N_ENCODING);
+ String enc = (String) Configuration.get(StrutsConstants.STRUTS_I18N_ENCODING);
resourcePath = URLDecoder.decode(resourcePath, enc);
return ClassLoaderUtil.getResourceAsStream(resourcePath, getClass());
Modified: incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/PlainTextResult.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/PlainTextResult.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/PlainTextResult.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/PlainTextResult.java Tue Mar 28 16:52:39 2006
@@ -58,7 +58,7 @@
* @author tm_jee
* @version $Date: 2006/03/12 05:41:05 $ $Id: PlainTextResult.java,v 1.5 2006/03/12 05:41:05 tmjee Exp $
*/
-public class PlainTextResult extends WebWorkResultSupport {
+public class PlainTextResult extends StrutsResultSupport {
private static final Log _log = LogFactory.getLog(PlainTextResult.class);
Modified: incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/ServletDispatcher.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/ServletDispatcher.java?rev=389643&r1=389642&r2=389643&view=diff
==============================================================================
--- incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/ServletDispatcher.java (original)
+++ incubator/webwork2/src/java/org/apache/struts/action2/dispatcher/ServletDispatcher.java Tue Mar 28 16:52:39 2006
@@ -4,7 +4,7 @@
*/
package org.apache.struts.action2.dispatcher;
-import org.apache.struts.action2.WebWorkStatics;
+import org.apache.struts.action2.StrutsStatics;
import org.apache.struts.action2.dispatcher.mapper.ActionMapperFactory;
import org.apache.struts.action2.dispatcher.mapper.ActionMapping;
import org.apache.commons.logging.Log;
@@ -37,12 +37,12 @@
* Instead of traditional servlet init params this servlet will initialize itself using WebWork2 properties.
* The following properties are used upon initialization: <ul>
* <p/>
- * <li><tt>webwork.configuration.xml.reload</tt>: if and only if set to <tt>true</tt> then the xml configuration
+ * <li><tt>struts.configuration.xml.reload</tt>: if and only if set to <tt>true</tt> then the xml configuration
* files (action definitions, interceptor definitions, etc) will be reloaded for each request. This is
* useful for development but should be disabled for production deployment.</li>
- * <li><tt>webwork.multipart.saveDir</tt>: The path used for temporarily uploaded files. Defaults to the
+ * <li><tt>struts.multipart.saveDir</tt>: The path used for temporarily uploaded files. Defaults to the
* temp path specified by the app server.</li>
- * <li><tt>webwork.multipart.maxSize</tt>: sets the maximum allowable multipart request size
+ * <li><tt>struts.multipart.maxSize</tt>: sets the maximum allowable multipart request size
* in bytes. If the size was not specified then {@link java.lang.Integer#MAX_VALUE} will be used
* (essentially unlimited so be careful).</li></ul>
* <p/>
@@ -55,7 +55,7 @@
* @see ServletDispatcherResult
* @deprecated use {@link FilterDispatcher} instead
*/
-public class ServletDispatcher extends HttpServlet implements WebWorkStatics {
+public class ServletDispatcher extends HttpServlet implements StrutsStatics {
/**
* Logger for this class.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org