struts-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mr...@apache.org
Subject svn commit: r388369 [1/5] - in /incubator/webwork2: ./ src/java/ src/java/META-INF/ src/java/template/archive/simple/ src/test/ src/test/com/opensymphony/webwork/ src/test/com/opensymphony/webwork/components/ src/test/com/opensymphony/webwork/config/ s...
Date Fri, 24 Mar 2006 04:55:10 GMT
Author: mrdon
Date: Thu Mar 23 20:54:56 2006
New Revision: 388369

URL: http://svn.apache.org/viewcvs?rev=388369&view=rev
Log:
Finishing package changes

Modified:
    incubator/webwork2/build.xml
    incubator/webwork2/src/java/META-INF/taglib.tld
    incubator/webwork2/src/java/config-browser.xml
    incubator/webwork2/src/java/template/archive/simple/tabbedpane.vm
    incubator/webwork2/src/java/webwork-default.xml
    incubator/webwork2/src/java/webwork.vm
    incubator/webwork2/src/test/com/opensymphony/webwork/ExecutionCountTestAction.java
    incubator/webwork2/src/test/com/opensymphony/webwork/RequestUtilsTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/ServletActionContextTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/TestAction.java
    incubator/webwork2/src/test/com/opensymphony/webwork/TestActionTagResult.java
    incubator/webwork2/src/test/com/opensymphony/webwork/TestConfigurationProvider.java
    incubator/webwork2/src/test/com/opensymphony/webwork/TestResult.java
    incubator/webwork2/src/test/com/opensymphony/webwork/components/AbstractRichtexteditorConnectorTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/components/ComponentTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/components/FormTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/components/MockRichtexteditorConnector.java
    incubator/webwork2/src/test/com/opensymphony/webwork/components/PropertyTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/components/UIComponentTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/config/ConfigurationTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/config/TestConfiguration.java
    incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/AbstractServletDispatcherTestCase.java
    incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/ChartResultTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/DefautActionMapperTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/DispatcherUtilsTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/FilterDispatcherTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/HttpHeaderResultTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/NullActionMapper.java
    incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/PlainTextResultTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/ServletDispatchedTestAssertInterceptor.java
    incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/ServletDispatcherResultTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/ServletDispatcherTest-xwork.xml
    incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/ServletDispatcherTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/ServletRedirectResultTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/SessionMapTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/StreamResultTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/VelocityResultTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/mapper/DefaultActionMapperTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/mapper/RestfulActionMapperTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/interceptor/CreateSessionInterceptorTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/interceptor/ExecuteAndWaitDelayAction.java
    incubator/webwork2/src/test/com/opensymphony/webwork/interceptor/ExecuteAndWaitInterceptorTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/interceptor/FileUploadInterceptorTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/interceptor/ServletConfigInterceptorTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/interceptor/TokenInterceptorTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/interceptor/TokenSessionStoreInterceptorTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/interceptor/WebWorkConversionErrorInterceptorTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/portlet/PortletApplicationMapTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/portlet/PortletRequestMapTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/portlet/PortletSessionMapTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/portlet/context/PortletActionContextTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/portlet/context/PreparatorServletTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/portlet/context/ServletContextHolderListenerTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/portlet/dispatcher/Jsr168DispatcherTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/portlet/result/PortletResultTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/portlet/util/PortletUrlHelperTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/portlet/util/WebWorkUtilTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/sitegraph/SiteGraphTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/sitegraph/xwork.xml
    incubator/webwork2/src/test/com/opensymphony/webwork/spring/WebWorkSpringObjectFactoryTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/util/CounterTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/util/InvocationSessionStoreTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/util/PrefixTrieTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/util/TokenHelperTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/util/WebWorkTypeConverterTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/TemplateEngineManagerTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/freemarker/FreemarkerManagerTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/freemarker/FreemarkerTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/freemarker/TestAction.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/freemarker/TestBean.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/AbstractTagTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/AbstractUITagTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ActionTagTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/AnchorTagTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/AppendIteratorTagTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/BeanTagTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ElseIfTagTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ElseTagTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/IfTagTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/IncludeTagTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/IteratorGeneratorTagTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/IteratorTagTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/MergeIteratorTagTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/PortletUrlTagTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/PropertyTagTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/PushTagTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/SetTagTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/SortIteratorTagTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/SubsetIteratorTagTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/TextTagTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/URLTagTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockBodyContent.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockHttpServletRequest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockHttpServletResponse.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockHttpSession.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockJspWriter.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockPageContext.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockServletContext.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/AbstractRichtexteditorTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/ActionErrorTagTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/ActionMessageTagTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/AnchorTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/CheckboxListTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/CheckboxTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/ComboBoxTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/Component-param.txt
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/ComponentTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/DatePickerTagTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/DateTagTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/DebugTagTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/DivTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/DoubleSelectTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/FieldErrorTagTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/FileTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/FormTagTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/HeadTagTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/HiddenTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/JspTemplateTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/LabelTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/MockTag.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/OptionTransferSelectTagTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/PasswordTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/RadioTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/ResetTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/RichTextEditorTagTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/RichtexteditorCreateFolderResultTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/RichtexteditorFileUploadResultTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/RichtexteditorGetFoldersAndFilesResultTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/RichtexteditorGetFoldersResultTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/SelectTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/SubmitAjaxTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/SubmitTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/TestAction1.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/TextareaTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/TextfieldTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/TokenTagTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/TooltipTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/UpDownSelectTagTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/User.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/jsp/ui/WebWorkBodyContent.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/util/ContextUtilTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/util/ResourceUtilTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/util/TextUtilTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/util/UrlHelperTest.java
    incubator/webwork2/src/test/com/opensymphony/webwork/views/xslt/XSLTResultTest.java
    incubator/webwork2/src/test/webwork.properties
    incubator/webwork2/webapps/blank/src/java/com/opensymphony/webwork/example/HomeAction.java
    incubator/webwork2/webapps/blank/src/test/com/opensymphony/webwork/example/HomeActionTest.java
    incubator/webwork2/webapps/blank/src/webapp/WEB-INF/classes/xwork.xml
    incubator/webwork2/webapps/blank/src/webapp/WEB-INF/web.xml
    incubator/webwork2/webapps/portlet/src/etc/exo/web.xml
    incubator/webwork2/webapps/portlet/src/etc/gridsphere/web.xml
    incubator/webwork2/webapps/portlet/src/etc/liferay3.6.1/web.xml
    incubator/webwork2/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/ChartExampleAction.java
    incubator/webwork2/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/ExampleAction.java
    incubator/webwork2/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/FormExample.java
    incubator/webwork2/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/FormExampleWithValidation.java
    incubator/webwork2/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/FormResultAction.java
    incubator/webwork2/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/FormTestAction.java
    incubator/webwork2/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/SavePrefsAction.java
    incubator/webwork2/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/spring/SpringAction.java
    incubator/webwork2/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/spring/ThingManager.java
    incubator/webwork2/webapps/portlet/src/java/xwork.xml
    incubator/webwork2/webapps/portlet/src/webapp/WEB-INF/applicationContext.xml
    incubator/webwork2/webapps/portlet/src/webapp/WEB-INF/dwr.xml
    incubator/webwork2/webapps/portlet/src/webapp/WEB-INF/portlet.xml
    incubator/webwork2/webapps/portlet/src/webapp/WEB-INF/web.xml
    incubator/webwork2/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/actions/AbstractModifyCartAction.java
    incubator/webwork2/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/actions/ActiveCategory.java
    incubator/webwork2/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/actions/SetActiveCategory.java
    incubator/webwork2/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/actions/ShowCart.java
    incubator/webwork2/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/actions/ShowCatalog.java
    incubator/webwork2/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/actions/UpdateQuantityInCart.java
    incubator/webwork2/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/cart/DefaultCart.java
    incubator/webwork2/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/cart/ShoppingCart.java
    incubator/webwork2/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/catalog/Catalog.java
    incubator/webwork2/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/catalog/Category.java
    incubator/webwork2/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/catalog/Identifiable.java
    incubator/webwork2/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/catalog/Product.java
    incubator/webwork2/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/catalog/TestCatalog.java
    incubator/webwork2/webapps/shopping-cart/src/webapp/WEB-INF/applicationContext.xml
    incubator/webwork2/webapps/shopping-cart/src/webapp/WEB-INF/classes/xwork.xml
    incubator/webwork2/webapps/shopping-cart/src/webapp/WEB-INF/dwr.xml
    incubator/webwork2/webapps/shopping-cart/src/webapp/WEB-INF/web.xml
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/DateAction.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/Guess.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/LotsOfOptiontransferselectAction.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/LotsOfRichtexteditorAction.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/UITagExample.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/AbstractCRUDAction.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/EmployeeAction.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/SkillAction.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/actionchaining/ActionChain1.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/actionchaining/ActionChain2.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/actionchaining/ActionChain3.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/ajax/AjaxTestAction.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/application/MemoryStorage.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/application/Storage.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/application/TestDataProvider.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/AbstractDao.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/Dao.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/EmployeeDao.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/SkillDao.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/CreateException.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/DeleteException.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/DuplicateKeyException.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/StorageException.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/UpdateException.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/filedownload/FileDownloadAction.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/fileupload/FileUploadAction.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/jasper/JasperAction.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/model/Employee.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/model/IdEntity.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/model/Skill.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/modelDriven/Gangster.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/modelDriven/ModelDrivenAction.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/CreatePerson.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/EditPerson-conversion.properties
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/EditPerson.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/ListPeople.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/Person.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/PersonManager.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/actiontag/ActionTagDemo.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/token/TokenAction.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/AbstractValidationActionSupport.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/FieldValidatorsExampleAction.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/NonFieldValidatorsExampleAction.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/QuizAction.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/User.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/VisitorValidatorsExampleAction.java
    incubator/webwork2/webapps/showcase/src/java/com/opensymphony/webwork/showcase/wait/LongProcessAction.java
    incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/applicationContext.xml
    incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/log4j.properties
    incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/webwork.properties
    incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-actionchaining.xml
    incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-ajax.xml
    incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-continuations.xml
    incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-filedownload.xml
    incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-fileupload.xml
    incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-model-driven.xml
    incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-person.xml
    incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-tags-non-ui.xml
    incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-tags-ui.xml
    incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-token.xml
    incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-validation.xml
    incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork-wait.xml
    incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/classes/xwork.xml
    incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/dwr.xml
    incubator/webwork2/webapps/showcase/src/webapp/WEB-INF/web.xml
    incubator/webwork2/webapps/showcase/src/webapp/token/index.jsp
    incubator/webwork2/webapps/starter/src/webapp/WEB-INF/web.xml

Modified: incubator/webwork2/build.xml
URL: http://svn.apache.org/viewcvs/incubator/webwork2/build.xml?rev=388369&r1=388368&r2=388369&view=diff
==============================================================================
--- incubator/webwork2/build.xml (original)
+++ incubator/webwork2/build.xml Thu Mar 23 20:54:56 2006
@@ -168,7 +168,7 @@
 
         <jar basedir="${build.java}" jarfile="${build}/${name}-${version}.jar">
             <manifest>
-                <attribute name="Main-Class" value="com.opensymphony.webwork.Main"/>
+                <attribute name="Main-Class" value="org.apache.struts.action2.Main"/>
                 <attribute name="Implementation-Title" value="${fullname}"/>
                 <attribute name="Implementation-Version" value="${version}"/>
             </manifest>
@@ -185,7 +185,7 @@
                 <exclude name="com/opensymphony/webwork/static/**/*" />
             </fileset>
             <manifest>
-                <attribute name="Main-Class" value="com.opensymphony.webwork.Main"/>
+                <attribute name="Main-Class" value="org.apache.struts.action2.Main"/>
                 <attribute name="Implementation-Title" value="${fullname}"/>
                 <attribute name="Implementation-Version" value="${version}"/>
             </manifest>

Modified: incubator/webwork2/src/java/META-INF/taglib.tld
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/META-INF/taglib.tld?rev=388369&r1=388368&r2=388369&view=diff
==============================================================================
--- incubator/webwork2/src/java/META-INF/taglib.tld (original)
+++ incubator/webwork2/src/java/META-INF/taglib.tld Thu Mar 23 20:54:56 2006
@@ -15,7 +15,7 @@
    <tag>
 
       <name>head</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ui.HeadTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ui.HeadTag</tag-class>
       <body-content>empty</body-content>
       <description><![CDATA[Render a chunk of HEAD for your HTML file]]></description>
 
@@ -288,7 +288,7 @@
    <tag>
 
       <name>push</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.PushTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.PushTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Push value on stack for simplified usage.]]></description>
 
@@ -313,7 +313,7 @@
    <tag>
 
       <name>table</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ui.table.WebTableTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ui.table.WebTableTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Instantiate a JavaBean and place it in the context.]]></description>
 
@@ -346,7 +346,7 @@
          <required>false</required>
          <rtexprvalue>true</rtexprvalue>
 
-           <description><![CDATA[Whether the table should be sortable. Requires that model implements com.opensymphony.webwork.components.table.SortableTableModel if set to true.]]></description>
+           <description><![CDATA[Whether the table should be sortable. Requires that model implements org.apache.struts.action2.components.table.SortableTableModel if set to true.]]></description>
 
       </attribute>
       <attribute>
@@ -602,7 +602,7 @@
    <tag>
 
       <name>component</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ui.ComponentTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ui.ComponentTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Render a custom ui widget]]></description>
 
@@ -859,7 +859,7 @@
    <tag>
 
       <name>token</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ui.TokenTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ui.TokenTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Stop double-submission of forms]]></description>
 
@@ -1116,7 +1116,7 @@
    <tag>
 
       <name>set</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.SetTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.SetTag</tag-class>
       <body-content>empty</body-content>
       <description><![CDATA[Assigns a value to a variable in a specified scope]]></description>
 
@@ -1157,7 +1157,7 @@
    <tag>
 
       <name>i18n</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.I18nTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.I18nTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Get a resource bundle and place it on the value stack]]></description>
 
@@ -1182,7 +1182,7 @@
    <tag>
 
       <name>merge</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.iterator.MergeIteratorTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.iterator.MergeIteratorTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Merge the values of a list of iterators into one iterator]]></description>
 
@@ -1199,7 +1199,7 @@
    <tag>
 
       <name>password</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ui.PasswordTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ui.PasswordTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Render an HTML input tag of type password]]></description>
 
@@ -1504,7 +1504,7 @@
    <tag>
 
       <name>submit</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ui.SubmitTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ui.SubmitTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Render a submit button]]></description>
 
@@ -1841,7 +1841,7 @@
    <tag>
 
       <name>form</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ui.FormTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ui.FormTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Renders an input form]]></description>
 
@@ -2178,7 +2178,7 @@
    <tag>
 
       <name>include</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.IncludeTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.IncludeTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Include a servlet's output (result of servlet or a JSP page)]]></description>
 
@@ -2203,7 +2203,7 @@
    <tag>
 
       <name>div</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ui.DivTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ui.DivTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Render HTML div providing content from remote call via AJAX]]></description>
 
@@ -2532,7 +2532,7 @@
    <tag>
 
       <name>label</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ui.LabelTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ui.LabelTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Render a label that displays read-only information]]></description>
 
@@ -2797,7 +2797,7 @@
    <tag>
 
       <name>action</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ActionTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ActionTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Execute an action from within a view]]></description>
 
@@ -2846,7 +2846,7 @@
    <tag>
 
       <name>bean</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.BeanTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.BeanTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Instantiate a JavaBean and place it in the context.]]></description>
 
@@ -2871,7 +2871,7 @@
    <tag>
 
       <name>sort</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.iterator.SortIteratorTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.iterator.SortIteratorTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Sort a List using a Comparator both passed in as the tag attribute.]]></description>
 
@@ -2904,7 +2904,7 @@
    <tag>
 
       <name>hidden</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ui.HiddenTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ui.HiddenTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Render a hidden input field]]></description>
 
@@ -3161,7 +3161,7 @@
    <tag>
 
       <name>iterator</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.IteratorTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.IteratorTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Iterate over a iterable value]]></description>
 
@@ -3194,7 +3194,7 @@
    <tag>
 
       <name>actionerror</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ui.ActionErrorTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ui.ActionErrorTag</tag-class>
       <body-content>empty</body-content>
       <description><![CDATA[Render action errors if they exists]]></description>
 
@@ -3451,7 +3451,7 @@
    <tag>
 
       <name>if</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.IfTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.IfTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[If tag]]></description>
 
@@ -3476,7 +3476,7 @@
    <tag>
 
       <name>select</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ui.SelectTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ui.SelectTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Render a select element]]></description>
 
@@ -3797,7 +3797,7 @@
    <tag>
 
       <name>reset</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ui.ResetTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ui.ResetTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Render a reset button]]></description>
 
@@ -4086,7 +4086,7 @@
    <tag>
 
       <name>append</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.iterator.AppendIteratorTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.iterator.AppendIteratorTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Append the values of a list of iterators to one iterator]]></description>
 
@@ -4103,7 +4103,7 @@
    <tag>
 
       <name>updownselect</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ui.UpDownSelectTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ui.UpDownSelectTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Render a up down select element]]></description>
 
@@ -4472,7 +4472,7 @@
    <tag>
 
       <name>else</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ElseTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ElseTag</tag-class>
       <description><![CDATA[Else tag]]></description>
 
       <attribute>
@@ -4488,7 +4488,7 @@
    <tag>
 
       <name>debug</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ui.DebugTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ui.DebugTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Render debug tag]]></description>
 
@@ -4745,7 +4745,7 @@
    <tag>
 
       <name>param</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ParamTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ParamTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Parametrize other tags]]></description>
 
@@ -4778,7 +4778,7 @@
    <tag>
 
       <name>optiontransferselect</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ui.OptionTransferSelectTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ui.OptionTransferSelectTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Renders an input form]]></description>
 
@@ -5451,7 +5451,7 @@
    <tag>
 
       <name>textfield</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ui.TextFieldTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ui.TextFieldTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Render an HTML input field of type text]]></description>
 
@@ -5740,7 +5740,7 @@
    <tag>
 
       <name>doubleselect</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ui.DoubleSelectTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ui.DoubleSelectTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Renders two HTML select elements with second one changing displayed values depending on selected entry of first one.]]></description>
 
@@ -6301,7 +6301,7 @@
    <tag>
 
       <name>textarea</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ui.TextareaTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ui.TextareaTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Render HTML textarea tag.]]></description>
 
@@ -6590,7 +6590,7 @@
    <tag>
 
       <name>generator</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.iterator.IteratorGeneratorTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.iterator.IteratorGeneratorTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Generate an iterator for a iterable source.]]></description>
 
@@ -6639,7 +6639,7 @@
    <tag>
 
       <name>checkbox</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ui.CheckboxTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ui.CheckboxTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Render a checkbox input field]]></description>
 
@@ -6904,7 +6904,7 @@
    <tag>
 
       <name>date</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.DateTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.DateTag</tag-class>
       <body-content>empty</body-content>
       <description><![CDATA[Render a formatted date.]]></description>
 
@@ -6945,7 +6945,7 @@
    <tag>
 
       <name>a</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ui.AnchorTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ui.AnchorTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Render a HTML href element that when clicked calls a URL via remote XMLHttpRequest]]></description>
 
@@ -7258,7 +7258,7 @@
    <tag>
 
       <name>file</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ui.FileTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ui.FileTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Render a file input field]]></description>
 
@@ -7531,7 +7531,7 @@
    <tag>
 
       <name>url</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.URLTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.URLTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[This tag is used to create a URL]]></description>
 
@@ -7644,7 +7644,7 @@
    <tag>
 
       <name>radio</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ui.RadioTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ui.RadioTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Renders a radio button input field]]></description>
 
@@ -7925,7 +7925,7 @@
    <tag>
 
       <name>combobox</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ui.ComboBoxTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ui.ComboBoxTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Widget that fills a text box from a select]]></description>
 
@@ -8222,7 +8222,7 @@
    <tag>
 
       <name>checkboxlist</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ui.CheckboxListTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ui.CheckboxListTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Render a list of checkboxes]]></description>
 
@@ -8503,7 +8503,7 @@
    <tag>
 
       <name>panel</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ui.PanelTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ui.PanelTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Render a panel for tabbedPanel]]></description>
 
@@ -8856,7 +8856,7 @@
    <tag>
 
       <name>actionmessage</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ui.ActionMessageTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ui.ActionMessageTag</tag-class>
       <body-content>empty</body-content>
       <description><![CDATA[Render action messages if they exists]]></description>
 
@@ -9113,7 +9113,7 @@
    <tag>
 
       <name>tree</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ui.TreeTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ui.TreeTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Render a tree widget.]]></description>
 
@@ -9450,7 +9450,7 @@
    <tag>
 
       <name>property</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.PropertyTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.PropertyTag</tag-class>
       <body-content>empty</body-content>
       <description><![CDATA[Print out expression which evaluates against the stack]]></description>
 
@@ -9491,7 +9491,7 @@
    <tag>
 
       <name>tabbedpane</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ui.TabbedPaneTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ui.TabbedPaneTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[This tag is deprecated. Use tabbed panel instead.]]></description>
 
@@ -9516,7 +9516,7 @@
    <tag>
 
       <name>tabbedPanel</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ui.TabbedPanelTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ui.TabbedPanelTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Render a tabbedPanel widget.]]></description>
 
@@ -9781,7 +9781,7 @@
    <tag>
 
       <name>treenode</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ui.TreeNodeTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ui.TreeNodeTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Render a tree node within a tree widget.]]></description>
 
@@ -10046,7 +10046,7 @@
    <tag>
 
       <name>fielderror</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ui.FieldErrorTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ui.FieldErrorTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Render field error (all or partial depending on param tag nested)if they exists]]></description>
 
@@ -10303,7 +10303,7 @@
    <tag>
 
       <name>subset</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.iterator.SubsetIteratorTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.iterator.SubsetIteratorTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Takes an iterator and outputs a subset of it]]></description>
 
@@ -10352,7 +10352,7 @@
    <tag>
 
       <name>elseif</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ElseIfTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ElseIfTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Elseif tag]]></description>
 
@@ -10377,7 +10377,7 @@
    <tag>
 
       <name>text</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.TextTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.TextTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Render a I18n text message.]]></description>
 
@@ -10402,7 +10402,7 @@
    <tag>
 
       <name>datepicker</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ui.DatePickerTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ui.DatePickerTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Render datepicker]]></description>
 
@@ -10723,7 +10723,7 @@
    <tag>
 
       <name>richtexteditor</name>
-      <tag-class>com.opensymphony.webwork.views.jsp.ui.RichTextEditorTag</tag-class>
+      <tag-class>org.apache.struts.action2.views.jsp.ui.RichTextEditorTag</tag-class>
       <body-content>JSP</body-content>
       <description><![CDATA[Render a rich text editor element]]></description>
 

Modified: incubator/webwork2/src/java/config-browser.xml
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/config-browser.xml?rev=388369&r1=388368&r2=388369&view=diff
==============================================================================
--- incubator/webwork2/src/java/config-browser.xml (original)
+++ incubator/webwork2/src/java/config-browser.xml Thu Mar 23 20:54:56 2006
@@ -21,21 +21,21 @@
             <result type="redirect-action">actionNames</result>
         </action>
 
-        <action name="actionNames" class="com.opensymphony.webwork.config_browser.ActionNamesAction">
+        <action name="actionNames" class="org.apache.struts.action2.config_browser.ActionNamesAction">
             <result type="freemarker" name="success">/config-browser/actionNames.ftl</result>
         </action>
 
-        <action name="showConfig" class="com.opensymphony.webwork.config_browser.ShowConfigAction">
+        <action name="showConfig" class="org.apache.struts.action2.config_browser.ShowConfigAction">
             <result type="freemarker" name="success">/config-browser/showConfig.ftl</result>
         </action>
 
-        <action name="showValidators" class="com.opensymphony.webwork.config_browser.ListValidatorsAction">
+        <action name="showValidators" class="org.apache.struts.action2.config_browser.ListValidatorsAction">
             <result name="error" type="freemarker">/config-browser/simple-error.ftl</result>
             <result name="input" type="freemarker">/config-browser/simple-error.ftl</result>
             <result type="freemarker" name="success">/config-browser/showValidators.ftl</result>
         </action>
 
-        <action name="validatorDetails" class="com.opensymphony.webwork.config_browser.ShowValidatorAction">
+        <action name="validatorDetails" class="org.apache.struts.action2.config_browser.ShowValidatorAction">
             <result type="freemarker" name="success">/config-browser/validatorDetails.ftl</result>
         </action>
     </package>

Modified: incubator/webwork2/src/java/template/archive/simple/tabbedpane.vm
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/template/archive/simple/tabbedpane.vm?rev=388369&r1=388368&r2=388369&view=diff
==============================================================================
--- incubator/webwork2/src/java/template/archive/simple/tabbedpane.vm (original)
+++ incubator/webwork2/src/java/template/archive/simple/tabbedpane.vm Thu Mar 23 20:54:56 2006
@@ -16,7 +16,7 @@
   --
   *#
 
-#bean ("com.opensymphony.webwork.util.Counter" $tabIndex)
+#bean ("org.apache.struts.action2.util.Counter" $tabIndex)
 #set ($tabIndex.first = 0)
 #set ($tabIndex.last = $tag.content.size())
 

Modified: incubator/webwork2/src/java/webwork-default.xml
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/webwork-default.xml?rev=388369&r1=388368&r2=388369&view=diff
==============================================================================
--- incubator/webwork2/src/java/webwork-default.xml (original)
+++ incubator/webwork2/src/java/webwork-default.xml Thu Mar 23 20:54:56 2006
@@ -3,23 +3,23 @@
     <package name="webwork-default">
         <result-types>
             <result-type name="chain" class="com.opensymphony.xwork.ActionChainResult"/>
-            <result-type name="dispatcher" class="com.opensymphony.webwork.dispatcher.ServletDispatcherResult" default="true"/>
-            <result-type name="freemarker" class="com.opensymphony.webwork.views.freemarker.FreemarkerResult"/>
-            <result-type name="httpheader" class="com.opensymphony.webwork.dispatcher.HttpHeaderResult"/>
-            <result-type name="jasper" class="com.opensymphony.webwork.views.jasperreports.JasperReportsResult"/>
-            <result-type name="redirect" class="com.opensymphony.webwork.dispatcher.ServletRedirectResult"/>
-            <result-type name="redirect-action" class="com.opensymphony.webwork.dispatcher.ServletActionRedirectResult"/>
-            <result-type name="stream" class="com.opensymphony.webwork.dispatcher.StreamResult"/>
-            <result-type name="tiles" class="com.opensymphony.webwork.views.tiles.TilesResult"/>
-            <result-type name="velocity" class="com.opensymphony.webwork.dispatcher.VelocityResult"/>
-            <result-type name="xslt" class="com.opensymphony.webwork.views.xslt.XSLTResult"/>
-            <result-type name="plaintext" class="com.opensymphony.webwork.dispatcher.PlainTextResult" />
+            <result-type name="dispatcher" class="org.apache.struts.action2.dispatcher.ServletDispatcherResult" default="true"/>
+            <result-type name="freemarker" class="org.apache.struts.action2.views.freemarker.FreemarkerResult"/>
+            <result-type name="httpheader" class="org.apache.struts.action2.dispatcher.HttpHeaderResult"/>
+            <result-type name="jasper" class="org.apache.struts.action2.views.jasperreports.JasperReportsResult"/>
+            <result-type name="redirect" class="org.apache.struts.action2.dispatcher.ServletRedirectResult"/>
+            <result-type name="redirect-action" class="org.apache.struts.action2.dispatcher.ServletActionRedirectResult"/>
+            <result-type name="stream" class="org.apache.struts.action2.dispatcher.StreamResult"/>
+            <result-type name="tiles" class="org.apache.struts.action2.views.tiles.TilesResult"/>
+            <result-type name="velocity" class="org.apache.struts.action2.dispatcher.VelocityResult"/>
+            <result-type name="xslt" class="org.apache.struts.action2.views.xslt.XSLTResult"/>
+            <result-type name="plaintext" class="org.apache.struts.action2.dispatcher.PlainTextResult" />
             
             <!-- Results necessary when using 'browse server' and 'upload' feature of Richtexteditor -->
-            <result-type name="richtexteditorGetFolders" class="com.opensymphony.webwork.views.jsp.ui.RichtexteditorGetFoldersResult" />
-            <result-type name="richtexteditorGetFoldersAndFiles" class="com.opensymphony.webwork.views.jsp.ui.RichtexteditorGetFoldersAndFilesResult" />
-            <result-type name="richtexteditorCreateFolder" class="com.opensymphony.webwork.views.jsp.ui.RichtexteditorCreateFolderResult" />
-            <result-type name="richtexteditorFileUpload" class="com.opensymphony.webwork.views.jsp.ui.RichtexteditorFileUploadResult" />
+            <result-type name="richtexteditorGetFolders" class="org.apache.struts.action2.views.jsp.ui.RichtexteditorGetFoldersResult" />
+            <result-type name="richtexteditorGetFoldersAndFiles" class="org.apache.struts.action2.views.jsp.ui.RichtexteditorGetFoldersAndFilesResult" />
+            <result-type name="richtexteditorCreateFolder" class="org.apache.struts.action2.views.jsp.ui.RichtexteditorCreateFolderResult" />
+            <result-type name="richtexteditorFileUpload" class="org.apache.struts.action2.views.jsp.ui.RichtexteditorFileUploadResult" />
             
         </result-types>
 
@@ -28,24 +28,24 @@
             <interceptor name="autowiring" class="com.opensymphony.xwork.spring.interceptor.ActionAutowiringInterceptor"/>
             <interceptor name="chain" class="com.opensymphony.xwork.interceptor.ChainingInterceptor"/>
             <interceptor name="component" class="com.opensymphony.xwork.interceptor.component.ComponentInterceptor"/>
-            <interceptor name="conversionError" class="com.opensymphony.webwork.interceptor.WebWorkConversionErrorInterceptor"/>
-            <interceptor name="createSession" class="com.opensymphony.webwork.interceptor.CreateSessionInterceptor" />
+            <interceptor name="conversionError" class="org.apache.struts.action2.interceptor.WebWorkConversionErrorInterceptor"/>
+            <interceptor name="createSession" class="org.apache.struts.action2.interceptor.CreateSessionInterceptor" />
             <interceptor name="external-ref" class="com.opensymphony.xwork.interceptor.ExternalReferencesInterceptor"/>
-            <interceptor name="execAndWait" class="com.opensymphony.webwork.interceptor.ExecuteAndWaitInterceptor"/>
+            <interceptor name="execAndWait" class="org.apache.struts.action2.interceptor.ExecuteAndWaitInterceptor"/>
             <interceptor name="exception" class="com.opensymphony.xwork.interceptor.ExceptionMappingInterceptor"/>
-            <interceptor name="fileUpload" class="com.opensymphony.webwork.interceptor.FileUploadInterceptor"/>
+            <interceptor name="fileUpload" class="org.apache.struts.action2.interceptor.FileUploadInterceptor"/>
             <interceptor name="i18n" class="com.opensymphony.xwork.interceptor.I18nInterceptor"/>
             <interceptor name="logger" class="com.opensymphony.xwork.interceptor.LoggingInterceptor"/>
             <interceptor name="model-driven" class="com.opensymphony.xwork.interceptor.ModelDrivenInterceptor"/>
             <interceptor name="params" class="com.opensymphony.xwork.interceptor.ParametersInterceptor"/>
             <interceptor name="prepare" class="com.opensymphony.xwork.interceptor.PrepareInterceptor"/>
             <interceptor name="static-params" class="com.opensymphony.xwork.interceptor.StaticParametersInterceptor"/>
-            <interceptor name="scope" class="com.opensymphony.webwork.interceptor.ScopeInterceptor"/>
-            <interceptor name="servlet-config" class="com.opensymphony.webwork.interceptor.ServletConfigInterceptor"/>
-            <interceptor name="sessionAutowiring" class="com.opensymphony.webwork.spring.interceptor.SessionContextAutowiringInterceptor"/>
+            <interceptor name="scope" class="org.apache.struts.action2.interceptor.ScopeInterceptor"/>
+            <interceptor name="servlet-config" class="org.apache.struts.action2.interceptor.ServletConfigInterceptor"/>
+            <interceptor name="sessionAutowiring" class="org.apache.struts.action2.spring.interceptor.SessionContextAutowiringInterceptor"/>
             <interceptor name="timer" class="com.opensymphony.xwork.interceptor.TimerInterceptor"/>
-            <interceptor name="token" class="com.opensymphony.webwork.interceptor.TokenInterceptor"/>
-            <interceptor name="token-session" class="com.opensymphony.webwork.interceptor.TokenSessionStoreInterceptor"/>
+            <interceptor name="token" class="org.apache.struts.action2.interceptor.TokenInterceptor"/>
+            <interceptor name="token-session" class="org.apache.struts.action2.interceptor.TokenSessionStoreInterceptor"/>
             <interceptor name="validation" class="com.opensymphony.xwork.validator.ValidationInterceptor"/>
             <interceptor name="workflow" class="com.opensymphony.xwork.interceptor.DefaultWorkflowInterceptor"/>
 
@@ -182,18 +182,18 @@
     <package name="webwork-portlet-default" extends="webwork-default">
 
 	   <result-types>
-			<result-type name="dispatcher" class="com.opensymphony.webwork.portlet.result.PortletResult" default="true"/>
-			<result-type name="freemarker" class="com.opensymphony.webwork.views.freemarker.PortletFreemarkerResult"/>
-			<result-type name="velocity" class="com.opensymphony.webwork.portlet.result.PortletVelocityResult"/>
+			<result-type name="dispatcher" class="org.apache.struts.action2.portlet.result.PortletResult" default="true"/>
+			<result-type name="freemarker" class="org.apache.struts.action2.views.freemarker.PortletFreemarkerResult"/>
+			<result-type name="velocity" class="org.apache.struts.action2.portlet.result.PortletVelocityResult"/>
 	   </result-types>
 
-	   <action name="renderDirect" class="com.opensymphony.webwork.portlet.dispatcher.DirectRenderFromEventAction">
+	   <action name="renderDirect" class="org.apache.struts.action2.portlet.dispatcher.DirectRenderFromEventAction">
 	   		<result name="success">${location}</result>
 	   </action>
-	   <action name="freemarkerDirect" class="com.opensymphony.webwork.portlet.dispatcher.DirectRenderFromEventAction">
+	   <action name="freemarkerDirect" class="org.apache.struts.action2.portlet.dispatcher.DirectRenderFromEventAction">
 	   		<result type="freemarker" name="success">${location}</result>
 	   </action>
-	   <action name="velocityDirect" class="com.opensymphony.webwork.portlet.dispatcher.DirectRenderFromEventAction">
+	   <action name="velocityDirect" class="org.apache.struts.action2.portlet.dispatcher.DirectRenderFromEventAction">
 	   		<result type="velocity" name="success">${location}</result>
 	   </action>
 	</package>

Modified: incubator/webwork2/src/java/webwork.vm
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/java/webwork.vm?rev=388369&r1=388368&r2=388369&view=diff
==============================================================================
--- incubator/webwork2/src/java/webwork.vm (original)
+++ incubator/webwork2/src/java/webwork.vm Thu Mar 23 20:54:56 2006
@@ -7,7 +7,7 @@
 #end
 
 #macro(url $name)
-   #set ($name = $webwork.bean("com.opensymphony.webwork.util.URLBean"))
+   #set ($name = $webwork.bean("org.apache.struts.action2.util.URLBean"))
    $name.setRequest($req)
    $name.setResponse($res)
 #end

Modified: incubator/webwork2/src/test/com/opensymphony/webwork/ExecutionCountTestAction.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/com/opensymphony/webwork/ExecutionCountTestAction.java?rev=388369&r1=388368&r2=388369&view=diff
==============================================================================
--- incubator/webwork2/src/test/com/opensymphony/webwork/ExecutionCountTestAction.java (original)
+++ incubator/webwork2/src/test/com/opensymphony/webwork/ExecutionCountTestAction.java Thu Mar 23 20:54:56 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork;
+package org.apache.struts.action2;
 
 import com.opensymphony.xwork.ActionSupport;
 import org.apache.commons.logging.Log;

Modified: incubator/webwork2/src/test/com/opensymphony/webwork/RequestUtilsTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/com/opensymphony/webwork/RequestUtilsTest.java?rev=388369&r1=388368&r2=388369&view=diff
==============================================================================
--- incubator/webwork2/src/test/com/opensymphony/webwork/RequestUtilsTest.java (original)
+++ incubator/webwork2/src/test/com/opensymphony/webwork/RequestUtilsTest.java Thu Mar 23 20:54:56 2006
@@ -3,7 +3,7 @@
  * All rights reserved.
  */
 
-package com.opensymphony.webwork;
+package org.apache.struts.action2;
 
 /**
  * <code>RequestUtilsTest</code>

Modified: incubator/webwork2/src/test/com/opensymphony/webwork/ServletActionContextTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/com/opensymphony/webwork/ServletActionContextTest.java?rev=388369&r1=388368&r2=388369&view=diff
==============================================================================
--- incubator/webwork2/src/test/com/opensymphony/webwork/ServletActionContextTest.java (original)
+++ incubator/webwork2/src/test/com/opensymphony/webwork/ServletActionContextTest.java Thu Mar 23 20:54:56 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork;
+package org.apache.struts.action2;
 
 import com.mockobjects.servlet.MockHttpServletRequest;
 import com.mockobjects.servlet.MockHttpServletResponse;

Modified: incubator/webwork2/src/test/com/opensymphony/webwork/TestAction.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/com/opensymphony/webwork/TestAction.java?rev=388369&r1=388368&r2=388369&view=diff
==============================================================================
--- incubator/webwork2/src/test/com/opensymphony/webwork/TestAction.java (original)
+++ incubator/webwork2/src/test/com/opensymphony/webwork/TestAction.java Thu Mar 23 20:54:56 2006
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork;
+package org.apache.struts.action2;
 
-import com.opensymphony.webwork.views.jsp.ui.User;
+import org.apache.struts.action2.views.jsp.ui.User;
 import com.opensymphony.xwork.Action;
 import com.opensymphony.xwork.ActionSupport;
 

Modified: incubator/webwork2/src/test/com/opensymphony/webwork/TestActionTagResult.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/com/opensymphony/webwork/TestActionTagResult.java?rev=388369&r1=388368&r2=388369&view=diff
==============================================================================
--- incubator/webwork2/src/test/com/opensymphony/webwork/TestActionTagResult.java (original)
+++ incubator/webwork2/src/test/com/opensymphony/webwork/TestActionTagResult.java Thu Mar 23 20:54:56 2006
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork;
+package org.apache.struts.action2;
 
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.Result;

Modified: incubator/webwork2/src/test/com/opensymphony/webwork/TestConfigurationProvider.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/com/opensymphony/webwork/TestConfigurationProvider.java?rev=388369&r1=388368&r2=388369&view=diff
==============================================================================
--- incubator/webwork2/src/test/com/opensymphony/webwork/TestConfigurationProvider.java (original)
+++ incubator/webwork2/src/test/com/opensymphony/webwork/TestConfigurationProvider.java Thu Mar 23 20:54:56 2006
@@ -2,11 +2,11 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork;
+package org.apache.struts.action2;
 
-import com.opensymphony.webwork.dispatcher.ServletDispatcherResult;
-import com.opensymphony.webwork.interceptor.TokenInterceptor;
-import com.opensymphony.webwork.interceptor.TokenSessionStoreInterceptor;
+import org.apache.struts.action2.dispatcher.ServletDispatcherResult;
+import org.apache.struts.action2.interceptor.TokenInterceptor;
+import org.apache.struts.action2.interceptor.TokenSessionStoreInterceptor;
 import com.opensymphony.xwork.Action;
 import com.opensymphony.xwork.ActionChainResult;
 import com.opensymphony.xwork.config.Configuration;

Modified: incubator/webwork2/src/test/com/opensymphony/webwork/TestResult.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/com/opensymphony/webwork/TestResult.java?rev=388369&r1=388368&r2=388369&view=diff
==============================================================================
--- incubator/webwork2/src/test/com/opensymphony/webwork/TestResult.java (original)
+++ incubator/webwork2/src/test/com/opensymphony/webwork/TestResult.java Thu Mar 23 20:54:56 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork;
+package org.apache.struts.action2;
 
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionInvocation;

Modified: incubator/webwork2/src/test/com/opensymphony/webwork/components/AbstractRichtexteditorConnectorTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/com/opensymphony/webwork/components/AbstractRichtexteditorConnectorTest.java?rev=388369&r1=388368&r2=388369&view=diff
==============================================================================
--- incubator/webwork2/src/test/com/opensymphony/webwork/components/AbstractRichtexteditorConnectorTest.java (original)
+++ incubator/webwork2/src/test/com/opensymphony/webwork/components/AbstractRichtexteditorConnectorTest.java Thu Mar 23 20:54:56 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.Action;
 import com.opensymphony.xwork.ActionContext;

Modified: incubator/webwork2/src/test/com/opensymphony/webwork/components/ComponentTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/com/opensymphony/webwork/components/ComponentTest.java?rev=388369&r1=388368&r2=388369&view=diff
==============================================================================
--- incubator/webwork2/src/test/com/opensymphony/webwork/components/ComponentTest.java (original)
+++ incubator/webwork2/src/test/com/opensymphony/webwork/components/ComponentTest.java Thu Mar 23 20:54:56 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import java.util.Iterator;
 import java.util.Locale;
@@ -11,25 +11,25 @@
 
 import javax.servlet.jsp.tagext.TagSupport;
 
-import com.opensymphony.webwork.TestConfigurationProvider;
-import com.opensymphony.webwork.views.jsp.AbstractTagTest;
-import com.opensymphony.webwork.views.jsp.ActionTag;
-import com.opensymphony.webwork.views.jsp.BeanTag;
-import com.opensymphony.webwork.views.jsp.ElseIfTag;
-import com.opensymphony.webwork.views.jsp.ElseTag;
-import com.opensymphony.webwork.views.jsp.I18nTag;
-import com.opensymphony.webwork.views.jsp.IfTag;
-import com.opensymphony.webwork.views.jsp.IteratorTag;
-import com.opensymphony.webwork.views.jsp.PropertyTag;
-import com.opensymphony.webwork.views.jsp.PushTag;
-import com.opensymphony.webwork.views.jsp.SetTag;
-import com.opensymphony.webwork.views.jsp.TextTag;
-import com.opensymphony.webwork.views.jsp.URLTag;
-import com.opensymphony.webwork.views.jsp.iterator.AppendIteratorTag;
-import com.opensymphony.webwork.views.jsp.iterator.MergeIteratorTag;
-import com.opensymphony.webwork.views.jsp.ui.RichTextEditorTag;
-import com.opensymphony.webwork.views.jsp.ui.TextFieldTag;
-import com.opensymphony.webwork.views.jsp.ui.UpDownSelectTag;
+import org.apache.struts.action2.TestConfigurationProvider;
+import org.apache.struts.action2.views.jsp.AbstractTagTest;
+import org.apache.struts.action2.views.jsp.ActionTag;
+import org.apache.struts.action2.views.jsp.BeanTag;
+import org.apache.struts.action2.views.jsp.ElseIfTag;
+import org.apache.struts.action2.views.jsp.ElseTag;
+import org.apache.struts.action2.views.jsp.I18nTag;
+import org.apache.struts.action2.views.jsp.IfTag;
+import org.apache.struts.action2.views.jsp.IteratorTag;
+import org.apache.struts.action2.views.jsp.PropertyTag;
+import org.apache.struts.action2.views.jsp.PushTag;
+import org.apache.struts.action2.views.jsp.SetTag;
+import org.apache.struts.action2.views.jsp.TextTag;
+import org.apache.struts.action2.views.jsp.URLTag;
+import org.apache.struts.action2.views.jsp.iterator.AppendIteratorTag;
+import org.apache.struts.action2.views.jsp.iterator.MergeIteratorTag;
+import org.apache.struts.action2.views.jsp.ui.RichTextEditorTag;
+import org.apache.struts.action2.views.jsp.ui.TextFieldTag;
+import org.apache.struts.action2.views.jsp.ui.UpDownSelectTag;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.config.ConfigurationManager;
 import com.opensymphony.xwork.util.LocalizedTextUtil;
@@ -175,7 +175,7 @@
 		t.setName("textFieldName");
 		
 		BeanTag tag = new BeanTag();
-		tag.setName("com.opensymphony.webwork.util.Counter");
+		tag.setName("org.apache.struts.action2.util.Counter");
 		tag.setPageContext(pageContext);
 		
 		try {
@@ -427,11 +427,11 @@
 		t.setPageContext(pageContext);
 		t.setName("textFieldName");
 		
-		ResourceBundle bundle = ResourceBundle.getBundle("com.opensymphony.webwork.components.tempo");
-		LocalizedTextUtil.addDefaultResourceBundle("com.opensymphony.webwork.components.temp");
+		ResourceBundle bundle = ResourceBundle.getBundle("org.apache.struts.action2.components.tempo");
+		LocalizedTextUtil.addDefaultResourceBundle("org.apache.struts.action2.components.temp");
 		
 		I18nTag tag = new I18nTag();
-		tag.setName("com.opensymphony.webwork.components.tempo");
+		tag.setName("org.apache.struts.action2.components.tempo");
 		tag.setPageContext(pageContext);
 		
 		try {

Modified: incubator/webwork2/src/test/com/opensymphony/webwork/components/FormTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/com/opensymphony/webwork/components/FormTest.java?rev=388369&r1=388368&r2=388369&view=diff
==============================================================================
--- incubator/webwork2/src/test/com/opensymphony/webwork/components/FormTest.java (original)
+++ incubator/webwork2/src/test/com/opensymphony/webwork/components/FormTest.java Thu Mar 23 20:54:56 2006
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
-import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
-import com.opensymphony.webwork.TestAction;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.TestAction;
 import com.opensymphony.xwork.validator.validators.RequiredFieldValidator;
 
 import java.util.List;

Modified: incubator/webwork2/src/test/com/opensymphony/webwork/components/MockRichtexteditorConnector.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/com/opensymphony/webwork/components/MockRichtexteditorConnector.java?rev=388369&r1=388368&r2=388369&view=diff
==============================================================================
--- incubator/webwork2/src/test/com/opensymphony/webwork/components/MockRichtexteditorConnector.java (original)
+++ incubator/webwork2/src/test/com/opensymphony/webwork/components/MockRichtexteditorConnector.java Thu Mar 23 20:54:56 2006
@@ -2,12 +2,12 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
-import com.opensymphony.webwork.components.AbstractRichtexteditorConnector.CreateFolderResult;
-import com.opensymphony.webwork.components.AbstractRichtexteditorConnector.FileUploadResult;
-import com.opensymphony.webwork.components.AbstractRichtexteditorConnector.Folder;
-import com.opensymphony.webwork.components.AbstractRichtexteditorConnector.FoldersAndFiles;
+import org.apache.struts.action2.components.AbstractRichtexteditorConnector.CreateFolderResult;
+import org.apache.struts.action2.components.AbstractRichtexteditorConnector.FileUploadResult;
+import org.apache.struts.action2.components.AbstractRichtexteditorConnector.Folder;
+import org.apache.struts.action2.components.AbstractRichtexteditorConnector.FoldersAndFiles;
 
 /**
  * 

Modified: incubator/webwork2/src/test/com/opensymphony/webwork/components/PropertyTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/com/opensymphony/webwork/components/PropertyTest.java?rev=388369&r1=388368&r2=388369&view=diff
==============================================================================
--- incubator/webwork2/src/test/com/opensymphony/webwork/components/PropertyTest.java (original)
+++ incubator/webwork2/src/test/com/opensymphony/webwork/components/PropertyTest.java Thu Mar 23 20:54:56 2006
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
-import com.opensymphony.webwork.components.Property;
-import com.opensymphony.webwork.util.WebWorkTypeConverter;
+import org.apache.struts.action2.components.Property;
+import org.apache.struts.action2.util.WebWorkTypeConverter;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import com.opensymphony.xwork.util.XWorkConverter;
 import junit.framework.TestCase;
@@ -121,7 +121,7 @@
     private final class TestDefaultConverter extends XWorkConverter {
         protected TestDefaultConverter() {
             super();
-            registerConverter("com.opensymphony.webwork.components.PropertyTest$FooBar", new FooBarConverter());
+            registerConverter("org.apache.struts.action2.components.PropertyTest$FooBar", new FooBarConverter());
         }
     }
 }

Modified: incubator/webwork2/src/test/com/opensymphony/webwork/components/UIComponentTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/com/opensymphony/webwork/components/UIComponentTest.java?rev=388369&r1=388368&r2=388369&view=diff
==============================================================================
--- incubator/webwork2/src/test/com/opensymphony/webwork/components/UIComponentTest.java (original)
+++ incubator/webwork2/src/test/com/opensymphony/webwork/components/UIComponentTest.java Thu Mar 23 20:54:56 2006
@@ -2,35 +2,35 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import java.util.Iterator;
 import java.util.Stack;
 
 import javax.servlet.jsp.tagext.TagSupport;
 
-import com.opensymphony.webwork.TestConfigurationProvider;
-import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
-import com.opensymphony.webwork.views.jsp.ui.ActionErrorTag;
-import com.opensymphony.webwork.views.jsp.ui.ActionMessageTag;
-import com.opensymphony.webwork.views.jsp.ui.AnchorTag;
-import com.opensymphony.webwork.views.jsp.ui.CheckboxTag;
-import com.opensymphony.webwork.views.jsp.ui.ComboBoxTag;
-import com.opensymphony.webwork.views.jsp.ui.DivTag;
-import com.opensymphony.webwork.views.jsp.ui.DoubleSelectTag;
-import com.opensymphony.webwork.views.jsp.ui.FieldErrorTag;
-import com.opensymphony.webwork.views.jsp.ui.FileTag;
-import com.opensymphony.webwork.views.jsp.ui.FormTag;
-import com.opensymphony.webwork.views.jsp.ui.HiddenTag;
-import com.opensymphony.webwork.views.jsp.ui.LabelTag;
-import com.opensymphony.webwork.views.jsp.ui.OptionTransferSelectTag;
-import com.opensymphony.webwork.views.jsp.ui.PasswordTag;
-import com.opensymphony.webwork.views.jsp.ui.RadioTag;
-import com.opensymphony.webwork.views.jsp.ui.SelectTag;
-import com.opensymphony.webwork.views.jsp.ui.SubmitTag;
-import com.opensymphony.webwork.views.jsp.ui.TextFieldTag;
-import com.opensymphony.webwork.views.jsp.ui.TextareaTag;
-import com.opensymphony.webwork.views.jsp.ui.TokenTag;
+import org.apache.struts.action2.TestConfigurationProvider;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.views.jsp.ui.ActionErrorTag;
+import org.apache.struts.action2.views.jsp.ui.ActionMessageTag;
+import org.apache.struts.action2.views.jsp.ui.AnchorTag;
+import org.apache.struts.action2.views.jsp.ui.CheckboxTag;
+import org.apache.struts.action2.views.jsp.ui.ComboBoxTag;
+import org.apache.struts.action2.views.jsp.ui.DivTag;
+import org.apache.struts.action2.views.jsp.ui.DoubleSelectTag;
+import org.apache.struts.action2.views.jsp.ui.FieldErrorTag;
+import org.apache.struts.action2.views.jsp.ui.FileTag;
+import org.apache.struts.action2.views.jsp.ui.FormTag;
+import org.apache.struts.action2.views.jsp.ui.HiddenTag;
+import org.apache.struts.action2.views.jsp.ui.LabelTag;
+import org.apache.struts.action2.views.jsp.ui.OptionTransferSelectTag;
+import org.apache.struts.action2.views.jsp.ui.PasswordTag;
+import org.apache.struts.action2.views.jsp.ui.RadioTag;
+import org.apache.struts.action2.views.jsp.ui.SelectTag;
+import org.apache.struts.action2.views.jsp.ui.SubmitTag;
+import org.apache.struts.action2.views.jsp.ui.TextFieldTag;
+import org.apache.struts.action2.views.jsp.ui.TextareaTag;
+import org.apache.struts.action2.views.jsp.ui.TokenTag;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.config.ConfigurationManager;
 

Modified: incubator/webwork2/src/test/com/opensymphony/webwork/config/ConfigurationTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/com/opensymphony/webwork/config/ConfigurationTest.java?rev=388369&r1=388368&r2=388369&view=diff
==============================================================================
--- incubator/webwork2/src/test/com/opensymphony/webwork/config/ConfigurationTest.java (original)
+++ incubator/webwork2/src/test/com/opensymphony/webwork/config/ConfigurationTest.java Thu Mar 23 20:54:56 2006
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.config;
+package org.apache.struts.action2.config;
 
-import com.opensymphony.webwork.WebWorkTestCase;
-import com.opensymphony.webwork.WebWorkConstants;
+import org.apache.struts.action2.WebWorkTestCase;
+import org.apache.struts.action2.WebWorkConstants;
 import com.opensymphony.xwork.util.LocalizedTextUtil;
 
 import java.util.Iterator;

Modified: incubator/webwork2/src/test/com/opensymphony/webwork/config/TestConfiguration.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/com/opensymphony/webwork/config/TestConfiguration.java?rev=388369&r1=388368&r2=388369&view=diff
==============================================================================
--- incubator/webwork2/src/test/com/opensymphony/webwork/config/TestConfiguration.java (original)
+++ incubator/webwork2/src/test/com/opensymphony/webwork/config/TestConfiguration.java Thu Mar 23 20:54:56 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.config;
+package org.apache.struts.action2.config;
 
 import java.util.ArrayList;
 import java.util.Iterator;

Modified: incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/AbstractServletDispatcherTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/AbstractServletDispatcherTestCase.java?rev=388369&r1=388368&r2=388369&view=diff
==============================================================================
--- incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/AbstractServletDispatcherTestCase.java (original)
+++ incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/AbstractServletDispatcherTestCase.java Thu Mar 23 20:54:56 2006
@@ -6,7 +6,7 @@
  * Created on 2/10/2003
  *
  */
-package com.opensymphony.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
 
 import com.mockobjects.dynamic.C;
 import com.mockobjects.dynamic.Mock;
@@ -14,9 +14,9 @@
 import com.mockobjects.servlet.MockHttpSession;
 import com.mockobjects.servlet.MockServletConfig;
 import com.mockobjects.servlet.MockServletOutputStream;
-import com.opensymphony.webwork.WebWorkTestCase;
-import com.opensymphony.webwork.views.jsp.WebWorkMockHttpServletRequest;
-import com.opensymphony.webwork.views.jsp.WebWorkMockHttpServletResponse;
+import org.apache.struts.action2.WebWorkTestCase;
+import org.apache.struts.action2.views.jsp.WebWorkMockHttpServletRequest;
+import org.apache.struts.action2.views.jsp.WebWorkMockHttpServletResponse;
 import com.opensymphony.xwork.config.ConfigurationManager;
 import com.opensymphony.xwork.config.providers.XmlConfigurationProvider;
 

Modified: incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/ChartResultTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/ChartResultTest.java?rev=388369&r1=388368&r2=388369&view=diff
==============================================================================
--- incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/ChartResultTest.java (original)
+++ incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/ChartResultTest.java Thu Mar 23 20:54:56 2006
@@ -8,10 +8,10 @@
  * To change the template for this generated file go to Window - Preferences -
  * Java - Code Generation - Code and Comments
  */
-package com.opensymphony.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
 
 import com.mockobjects.dynamic.Mock;
-import com.opensymphony.webwork.ServletActionContext;
+import org.apache.struts.action2.ServletActionContext;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionInvocation;
 import junit.framework.TestCase;

Modified: incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/DefautActionMapperTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/DefautActionMapperTest.java?rev=388369&r1=388368&r2=388369&view=diff
==============================================================================
--- incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/DefautActionMapperTest.java (original)
+++ incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/DefautActionMapperTest.java Thu Mar 23 20:54:56 2006
@@ -6,14 +6,14 @@
  * Created on 2/10/2003
  *
  */
-package com.opensymphony.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
 
 import com.mockobjects.servlet.MockHttpServletRequest;
-import com.opensymphony.webwork.WebWorkTestCase;
-import com.opensymphony.webwork.WebWorkConstants;
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.dispatcher.mapper.ActionMapping;
-import com.opensymphony.webwork.dispatcher.mapper.DefaultActionMapper;
+import org.apache.struts.action2.WebWorkTestCase;
+import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.dispatcher.mapper.ActionMapping;
+import org.apache.struts.action2.dispatcher.mapper.DefaultActionMapper;
 
 import java.util.HashMap;
 

Modified: incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/DispatcherUtilsTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/DispatcherUtilsTest.java?rev=388369&r1=388368&r2=388369&view=diff
==============================================================================
--- incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/DispatcherUtilsTest.java (original)
+++ incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/DispatcherUtilsTest.java Thu Mar 23 20:54:56 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
 
 import java.util.Locale;
 

Modified: incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/FilterDispatcherTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/FilterDispatcherTest.java?rev=388369&r1=388368&r2=388369&view=diff
==============================================================================
--- incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/FilterDispatcherTest.java (original)
+++ incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/FilterDispatcherTest.java Thu Mar 23 20:54:56 2006
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -12,11 +12,11 @@
 import org.springframework.mock.web.MockFilterConfig;
 import org.springframework.mock.web.MockServletContext;
 
-import com.opensymphony.webwork.WebWorkConstants;
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.util.ObjectFactoryDestroyable;
-import com.opensymphony.webwork.util.ObjectFactoryInitializable;
-import com.opensymphony.webwork.util.ObjectFactoryLifecycle;
+import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.util.ObjectFactoryDestroyable;
+import org.apache.struts.action2.util.ObjectFactoryInitializable;
+import org.apache.struts.action2.util.ObjectFactoryLifecycle;
 import com.opensymphony.xwork.ObjectFactory;
 
 import junit.framework.TestCase;
@@ -76,7 +76,7 @@
 		DispatcherUtils.setInstance(null);
 		
 		Map configMap = new HashMap();
-		configMap.put(WebWorkConstants.WEBWORK_OBJECTFACTORY, "com.opensymphony.webwork.dispatcher.FilterDispatcherTest$InnerInitializableObjectFactory");
+		configMap.put(WebWorkConstants.WEBWORK_OBJECTFACTORY, "org.apache.struts.action2.dispatcher.FilterDispatcherTest$InnerInitializableObjectFactory");
 		configMap.put(WebWorkConstants.WEBWORK_CONFIGURATION_XML_RELOAD, "false");
 		Configuration.setConfiguration(new InnerConfiguration(configMap));
 		
@@ -96,7 +96,7 @@
 		DispatcherUtils.setInstance(null);
 		
 		Map configMap = new HashMap();
-		configMap.put(WebWorkConstants.WEBWORK_OBJECTFACTORY, "com.opensymphony.webwork.dispatcher.FilterDispatcherTest$InnerInitailizableDestroyableObjectFactory");
+		configMap.put(WebWorkConstants.WEBWORK_OBJECTFACTORY, "org.apache.struts.action2.dispatcher.FilterDispatcherTest$InnerInitailizableDestroyableObjectFactory");
 		configMap.put(WebWorkConstants.WEBWORK_CONFIGURATION_XML_RELOAD, "false");
 		Configuration.setConfiguration(new InnerConfiguration(configMap));
 		

Modified: incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/HttpHeaderResultTest.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/HttpHeaderResultTest.java?rev=388369&r1=388368&r2=388369&view=diff
==============================================================================
--- incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/HttpHeaderResultTest.java (original)
+++ incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/HttpHeaderResultTest.java Thu Mar 23 20:54:56 2006
@@ -2,11 +2,11 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
 
 import com.mockobjects.dynamic.C;
 import com.mockobjects.dynamic.Mock;
-import com.opensymphony.webwork.ServletActionContext;
+import org.apache.struts.action2.ServletActionContext;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.XWorkTestCase;

Modified: incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/NullActionMapper.java
URL: http://svn.apache.org/viewcvs/incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/NullActionMapper.java?rev=388369&r1=388368&r2=388369&view=diff
==============================================================================
--- incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/NullActionMapper.java (original)
+++ incubator/webwork2/src/test/com/opensymphony/webwork/dispatcher/NullActionMapper.java Thu Mar 23 20:54:56 2006
@@ -2,12 +2,12 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.opensymphony.webwork.dispatcher.mapper.ActionMapper;
-import com.opensymphony.webwork.dispatcher.mapper.ActionMapping;
+import org.apache.struts.action2.dispatcher.mapper.ActionMapper;
+import org.apache.struts.action2.dispatcher.mapper.ActionMapping;
 
 /**
  * ActionMapper for testing FilterDispatcher (used in FilterDispaatcherTest)



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org


Mime
View raw message