From 7b54a93676808d1b3bc618cb30b130d8dc9a3afd Mon Sep 17 00:00:00 2001
From: "Donald J. Brown" <mrdon@apache.org>
Date: Fri, 24 Mar 2006 04:54:56 +0000
Subject: [PATCH] Finishing package changes

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

diff --git a/build.xml b/build.xml
index a61f879d3..4eaa9e1d5 100644
--- a/build.xml
+++ b/build.xml
@@ -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>
diff --git a/src/java/META-INF/taglib.tld b/src/java/META-INF/taglib.tld
index fecda1293..5603c1e6d 100644
--- a/src/java/META-INF/taglib.tld
+++ b/src/java/META-INF/taglib.tld
@@ -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>
 
diff --git a/src/java/config-browser.xml b/src/java/config-browser.xml
index f8f006ca2..c692a02df 100644
--- a/src/java/config-browser.xml
+++ b/src/java/config-browser.xml
@@ -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>
diff --git a/src/java/template/archive/simple/tabbedpane.vm b/src/java/template/archive/simple/tabbedpane.vm
index 94c1b1f7f..1f14d71d7 100644
--- a/src/java/template/archive/simple/tabbedpane.vm
+++ b/src/java/template/archive/simple/tabbedpane.vm
@@ -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())
 
diff --git a/src/java/webwork-default.xml b/src/java/webwork-default.xml
index 30916c97f..c4c762eeb 100644
--- a/src/java/webwork-default.xml
+++ b/src/java/webwork-default.xml
@@ -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>
diff --git a/src/java/webwork.vm b/src/java/webwork.vm
index f7236e485..3c0c78fbb 100644
--- a/src/java/webwork.vm
+++ b/src/java/webwork.vm
@@ -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
diff --git a/src/test/com/opensymphony/webwork/ExecutionCountTestAction.java b/src/test/com/opensymphony/webwork/ExecutionCountTestAction.java
index ab440ee67..d6217d2a0 100644
--- a/src/test/com/opensymphony/webwork/ExecutionCountTestAction.java
+++ b/src/test/com/opensymphony/webwork/ExecutionCountTestAction.java
@@ -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;
diff --git a/src/test/com/opensymphony/webwork/RequestUtilsTest.java b/src/test/com/opensymphony/webwork/RequestUtilsTest.java
index ad6feefca..45f61cb4f 100644
--- a/src/test/com/opensymphony/webwork/RequestUtilsTest.java
+++ b/src/test/com/opensymphony/webwork/RequestUtilsTest.java
@@ -3,7 +3,7 @@
  * All rights reserved.
  */
 
-package com.opensymphony.webwork;
+package org.apache.struts.action2;
 
 /**
  * <code>RequestUtilsTest</code>
diff --git a/src/test/com/opensymphony/webwork/ServletActionContextTest.java b/src/test/com/opensymphony/webwork/ServletActionContextTest.java
index ecab3ae09..9d9c11c83 100644
--- a/src/test/com/opensymphony/webwork/ServletActionContextTest.java
+++ b/src/test/com/opensymphony/webwork/ServletActionContextTest.java
@@ -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;
diff --git a/src/test/com/opensymphony/webwork/TestAction.java b/src/test/com/opensymphony/webwork/TestAction.java
index 327357c23..24e764613 100644
--- a/src/test/com/opensymphony/webwork/TestAction.java
+++ b/src/test/com/opensymphony/webwork/TestAction.java
@@ -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;
 
diff --git a/src/test/com/opensymphony/webwork/TestActionTagResult.java b/src/test/com/opensymphony/webwork/TestActionTagResult.java
index 77d30d55b..1de9d88b7 100644
--- a/src/test/com/opensymphony/webwork/TestActionTagResult.java
+++ b/src/test/com/opensymphony/webwork/TestActionTagResult.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork;
+package org.apache.struts.action2;
 
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.Result;
diff --git a/src/test/com/opensymphony/webwork/TestConfigurationProvider.java b/src/test/com/opensymphony/webwork/TestConfigurationProvider.java
index 69c3617ec..654dd8b32 100644
--- a/src/test/com/opensymphony/webwork/TestConfigurationProvider.java
+++ b/src/test/com/opensymphony/webwork/TestConfigurationProvider.java
@@ -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;
diff --git a/src/test/com/opensymphony/webwork/TestResult.java b/src/test/com/opensymphony/webwork/TestResult.java
index 761cae64b..1b7d17c67 100644
--- a/src/test/com/opensymphony/webwork/TestResult.java
+++ b/src/test/com/opensymphony/webwork/TestResult.java
@@ -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;
diff --git a/src/test/com/opensymphony/webwork/components/AbstractRichtexteditorConnectorTest.java b/src/test/com/opensymphony/webwork/components/AbstractRichtexteditorConnectorTest.java
index c7dbb2b4a..3538f37dd 100644
--- a/src/test/com/opensymphony/webwork/components/AbstractRichtexteditorConnectorTest.java
+++ b/src/test/com/opensymphony/webwork/components/AbstractRichtexteditorConnectorTest.java
@@ -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;
diff --git a/src/test/com/opensymphony/webwork/components/ComponentTest.java b/src/test/com/opensymphony/webwork/components/ComponentTest.java
index 8c3c12c22..ae3c8046b 100644
--- a/src/test/com/opensymphony/webwork/components/ComponentTest.java
+++ b/src/test/com/opensymphony/webwork/components/ComponentTest.java
@@ -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 java.util.Stack;
 
 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 @@ public class ComponentTest extends AbstractTagTest {
 		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 @@ public class ComponentTest extends AbstractTagTest {
 		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 {
diff --git a/src/test/com/opensymphony/webwork/components/FormTest.java b/src/test/com/opensymphony/webwork/components/FormTest.java
index 3b02aff01..3785ba680 100644
--- a/src/test/com/opensymphony/webwork/components/FormTest.java
+++ b/src/test/com/opensymphony/webwork/components/FormTest.java
@@ -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;
diff --git a/src/test/com/opensymphony/webwork/components/MockRichtexteditorConnector.java b/src/test/com/opensymphony/webwork/components/MockRichtexteditorConnector.java
index b014b99df..75b29a090 100644
--- a/src/test/com/opensymphony/webwork/components/MockRichtexteditorConnector.java
+++ b/src/test/com/opensymphony/webwork/components/MockRichtexteditorConnector.java
@@ -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;
 
 /**
  * 
diff --git a/src/test/com/opensymphony/webwork/components/PropertyTest.java b/src/test/com/opensymphony/webwork/components/PropertyTest.java
index b5a44e10a..19d3204e3 100644
--- a/src/test/com/opensymphony/webwork/components/PropertyTest.java
+++ b/src/test/com/opensymphony/webwork/components/PropertyTest.java
@@ -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 @@ public class PropertyTest extends TestCase {
     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());
         }
     }
 }
diff --git a/src/test/com/opensymphony/webwork/components/UIComponentTest.java b/src/test/com/opensymphony/webwork/components/UIComponentTest.java
index e6a97bd93..359126aa0 100644
--- a/src/test/com/opensymphony/webwork/components/UIComponentTest.java
+++ b/src/test/com/opensymphony/webwork/components/UIComponentTest.java
@@ -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;
 
diff --git a/src/test/com/opensymphony/webwork/config/ConfigurationTest.java b/src/test/com/opensymphony/webwork/config/ConfigurationTest.java
index e6ac6bcc2..cefa391c0 100644
--- a/src/test/com/opensymphony/webwork/config/ConfigurationTest.java
+++ b/src/test/com/opensymphony/webwork/config/ConfigurationTest.java
@@ -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;
diff --git a/src/test/com/opensymphony/webwork/config/TestConfiguration.java b/src/test/com/opensymphony/webwork/config/TestConfiguration.java
index 1b00a3f77..1244c9b61 100644
--- a/src/test/com/opensymphony/webwork/config/TestConfiguration.java
+++ b/src/test/com/opensymphony/webwork/config/TestConfiguration.java
@@ -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;
diff --git a/src/test/com/opensymphony/webwork/dispatcher/AbstractServletDispatcherTestCase.java b/src/test/com/opensymphony/webwork/dispatcher/AbstractServletDispatcherTestCase.java
index a31a39380..c52398931 100644
--- a/src/test/com/opensymphony/webwork/dispatcher/AbstractServletDispatcherTestCase.java
+++ b/src/test/com/opensymphony/webwork/dispatcher/AbstractServletDispatcherTestCase.java
@@ -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.MockHttpServletResponse;
 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;
 
diff --git a/src/test/com/opensymphony/webwork/dispatcher/ChartResultTest.java b/src/test/com/opensymphony/webwork/dispatcher/ChartResultTest.java
index ea65e0e94..2c4954ea0 100644
--- a/src/test/com/opensymphony/webwork/dispatcher/ChartResultTest.java
+++ b/src/test/com/opensymphony/webwork/dispatcher/ChartResultTest.java
@@ -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;
diff --git a/src/test/com/opensymphony/webwork/dispatcher/DefautActionMapperTest.java b/src/test/com/opensymphony/webwork/dispatcher/DefautActionMapperTest.java
index 17868dd39..184b7ddd0 100644
--- a/src/test/com/opensymphony/webwork/dispatcher/DefautActionMapperTest.java
+++ b/src/test/com/opensymphony/webwork/dispatcher/DefautActionMapperTest.java
@@ -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;
 
diff --git a/src/test/com/opensymphony/webwork/dispatcher/DispatcherUtilsTest.java b/src/test/com/opensymphony/webwork/dispatcher/DispatcherUtilsTest.java
index 18fa02c15..2bb6185cd 100644
--- a/src/test/com/opensymphony/webwork/dispatcher/DispatcherUtilsTest.java
+++ b/src/test/com/opensymphony/webwork/dispatcher/DispatcherUtilsTest.java
@@ -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;
 
diff --git a/src/test/com/opensymphony/webwork/dispatcher/FilterDispatcherTest.java b/src/test/com/opensymphony/webwork/dispatcher/FilterDispatcherTest.java
index 9c922abb6..93d15ef8e 100644
--- a/src/test/com/opensymphony/webwork/dispatcher/FilterDispatcherTest.java
+++ b/src/test/com/opensymphony/webwork/dispatcher/FilterDispatcherTest.java
@@ -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 javax.servlet.ServletContext;
 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 @@ public class FilterDispatcherTest extends TestCase {
 		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 @@ public class FilterDispatcherTest extends TestCase {
 		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));
 		
diff --git a/src/test/com/opensymphony/webwork/dispatcher/HttpHeaderResultTest.java b/src/test/com/opensymphony/webwork/dispatcher/HttpHeaderResultTest.java
index 717507245..01c259af2 100644
--- a/src/test/com/opensymphony/webwork/dispatcher/HttpHeaderResultTest.java
+++ b/src/test/com/opensymphony/webwork/dispatcher/HttpHeaderResultTest.java
@@ -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;
diff --git a/src/test/com/opensymphony/webwork/dispatcher/NullActionMapper.java b/src/test/com/opensymphony/webwork/dispatcher/NullActionMapper.java
index 25302349b..17e052037 100644
--- a/src/test/com/opensymphony/webwork/dispatcher/NullActionMapper.java
+++ b/src/test/com/opensymphony/webwork/dispatcher/NullActionMapper.java
@@ -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)
diff --git a/src/test/com/opensymphony/webwork/dispatcher/PlainTextResultTest.java b/src/test/com/opensymphony/webwork/dispatcher/PlainTextResultTest.java
index 69f617522..bb3092751 100644
--- a/src/test/com/opensymphony/webwork/dispatcher/PlainTextResultTest.java
+++ b/src/test/com/opensymphony/webwork/dispatcher/PlainTextResultTest.java
@@ -2,17 +2,17 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
 
 import java.io.InputStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
 import com.opensymphony.util.ClassLoaderUtil;
-import com.opensymphony.webwork.WebWorkStatics;
-import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
-import com.opensymphony.webwork.views.jsp.WebWorkMockHttpServletResponse;
-import com.opensymphony.webwork.views.jsp.WebWorkMockServletContext;
+import org.apache.struts.action2.WebWorkStatics;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.views.jsp.WebWorkMockHttpServletResponse;
+import org.apache.struts.action2.views.jsp.WebWorkMockServletContext;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.mock.MockActionInvocation;
 import com.opensymphony.xwork.util.OgnlValueStack;
diff --git a/src/test/com/opensymphony/webwork/dispatcher/ServletDispatchedTestAssertInterceptor.java b/src/test/com/opensymphony/webwork/dispatcher/ServletDispatchedTestAssertInterceptor.java
index e2d0021ee..2b7ac2a84 100644
--- a/src/test/com/opensymphony/webwork/dispatcher/ServletDispatchedTestAssertInterceptor.java
+++ b/src/test/com/opensymphony/webwork/dispatcher/ServletDispatchedTestAssertInterceptor.java
@@ -6,9 +6,9 @@
  * Created on 2/10/2003
  *
  */
-package com.opensymphony.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
 
-import com.opensymphony.webwork.TestAction;
+import org.apache.struts.action2.TestAction;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.interceptor.Interceptor;
 import junit.framework.Assert;
diff --git a/src/test/com/opensymphony/webwork/dispatcher/ServletDispatcherResultTest.java b/src/test/com/opensymphony/webwork/dispatcher/ServletDispatcherResultTest.java
index 63cdb173f..ab16e9298 100644
--- a/src/test/com/opensymphony/webwork/dispatcher/ServletDispatcherResultTest.java
+++ b/src/test/com/opensymphony/webwork/dispatcher/ServletDispatcherResultTest.java
@@ -2,13 +2,13 @@
  * 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 com.opensymphony.webwork.WebWorkStatics;
-import com.opensymphony.webwork.WebWorkTestCase;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.WebWorkStatics;
+import org.apache.struts.action2.WebWorkTestCase;
 import com.opensymphony.xwork.ActionContext;
 import ognl.Ognl;
 
diff --git a/src/test/com/opensymphony/webwork/dispatcher/ServletDispatcherTest-xwork.xml b/src/test/com/opensymphony/webwork/dispatcher/ServletDispatcherTest-xwork.xml
index d84075765..753da3d29 100644
--- a/src/test/com/opensymphony/webwork/dispatcher/ServletDispatcherTest-xwork.xml
+++ b/src/test/com/opensymphony/webwork/dispatcher/ServletDispatcherTest-xwork.xml
@@ -6,10 +6,10 @@
     <package name="default" extends="webwork-default">
 
         <interceptors>
-            <interceptor name="assert" class="com.opensymphony.webwork.dispatcher.ServletDispatchedTestAssertInterceptor"/>
+            <interceptor name="assert" class="org.apache.struts.action2.dispatcher.ServletDispatchedTestAssertInterceptor"/>
         </interceptors>
 
-        <action name="Test" class="com.opensymphony.webwork.TestAction">
+        <action name="Test" class="org.apache.struts.action2.TestAction">
             <interceptor-ref name="params"/>
             <interceptor-ref name="assert"/>
         </action>
diff --git a/src/test/com/opensymphony/webwork/dispatcher/ServletDispatcherTest.java b/src/test/com/opensymphony/webwork/dispatcher/ServletDispatcherTest.java
index c9636a521..8cdfe7250 100644
--- a/src/test/com/opensymphony/webwork/dispatcher/ServletDispatcherTest.java
+++ b/src/test/com/opensymphony/webwork/dispatcher/ServletDispatcherTest.java
@@ -6,7 +6,7 @@
  * Created on 2/10/2003
  *
  */
-package com.opensymphony.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/test/com/opensymphony/webwork/dispatcher/ServletRedirectResultTest.java b/src/test/com/opensymphony/webwork/dispatcher/ServletRedirectResultTest.java
index 415dd13d5..14eff8ca7 100644
--- a/src/test/com/opensymphony/webwork/dispatcher/ServletRedirectResultTest.java
+++ b/src/test/com/opensymphony/webwork/dispatcher/ServletRedirectResultTest.java
@@ -2,13 +2,13 @@
  * 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 com.opensymphony.webwork.WebWorkStatics;
-import com.opensymphony.webwork.WebWorkTestCase;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.WebWorkStatics;
+import org.apache.struts.action2.WebWorkTestCase;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.mock.MockActionInvocation;
diff --git a/src/test/com/opensymphony/webwork/dispatcher/SessionMapTest.java b/src/test/com/opensymphony/webwork/dispatcher/SessionMapTest.java
index 26d2d959d..5468990a6 100644
--- a/src/test/com/opensymphony/webwork/dispatcher/SessionMapTest.java
+++ b/src/test/com/opensymphony/webwork/dispatcher/SessionMapTest.java
@@ -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 com.mockobjects.constraint.Constraint;
 import com.mockobjects.constraint.IsAnything;
diff --git a/src/test/com/opensymphony/webwork/dispatcher/StreamResultTest.java b/src/test/com/opensymphony/webwork/dispatcher/StreamResultTest.java
index 56f0776bb..4d2a02a1a 100644
--- a/src/test/com/opensymphony/webwork/dispatcher/StreamResultTest.java
+++ b/src/test/com/opensymphony/webwork/dispatcher/StreamResultTest.java
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
 
 import com.opensymphony.util.ClassLoaderUtil;
-import com.opensymphony.webwork.ServletActionContext;
+import org.apache.struts.action2.ServletActionContext;
 import com.opensymphony.xwork.Action;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.mock.MockActionInvocation;
diff --git a/src/test/com/opensymphony/webwork/dispatcher/VelocityResultTest.java b/src/test/com/opensymphony/webwork/dispatcher/VelocityResultTest.java
index 54a74b1dc..35dd8fcc9 100644
--- a/src/test/com/opensymphony/webwork/dispatcher/VelocityResultTest.java
+++ b/src/test/com/opensymphony/webwork/dispatcher/VelocityResultTest.java
@@ -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 com.mockobjects.dynamic.Mock;
 import com.opensymphony.xwork.ActionContext;
diff --git a/src/test/com/opensymphony/webwork/dispatcher/mapper/DefaultActionMapperTest.java b/src/test/com/opensymphony/webwork/dispatcher/mapper/DefaultActionMapperTest.java
index f99908448..dad1c9808 100644
--- a/src/test/com/opensymphony/webwork/dispatcher/mapper/DefaultActionMapperTest.java
+++ b/src/test/com/opensymphony/webwork/dispatcher/mapper/DefaultActionMapperTest.java
@@ -2,13 +2,13 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.dispatcher.mapper;
+package org.apache.struts.action2.dispatcher.mapper;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import com.opensymphony.webwork.dispatcher.ServletRedirectResult;
-import com.opensymphony.webwork.views.jsp.WebWorkMockHttpServletRequest;
+import org.apache.struts.action2.dispatcher.ServletRedirectResult;
+import org.apache.struts.action2.views.jsp.WebWorkMockHttpServletRequest;
 import com.opensymphony.xwork.Result;
 
 import junit.framework.TestCase;
diff --git a/src/test/com/opensymphony/webwork/dispatcher/mapper/RestfulActionMapperTest.java b/src/test/com/opensymphony/webwork/dispatcher/mapper/RestfulActionMapperTest.java
index e1cc12b82..6220e8c40 100644
--- a/src/test/com/opensymphony/webwork/dispatcher/mapper/RestfulActionMapperTest.java
+++ b/src/test/com/opensymphony/webwork/dispatcher/mapper/RestfulActionMapperTest.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.dispatcher.mapper;
+package org.apache.struts.action2.dispatcher.mapper;
 
 import junit.framework.TestCase;
 
@@ -10,7 +10,7 @@ import java.util.Map;
 import java.util.Collections;
 import java.util.HashMap;
 
-import com.opensymphony.webwork.views.jsp.WebWorkMockHttpServletRequest;
+import org.apache.struts.action2.views.jsp.WebWorkMockHttpServletRequest;
 
 /**
  * Unit test for {@link RestfulActionMapper}.
diff --git a/src/test/com/opensymphony/webwork/interceptor/CreateSessionInterceptorTest.java b/src/test/com/opensymphony/webwork/interceptor/CreateSessionInterceptorTest.java
index 20859ddf3..2f7df1f8b 100644
--- a/src/test/com/opensymphony/webwork/interceptor/CreateSessionInterceptorTest.java
+++ b/src/test/com/opensymphony/webwork/interceptor/CreateSessionInterceptorTest.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -10,8 +10,8 @@ import org.jmock.Mock;
 import org.jmock.core.constraint.IsEqual;
 import org.jmock.core.matcher.InvokeOnceMatcher;
 
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.WebWorkTestCase;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.WebWorkTestCase;
 import com.opensymphony.xwork.mock.MockActionInvocation;
 
 /**
diff --git a/src/test/com/opensymphony/webwork/interceptor/ExecuteAndWaitDelayAction.java b/src/test/com/opensymphony/webwork/interceptor/ExecuteAndWaitDelayAction.java
index d0d1b5087..e2e81db16 100644
--- a/src/test/com/opensymphony/webwork/interceptor/ExecuteAndWaitDelayAction.java
+++ b/src/test/com/opensymphony/webwork/interceptor/ExecuteAndWaitDelayAction.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
 */
-package com.opensymphony.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
 
 import com.opensymphony.xwork.Action;
 
diff --git a/src/test/com/opensymphony/webwork/interceptor/ExecuteAndWaitInterceptorTest.java b/src/test/com/opensymphony/webwork/interceptor/ExecuteAndWaitInterceptorTest.java
index d1f2f4301..ceb88d468 100644
--- a/src/test/com/opensymphony/webwork/interceptor/ExecuteAndWaitInterceptorTest.java
+++ b/src/test/com/opensymphony/webwork/interceptor/ExecuteAndWaitInterceptorTest.java
@@ -3,12 +3,12 @@
  * All rights reserved.
 */
 
-package com.opensymphony.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
 
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.WebWorkTestCase;
-import com.opensymphony.webwork.views.jsp.WebWorkMockHttpServletRequest;
-import com.opensymphony.webwork.views.jsp.WebWorkMockHttpSession;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.WebWorkTestCase;
+import org.apache.struts.action2.views.jsp.WebWorkMockHttpServletRequest;
+import org.apache.struts.action2.views.jsp.WebWorkMockHttpSession;
 import com.opensymphony.xwork.*;
 import com.opensymphony.xwork.mock.MockResult;
 import com.opensymphony.xwork.config.Configuration;
diff --git a/src/test/com/opensymphony/webwork/interceptor/FileUploadInterceptorTest.java b/src/test/com/opensymphony/webwork/interceptor/FileUploadInterceptorTest.java
index cb4ce9b48..83362a16e 100644
--- a/src/test/com/opensymphony/webwork/interceptor/FileUploadInterceptorTest.java
+++ b/src/test/com/opensymphony/webwork/interceptor/FileUploadInterceptorTest.java
@@ -2,12 +2,12 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
 
 import com.opensymphony.util.ClassLoaderUtil;
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.WebWorkTestCase;
-import com.opensymphony.webwork.dispatcher.multipart.MultiPartRequestWrapper;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.WebWorkTestCase;
+import org.apache.struts.action2.dispatcher.multipart.MultiPartRequestWrapper;
 import com.opensymphony.xwork.*;
 import com.opensymphony.xwork.mock.MockActionInvocation;
 import org.springframework.mock.web.MockHttpServletRequest;
diff --git a/src/test/com/opensymphony/webwork/interceptor/ServletConfigInterceptorTest.java b/src/test/com/opensymphony/webwork/interceptor/ServletConfigInterceptorTest.java
index 85ca77d78..53da21c32 100644
--- a/src/test/com/opensymphony/webwork/interceptor/ServletConfigInterceptorTest.java
+++ b/src/test/com/opensymphony/webwork/interceptor/ServletConfigInterceptorTest.java
@@ -2,11 +2,11 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
 
-import com.opensymphony.webwork.WebWorkStatics;
-import com.opensymphony.webwork.WebWorkTestCase;
-import com.opensymphony.webwork.util.ServletContextAware;
+import org.apache.struts.action2.WebWorkStatics;
+import org.apache.struts.action2.WebWorkTestCase;
+import org.apache.struts.action2.util.ServletContextAware;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.Action;
 import com.opensymphony.xwork.mock.MockActionInvocation;
diff --git a/src/test/com/opensymphony/webwork/interceptor/TokenInterceptorTest.java b/src/test/com/opensymphony/webwork/interceptor/TokenInterceptorTest.java
index 9411e37c4..1cb4d8372 100644
--- a/src/test/com/opensymphony/webwork/interceptor/TokenInterceptorTest.java
+++ b/src/test/com/opensymphony/webwork/interceptor/TokenInterceptorTest.java
@@ -2,13 +2,13 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
 
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.TestConfigurationProvider;
-import com.opensymphony.webwork.util.TokenHelper;
-import com.opensymphony.webwork.views.jsp.WebWorkMockHttpServletRequest;
-import com.opensymphony.webwork.views.jsp.WebWorkMockHttpSession;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.TestConfigurationProvider;
+import org.apache.struts.action2.util.TokenHelper;
+import org.apache.struts.action2.views.jsp.WebWorkMockHttpServletRequest;
+import org.apache.struts.action2.views.jsp.WebWorkMockHttpSession;
 import com.opensymphony.xwork.Action;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionProxy;
diff --git a/src/test/com/opensymphony/webwork/interceptor/TokenSessionStoreInterceptorTest.java b/src/test/com/opensymphony/webwork/interceptor/TokenSessionStoreInterceptorTest.java
index fa6801b8d..a221c9e2d 100644
--- a/src/test/com/opensymphony/webwork/interceptor/TokenSessionStoreInterceptorTest.java
+++ b/src/test/com/opensymphony/webwork/interceptor/TokenSessionStoreInterceptorTest.java
@@ -2,11 +2,11 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
 
 import com.opensymphony.xwork.ActionProxy;
 import com.opensymphony.xwork.Action;
-import com.opensymphony.webwork.TestConfigurationProvider;
+import org.apache.struts.action2.TestConfigurationProvider;
 
 /**
  * Unit test for {@link TokenSessionStoreInterceptor}.
diff --git a/src/test/com/opensymphony/webwork/interceptor/WebWorkConversionErrorInterceptorTest.java b/src/test/com/opensymphony/webwork/interceptor/WebWorkConversionErrorInterceptorTest.java
index c16aaa122..619ce79bb 100644
--- a/src/test/com/opensymphony/webwork/interceptor/WebWorkConversionErrorInterceptorTest.java
+++ b/src/test/com/opensymphony/webwork/interceptor/WebWorkConversionErrorInterceptorTest.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
 
 import com.mockobjects.dynamic.C;
 import com.mockobjects.dynamic.Mock;
@@ -11,7 +11,7 @@ import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.ActionSupport;
 import com.opensymphony.xwork.util.OgnlValueStack;
-import com.opensymphony.webwork.WebWorkTestCase;
+import org.apache.struts.action2.WebWorkTestCase;
 import junit.framework.TestCase;
 
 import java.util.HashMap;
diff --git a/src/test/com/opensymphony/webwork/portlet/PortletApplicationMapTest.java b/src/test/com/opensymphony/webwork/portlet/PortletApplicationMapTest.java
index ef937fba0..456dac667 100644
--- a/src/test/com/opensymphony/webwork/portlet/PortletApplicationMapTest.java
+++ b/src/test/com/opensymphony/webwork/portlet/PortletApplicationMapTest.java
@@ -4,7 +4,7 @@
  * TODO To change the template for this generated file go to
  * Window - Preferences - Java - Code Style - Code Templates
  */
-package com.opensymphony.webwork.portlet;
+package org.apache.struts.action2.portlet;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/test/com/opensymphony/webwork/portlet/PortletRequestMapTest.java b/src/test/com/opensymphony/webwork/portlet/PortletRequestMapTest.java
index 06283493b..f53767ce5 100644
--- a/src/test/com/opensymphony/webwork/portlet/PortletRequestMapTest.java
+++ b/src/test/com/opensymphony/webwork/portlet/PortletRequestMapTest.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.portlet;
+package org.apache.struts.action2.portlet;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/test/com/opensymphony/webwork/portlet/PortletSessionMapTest.java b/src/test/com/opensymphony/webwork/portlet/PortletSessionMapTest.java
index e23ca8880..f3843d3cf 100644
--- a/src/test/com/opensymphony/webwork/portlet/PortletSessionMapTest.java
+++ b/src/test/com/opensymphony/webwork/portlet/PortletSessionMapTest.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.portlet;
+package org.apache.struts.action2.portlet;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/test/com/opensymphony/webwork/portlet/context/PortletActionContextTest.java b/src/test/com/opensymphony/webwork/portlet/context/PortletActionContextTest.java
index 7f0c0717a..146ccea0c 100644
--- a/src/test/com/opensymphony/webwork/portlet/context/PortletActionContextTest.java
+++ b/src/test/com/opensymphony/webwork/portlet/context/PortletActionContextTest.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.portlet.context;
+package org.apache.struts.action2.portlet.context;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -18,7 +18,7 @@ import junit.textui.TestRunner;
 import org.jmock.Mock;
 import org.jmock.MockObjectTestCase;
 
-import com.opensymphony.webwork.portlet.PortletActionConstants;
+import org.apache.struts.action2.portlet.PortletActionConstants;
 import com.opensymphony.xwork.ActionContext;
 
 /**
diff --git a/src/test/com/opensymphony/webwork/portlet/context/PreparatorServletTest.java b/src/test/com/opensymphony/webwork/portlet/context/PreparatorServletTest.java
index 5f8e87268..d93ae2a94 100644
--- a/src/test/com/opensymphony/webwork/portlet/context/PreparatorServletTest.java
+++ b/src/test/com/opensymphony/webwork/portlet/context/PreparatorServletTest.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.portlet.context;
+package org.apache.struts.action2.portlet.context;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;
@@ -11,7 +11,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.easymock.MockControl;
 
-import com.opensymphony.webwork.ServletActionContext;
+import org.apache.struts.action2.ServletActionContext;
 import com.opensymphony.xwork.ActionContext;
 
 import junit.framework.TestCase;
diff --git a/src/test/com/opensymphony/webwork/portlet/context/ServletContextHolderListenerTest.java b/src/test/com/opensymphony/webwork/portlet/context/ServletContextHolderListenerTest.java
index 74c70c6f0..ea744a447 100644
--- a/src/test/com/opensymphony/webwork/portlet/context/ServletContextHolderListenerTest.java
+++ b/src/test/com/opensymphony/webwork/portlet/context/ServletContextHolderListenerTest.java
@@ -4,7 +4,7 @@
  * TODO To change the template for this generated file go to
  * Window - Preferences - Java - Code Style - Code Templates
  */
-package com.opensymphony.webwork.portlet.context;
+package org.apache.struts.action2.portlet.context;
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
diff --git a/src/test/com/opensymphony/webwork/portlet/dispatcher/Jsr168DispatcherTest.java b/src/test/com/opensymphony/webwork/portlet/dispatcher/Jsr168DispatcherTest.java
index dcade401c..ac8de0f58 100644
--- a/src/test/com/opensymphony/webwork/portlet/dispatcher/Jsr168DispatcherTest.java
+++ b/src/test/com/opensymphony/webwork/portlet/dispatcher/Jsr168DispatcherTest.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.portlet.dispatcher;
+package org.apache.struts.action2.portlet.dispatcher;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -29,8 +29,8 @@ import org.jmock.Mock;
 import org.jmock.cglib.MockObjectTestCase;
 import org.jmock.core.Constraint;
 
-import com.opensymphony.webwork.portlet.PortletActionConstants;
-import com.opensymphony.webwork.portlet.context.ServletContextHolderListener;
+import org.apache.struts.action2.portlet.PortletActionConstants;
+import org.apache.struts.action2.portlet.context.ServletContextHolderListener;
 import com.opensymphony.xwork.Action;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.ActionProxy;
diff --git a/src/test/com/opensymphony/webwork/portlet/result/PortletResultTest.java b/src/test/com/opensymphony/webwork/portlet/result/PortletResultTest.java
index 6fd760d0c..527257b93 100644
--- a/src/test/com/opensymphony/webwork/portlet/result/PortletResultTest.java
+++ b/src/test/com/opensymphony/webwork/portlet/result/PortletResultTest.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.portlet.result;
+package org.apache.struts.action2.portlet.result;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -23,7 +23,7 @@ import org.jmock.Mock;
 import org.jmock.cglib.MockObjectTestCase;
 import org.jmock.core.Constraint;
 
-import com.opensymphony.webwork.portlet.PortletActionConstants;
+import org.apache.struts.action2.portlet.PortletActionConstants;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionInvocation;
 
diff --git a/src/test/com/opensymphony/webwork/portlet/util/PortletUrlHelperTest.java b/src/test/com/opensymphony/webwork/portlet/util/PortletUrlHelperTest.java
index 8fb26c568..9800a547d 100644
--- a/src/test/com/opensymphony/webwork/portlet/util/PortletUrlHelperTest.java
+++ b/src/test/com/opensymphony/webwork/portlet/util/PortletUrlHelperTest.java
@@ -4,7 +4,7 @@
  * TODO To change the template for this generated file go to
  * Window - Preferences - Java - Code Style - Code Templates
  */
-package com.opensymphony.webwork.portlet.util;
+package org.apache.struts.action2.portlet.util;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -19,7 +19,7 @@ import junit.framework.TestCase;
 
 import org.easymock.MockControl;
 
-import com.opensymphony.webwork.portlet.context.PortletActionContext;
+import org.apache.struts.action2.portlet.context.PortletActionContext;
 import com.opensymphony.xwork.ActionContext;
 
 /**
diff --git a/src/test/com/opensymphony/webwork/portlet/util/WebWorkUtilTest.java b/src/test/com/opensymphony/webwork/portlet/util/WebWorkUtilTest.java
index 290db1382..fa8ee1e44 100644
--- a/src/test/com/opensymphony/webwork/portlet/util/WebWorkUtilTest.java
+++ b/src/test/com/opensymphony/webwork/portlet/util/WebWorkUtilTest.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.portlet.util;
+package org.apache.struts.action2.portlet.util;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -15,9 +15,9 @@ import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.mock.web.MockRequestDispatcher;
 
-import com.opensymphony.webwork.TestAction;
-import com.opensymphony.webwork.util.ListEntry;
-import com.opensymphony.webwork.util.WebWorkUtil;
+import org.apache.struts.action2.TestAction;
+import org.apache.struts.action2.util.ListEntry;
+import org.apache.struts.action2.util.WebWorkUtil;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import junit.framework.TestCase;
@@ -36,7 +36,7 @@ public class WebWorkUtilTest extends TestCase {
 	protected WebWorkUtil webWorkUtil = null;
 	
 	public void testBeanMethod() throws Exception {
-		Object o = webWorkUtil.bean("com.opensymphony.webwork.TestAction");
+		Object o = webWorkUtil.bean("org.apache.struts.action2.TestAction");
 		assertNotNull(o);
 		assertTrue(o instanceof TestAction);
 	}
diff --git a/src/test/com/opensymphony/webwork/sitegraph/SiteGraphTest.java b/src/test/com/opensymphony/webwork/sitegraph/SiteGraphTest.java
index 46bcba81f..e41b20213 100644
--- a/src/test/com/opensymphony/webwork/sitegraph/SiteGraphTest.java
+++ b/src/test/com/opensymphony/webwork/sitegraph/SiteGraphTest.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.sitegraph;
+package org.apache.struts.action2.sitegraph;
 
 import com.opensymphony.util.FileUtils;
-import com.opensymphony.webwork.WebWorkTestCase;
+import org.apache.struts.action2.WebWorkTestCase;
 
 import java.io.File;
 import java.io.StringWriter;
diff --git a/src/test/com/opensymphony/webwork/sitegraph/xwork.xml b/src/test/com/opensymphony/webwork/sitegraph/xwork.xml
index 92c2c5e39..b3ccec9cd 100644
--- a/src/test/com/opensymphony/webwork/sitegraph/xwork.xml
+++ b/src/test/com/opensymphony/webwork/sitegraph/xwork.xml
@@ -13,7 +13,7 @@
     <package name="tutorial" namespace="/tutorial" extends="webwork-default">
         <result-types>
             <result-type name="freemarker" default="true"
-                         class="com.opensymphony.webwork.views.freemarker.FreemarkerResult"/>
+                         class="org.apache.struts.action2.views.freemarker.FreemarkerResult"/>
         </result-types>
 
         <action name="test" class="com.opensymphony.xwork.ActionSupport">
@@ -24,7 +24,7 @@
     <package name="sitegraph" namespace="/tutorial/sitegraph" extends="webwork-default">
         <result-types>
             <result-type name="freemarker" default="true"
-                         class="com.opensymphony.webwork.views.freemarker.FreemarkerResult"/>
+                         class="org.apache.struts.action2.views.freemarker.FreemarkerResult"/>
         </result-types>
 
         <action name="guess" class="com.opensymphony.xwork.ActionSupport">
diff --git a/src/test/com/opensymphony/webwork/spring/WebWorkSpringObjectFactoryTest.java b/src/test/com/opensymphony/webwork/spring/WebWorkSpringObjectFactoryTest.java
index 05240fb07..dd4ed0a4e 100644
--- a/src/test/com/opensymphony/webwork/spring/WebWorkSpringObjectFactoryTest.java
+++ b/src/test/com/opensymphony/webwork/spring/WebWorkSpringObjectFactoryTest.java
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.spring;
+package org.apache.struts.action2.spring;
 
-import com.opensymphony.webwork.WebWorkConstants;
-import com.opensymphony.webwork.config.Configuration;
+import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.config.Configuration;
 import junit.framework.TestCase;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 import org.springframework.mock.web.MockServletContext;
diff --git a/src/test/com/opensymphony/webwork/util/CounterTest.java b/src/test/com/opensymphony/webwork/util/CounterTest.java
index f1f48d934..0baafaf51 100644
--- a/src/test/com/opensymphony/webwork/util/CounterTest.java
+++ b/src/test/com/opensymphony/webwork/util/CounterTest.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.util;
+package org.apache.struts.action2.util;
 
 import junit.framework.TestCase;
 
diff --git a/src/test/com/opensymphony/webwork/util/InvocationSessionStoreTest.java b/src/test/com/opensymphony/webwork/util/InvocationSessionStoreTest.java
index f9af7d840..d60cb43e8 100644
--- a/src/test/com/opensymphony/webwork/util/InvocationSessionStoreTest.java
+++ b/src/test/com/opensymphony/webwork/util/InvocationSessionStoreTest.java
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.util;
+package org.apache.struts.action2.util;
 
 import com.mockobjects.dynamic.Mock;
-import com.opensymphony.webwork.WebWorkTestCase;
+import org.apache.struts.action2.WebWorkTestCase;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.ActionProxy;
@@ -22,8 +22,8 @@ import java.util.Map;
  */
 public class InvocationSessionStoreTest extends WebWorkTestCase {
 
-    private static final String INVOCATION_KEY = "com.opensymphony.webwork.util.InvocationSessionStoreTest.invocation";
-    private static final String TOKEN_VALUE = "com.opensymphony.webwork.util.InvocationSessionStoreTest.token";
+    private static final String INVOCATION_KEY = "org.apache.struts.action2.util.InvocationSessionStoreTest.invocation";
+    private static final String TOKEN_VALUE = "org.apache.struts.action2.util.InvocationSessionStoreTest.token";
 
 
     private ActionInvocation invocation;
diff --git a/src/test/com/opensymphony/webwork/util/PrefixTrieTest.java b/src/test/com/opensymphony/webwork/util/PrefixTrieTest.java
index 79fc4d8a7..49377e880 100644
--- a/src/test/com/opensymphony/webwork/util/PrefixTrieTest.java
+++ b/src/test/com/opensymphony/webwork/util/PrefixTrieTest.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.util;
+package org.apache.struts.action2.util;
 
 import junit.framework.TestCase;
 
diff --git a/src/test/com/opensymphony/webwork/util/TokenHelperTest.java b/src/test/com/opensymphony/webwork/util/TokenHelperTest.java
index 9b9022403..0d9fda728 100644
--- a/src/test/com/opensymphony/webwork/util/TokenHelperTest.java
+++ b/src/test/com/opensymphony/webwork/util/TokenHelperTest.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.util;
+package org.apache.struts.action2.util;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/test/com/opensymphony/webwork/util/WebWorkTypeConverterTest.java b/src/test/com/opensymphony/webwork/util/WebWorkTypeConverterTest.java
index 8eb50c985..db5312b30 100644
--- a/src/test/com/opensymphony/webwork/util/WebWorkTypeConverterTest.java
+++ b/src/test/com/opensymphony/webwork/util/WebWorkTypeConverterTest.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.util;
+package org.apache.struts.action2.util;
 
 import java.util.Date;
 import java.util.HashMap;
diff --git a/src/test/com/opensymphony/webwork/views/TemplateEngineManagerTest.java b/src/test/com/opensymphony/webwork/views/TemplateEngineManagerTest.java
index c413efdbb..f01d4f4e2 100644
--- a/src/test/com/opensymphony/webwork/views/TemplateEngineManagerTest.java
+++ b/src/test/com/opensymphony/webwork/views/TemplateEngineManagerTest.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views;
+package org.apache.struts.action2.views;
 
-import com.opensymphony.webwork.components.template.*;
-import com.opensymphony.webwork.config.Configuration;
+import org.apache.struts.action2.components.template.*;
+import org.apache.struts.action2.config.Configuration;
 import junit.framework.TestCase;
 
 /**
diff --git a/src/test/com/opensymphony/webwork/views/freemarker/FreemarkerManagerTest.java b/src/test/com/opensymphony/webwork/views/freemarker/FreemarkerManagerTest.java
index 169527274..1881eba86 100644
--- a/src/test/com/opensymphony/webwork/views/freemarker/FreemarkerManagerTest.java
+++ b/src/test/com/opensymphony/webwork/views/freemarker/FreemarkerManagerTest.java
@@ -2,12 +2,12 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.freemarker;
+package org.apache.struts.action2.views.freemarker;
 
 import com.mockobjects.servlet.MockServletContext;
-import com.opensymphony.webwork.WebWorkConstants;
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.views.jsp.WebWorkMockServletContext;
+import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.views.jsp.WebWorkMockServletContext;
 
 import junit.framework.TestCase;
 
diff --git a/src/test/com/opensymphony/webwork/views/freemarker/FreemarkerTest.java b/src/test/com/opensymphony/webwork/views/freemarker/FreemarkerTest.java
index 6e1102bdd..843363888 100644
--- a/src/test/com/opensymphony/webwork/views/freemarker/FreemarkerTest.java
+++ b/src/test/com/opensymphony/webwork/views/freemarker/FreemarkerTest.java
@@ -6,10 +6,10 @@
  * Created on 1/10/2003
  *
  */
-package com.opensymphony.webwork.views.freemarker;
+package org.apache.struts.action2.views.freemarker;
 
-import com.opensymphony.webwork.util.ListEntry;
-import com.opensymphony.webwork.util.WebWorkUtil;
+import org.apache.struts.action2.util.ListEntry;
+import org.apache.struts.action2.util.WebWorkUtil;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import freemarker.ext.beans.CollectionModel;
diff --git a/src/test/com/opensymphony/webwork/views/freemarker/TestAction.java b/src/test/com/opensymphony/webwork/views/freemarker/TestAction.java
index 381af65a0..78a364561 100644
--- a/src/test/com/opensymphony/webwork/views/freemarker/TestAction.java
+++ b/src/test/com/opensymphony/webwork/views/freemarker/TestAction.java
@@ -1,7 +1,7 @@
 /* * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.freemarker;
+package org.apache.struts.action2.views.freemarker;
 
 import com.opensymphony.xwork.ActionSupport;
 
diff --git a/src/test/com/opensymphony/webwork/views/freemarker/TestBean.java b/src/test/com/opensymphony/webwork/views/freemarker/TestBean.java
index 6fac9253b..05dab1c2c 100644
--- a/src/test/com/opensymphony/webwork/views/freemarker/TestBean.java
+++ b/src/test/com/opensymphony/webwork/views/freemarker/TestBean.java
@@ -6,7 +6,7 @@
  * Created on 1/10/2003
  *
  */
-package com.opensymphony.webwork.views.freemarker;
+package org.apache.struts.action2.views.freemarker;
 
 
 /**
diff --git a/src/test/com/opensymphony/webwork/views/jsp/AbstractTagTest.java b/src/test/com/opensymphony/webwork/views/jsp/AbstractTagTest.java
index 1c54cbea7..996c5a8ad 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/AbstractTagTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/AbstractTagTest.java
@@ -2,16 +2,16 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp;
+package org.apache.struts.action2.views.jsp;
 
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.TestAction;
-import com.opensymphony.webwork.WebWorkTestCase;
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.dispatcher.ApplicationMap;
-import com.opensymphony.webwork.dispatcher.DispatcherUtils;
-import com.opensymphony.webwork.dispatcher.RequestMap;
-import com.opensymphony.webwork.dispatcher.SessionMap;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.TestAction;
+import org.apache.struts.action2.WebWorkTestCase;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.dispatcher.ApplicationMap;
+import org.apache.struts.action2.dispatcher.DispatcherUtils;
+import org.apache.struts.action2.dispatcher.RequestMap;
+import org.apache.struts.action2.dispatcher.SessionMap;
 import com.opensymphony.xwork.Action;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.util.OgnlValueStack;
diff --git a/src/test/com/opensymphony/webwork/views/jsp/AbstractUITagTest.java b/src/test/com/opensymphony/webwork/views/jsp/AbstractUITagTest.java
index 60a54133b..7c2cad2aa 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/AbstractUITagTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/AbstractUITagTest.java
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp;
+package org.apache.struts.action2.views.jsp;
 
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.views.jsp.ui.AbstractUITag;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.views.jsp.ui.AbstractUITag;
 import com.opensymphony.xwork.ActionContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -132,11 +132,11 @@ public abstract class AbstractUITagTest extends AbstractTagTest {
 
     /**
      * Initialize a map of {@link PropertyHolder} for generic tag property testing. Will be used when calling {@link
-     * #verifyGenericProperties(com.opensymphony.webwork.views.jsp.ui.AbstractUITag, String, String[])} as properties to
+     * #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag, String, String[])} as properties to
      * verify.<p/> This implementation defines testdata for all common AbstractUITag properties and may be overridden in
      * subclasses.
      *
-     * @return A Map of PropertyHolders values bound to {@link com.opensymphony.webwork.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
+     * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
      *         as key.
      */
     protected Map initializedGenericTagTestProperties() {
@@ -171,7 +171,7 @@ public abstract class AbstractUITagTest extends AbstractTagTest {
     /**
      * Do a generic verification that setting certain properties on a tag causes expected output regarding this
      * property. In most cases you would not call this directly, instead use {@link
-     * #verifyGenericProperties(com.opensymphony.webwork.views.jsp.ui.AbstractUITag, String, String[])}.
+     * #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag, String, String[])}.
      *
      * @param tag              The fresh created tag instance to test.
      * @param theme            The theme to use. If <tt>null</tt>, use configured default theme.
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ActionTagTest.java b/src/test/com/opensymphony/webwork/views/jsp/ActionTagTest.java
index 0708bab3c..674624d4a 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ActionTagTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ActionTagTest.java
@@ -2,13 +2,13 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp;
+package org.apache.struts.action2.views.jsp;
 
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.TestAction;
-import com.opensymphony.webwork.TestActionTagResult;
-import com.opensymphony.webwork.TestConfigurationProvider;
-import com.opensymphony.webwork.components.ActionComponent;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.TestAction;
+import org.apache.struts.action2.TestActionTagResult;
+import org.apache.struts.action2.TestConfigurationProvider;
+import org.apache.struts.action2.components.ActionComponent;
 import com.opensymphony.xwork.Action;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionProxy;
diff --git a/src/test/com/opensymphony/webwork/views/jsp/AnchorTagTest.java b/src/test/com/opensymphony/webwork/views/jsp/AnchorTagTest.java
index 491eed81f..7c24a287e 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/AnchorTagTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/AnchorTagTest.java
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp;
+package org.apache.struts.action2.views.jsp;
 
-import com.opensymphony.webwork.views.jsp.ui.AnchorTag;
-import com.opensymphony.webwork.views.jsp.ui.WebWorkBodyContent;
+import org.apache.struts.action2.views.jsp.ui.AnchorTag;
+import org.apache.struts.action2.views.jsp.ui.WebWorkBodyContent;
 
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.JspWriter;
diff --git a/src/test/com/opensymphony/webwork/views/jsp/AppendIteratorTagTest.java b/src/test/com/opensymphony/webwork/views/jsp/AppendIteratorTagTest.java
index 6b0dd43d5..fab60012a 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/AppendIteratorTagTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/AppendIteratorTagTest.java
@@ -2,13 +2,13 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp;
+package org.apache.struts.action2.views.jsp;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import com.opensymphony.webwork.views.jsp.iterator.AppendIteratorTag;
+import org.apache.struts.action2.views.jsp.iterator.AppendIteratorTag;
 import com.opensymphony.xwork.Action;
 import com.opensymphony.xwork.ActionSupport;
 
diff --git a/src/test/com/opensymphony/webwork/views/jsp/BeanTagTest.java b/src/test/com/opensymphony/webwork/views/jsp/BeanTagTest.java
index e501e9fe8..a5960b7b7 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/BeanTagTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/BeanTagTest.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp;
+package org.apache.struts.action2.views.jsp;
 
 import javax.servlet.jsp.JspException;
 
@@ -18,7 +18,7 @@ public class BeanTagTest extends AbstractUITagTest {
     public void testSimple() {
         BeanTag tag = new BeanTag();
         tag.setPageContext(pageContext);
-        tag.setName("com.opensymphony.webwork.TestAction");
+        tag.setName("org.apache.struts.action2.TestAction");
 
         try {
             tag.doStartTag();
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ElseIfTagTest.java b/src/test/com/opensymphony/webwork/views/jsp/ElseIfTagTest.java
index b0fc853d8..2aa612b81 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ElseIfTagTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ElseIfTagTest.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp;
+package org.apache.struts.action2.views.jsp;
 
 import javax.servlet.jsp.JspWriter;
 import javax.servlet.jsp.PageContext;
@@ -11,8 +11,8 @@ import javax.servlet.jsp.tagext.TagSupport;
 
 import com.mockobjects.servlet.MockJspWriter;
 import com.mockobjects.servlet.MockPageContext;
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.components.If;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.components.If;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import junit.framework.TestCase;
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ElseTagTest.java b/src/test/com/opensymphony/webwork/views/jsp/ElseTagTest.java
index 9409990c7..816047386 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ElseTagTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ElseTagTest.java
@@ -2,12 +2,12 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp;
+package org.apache.struts.action2.views.jsp;
 
 import com.mockobjects.servlet.MockJspWriter;
 import com.mockobjects.servlet.MockPageContext;
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.components.If;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.components.If;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import junit.framework.TestCase;
 
diff --git a/src/test/com/opensymphony/webwork/views/jsp/IfTagTest.java b/src/test/com/opensymphony/webwork/views/jsp/IfTagTest.java
index b81613f9d..69cd3798c 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/IfTagTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/IfTagTest.java
@@ -2,13 +2,13 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp;
+package org.apache.struts.action2.views.jsp;
 
 import com.mockobjects.servlet.MockJspWriter;
 import com.mockobjects.servlet.MockPageContext;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.util.OgnlValueStack;
-import com.opensymphony.webwork.ServletActionContext;
+import org.apache.struts.action2.ServletActionContext;
 import junit.framework.TestCase;
 
 import javax.servlet.jsp.JspException;
diff --git a/src/test/com/opensymphony/webwork/views/jsp/IncludeTagTest.java b/src/test/com/opensymphony/webwork/views/jsp/IncludeTagTest.java
index 6314b72b8..8f3cd9464 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/IncludeTagTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/IncludeTagTest.java
@@ -2,10 +2,10 @@
  *  Copyright (c) 2002-2006 by OpenSymphony
  *  All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp;
+package org.apache.struts.action2.views.jsp;
 
 import com.mockobjects.servlet.MockRequestDispatcher;
-import com.opensymphony.webwork.components.Include;
+import org.apache.struts.action2.components.Include;
 import org.easymock.MockControl;
 
 import javax.servlet.RequestDispatcher;
diff --git a/src/test/com/opensymphony/webwork/views/jsp/IteratorGeneratorTagTest.java b/src/test/com/opensymphony/webwork/views/jsp/IteratorGeneratorTagTest.java
index d4fb3b6e3..26e9b2079 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/IteratorGeneratorTagTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/IteratorGeneratorTagTest.java
@@ -2,12 +2,12 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp;
+package org.apache.struts.action2.views.jsp;
 
 import java.util.Iterator;
 
-import com.opensymphony.webwork.util.IteratorGenerator.Converter;
-import com.opensymphony.webwork.views.jsp.iterator.IteratorGeneratorTag;
+import org.apache.struts.action2.util.IteratorGenerator.Converter;
+import org.apache.struts.action2.views.jsp.iterator.IteratorGeneratorTag;
 import com.opensymphony.xwork.Action;
 import com.opensymphony.xwork.ActionSupport;
 
diff --git a/src/test/com/opensymphony/webwork/views/jsp/IteratorTagTest.java b/src/test/com/opensymphony/webwork/views/jsp/IteratorTagTest.java
index 821b0b135..2032f1175 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/IteratorTagTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/IteratorTagTest.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp;
+package org.apache.struts.action2.views.jsp;
 
 import com.mockobjects.servlet.MockBodyContent;
 import com.mockobjects.servlet.MockJspWriter;
diff --git a/src/test/com/opensymphony/webwork/views/jsp/MergeIteratorTagTest.java b/src/test/com/opensymphony/webwork/views/jsp/MergeIteratorTagTest.java
index abf5723fc..02ef88a90 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/MergeIteratorTagTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/MergeIteratorTagTest.java
@@ -2,13 +2,13 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp;
+package org.apache.struts.action2.views.jsp;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import com.opensymphony.webwork.views.jsp.iterator.MergeIteratorTag;
+import org.apache.struts.action2.views.jsp.iterator.MergeIteratorTag;
 import com.opensymphony.xwork.Action;
 import com.opensymphony.xwork.ActionSupport;
 
diff --git a/src/test/com/opensymphony/webwork/views/jsp/PortletUrlTagTest.java b/src/test/com/opensymphony/webwork/views/jsp/PortletUrlTagTest.java
index 19fce0094..9d05d3da1 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/PortletUrlTagTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/PortletUrlTagTest.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package com.opensymphony.webwork.views.jsp;
+package org.apache.struts.action2.views.jsp;
 
 import java.lang.reflect.Field;
 import java.util.Arrays;
@@ -41,11 +41,11 @@ import org.jmock.cglib.MockObjectTestCase;
 import org.jmock.core.Constraint;
 
 import com.mockobjects.servlet.MockJspWriter;
-import com.opensymphony.webwork.components.URL;
-import com.opensymphony.webwork.portlet.PortletActionConstants;
-import com.opensymphony.webwork.portlet.util.PortletUrlHelper;
-import com.opensymphony.webwork.views.jsp.ParamTag;
-import com.opensymphony.webwork.dispatcher.DispatcherUtils;
+import org.apache.struts.action2.components.URL;
+import org.apache.struts.action2.portlet.PortletActionConstants;
+import org.apache.struts.action2.portlet.util.PortletUrlHelper;
+import org.apache.struts.action2.views.jsp.ParamTag;
+import org.apache.struts.action2.dispatcher.DispatcherUtils;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
diff --git a/src/test/com/opensymphony/webwork/views/jsp/PropertyTagTest.java b/src/test/com/opensymphony/webwork/views/jsp/PropertyTagTest.java
index 6ec8fabd9..006909035 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/PropertyTagTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/PropertyTagTest.java
@@ -2,14 +2,14 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp;
+package org.apache.struts.action2.views.jsp;
 
 import com.mockobjects.servlet.MockJspWriter;
 import com.mockobjects.servlet.MockPageContext;
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.WebWorkTestCase;
-import com.opensymphony.webwork.WebWorkConstants;
-import com.opensymphony.webwork.config.Configuration;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.WebWorkTestCase;
+import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.config.Configuration;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
diff --git a/src/test/com/opensymphony/webwork/views/jsp/PushTagTest.java b/src/test/com/opensymphony/webwork/views/jsp/PushTagTest.java
index d33678b2f..6a4421684 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/PushTagTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/PushTagTest.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp;
+package org.apache.struts.action2.views.jsp;
 
 import javax.servlet.jsp.JspException;
 
diff --git a/src/test/com/opensymphony/webwork/views/jsp/SetTagTest.java b/src/test/com/opensymphony/webwork/views/jsp/SetTagTest.java
index 76eb63249..2ae43c929 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/SetTagTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/SetTagTest.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp;
+package org.apache.struts.action2.views.jsp;
 
 import javax.servlet.jsp.JspException;
 
diff --git a/src/test/com/opensymphony/webwork/views/jsp/SortIteratorTagTest.java b/src/test/com/opensymphony/webwork/views/jsp/SortIteratorTagTest.java
index 077753b62..30ecece06 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/SortIteratorTagTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/SortIteratorTagTest.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp;
+package org.apache.struts.action2.views.jsp;
 
-import com.opensymphony.webwork.views.jsp.iterator.SortIteratorTag;
+import org.apache.struts.action2.views.jsp.iterator.SortIteratorTag;
 import com.opensymphony.xwork.Action;
 import com.opensymphony.xwork.ActionSupport;
 
diff --git a/src/test/com/opensymphony/webwork/views/jsp/SubsetIteratorTagTest.java b/src/test/com/opensymphony/webwork/views/jsp/SubsetIteratorTagTest.java
index 8f35f9211..2f042615b 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/SubsetIteratorTagTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/SubsetIteratorTagTest.java
@@ -2,14 +2,14 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp;
+package org.apache.struts.action2.views.jsp;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import com.opensymphony.webwork.util.SubsetIteratorFilter.Decider;
-import com.opensymphony.webwork.views.jsp.iterator.SubsetIteratorTag;
+import org.apache.struts.action2.util.SubsetIteratorFilter.Decider;
+import org.apache.struts.action2.views.jsp.iterator.SubsetIteratorTag;
 import com.opensymphony.xwork.Action;
 import com.opensymphony.xwork.ActionSupport;
 
diff --git a/src/test/com/opensymphony/webwork/views/jsp/TextTagTest.java b/src/test/com/opensymphony/webwork/views/jsp/TextTagTest.java
index db3b1aa48..889629026 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/TextTagTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/TextTagTest.java
@@ -2,13 +2,13 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp;
+package org.apache.struts.action2.views.jsp;
 
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.TestAction;
-import com.opensymphony.webwork.components.Text;
-import com.opensymphony.webwork.views.jsp.ui.TestAction1;
-import com.opensymphony.webwork.views.jsp.ui.WebWorkBodyContent;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.TestAction;
+import org.apache.struts.action2.components.Text;
+import org.apache.struts.action2.views.jsp.ui.TestAction1;
+import org.apache.struts.action2.views.jsp.ui.WebWorkBodyContent;
 import com.opensymphony.xwork.Action;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.util.OgnlValueStack;
@@ -29,7 +29,7 @@ import java.util.Locale;
  */
 public class TextTagTest extends AbstractTagTest {
 
-    private String fooValue = "com.opensymphony.webwork.views.jsp.TextTagTest.fooValue";
+    private String fooValue = "org.apache.struts.action2.views.jsp.TextTagTest.fooValue";
     private TextTag tag;
 
 
diff --git a/src/test/com/opensymphony/webwork/views/jsp/URLTagTest.java b/src/test/com/opensymphony/webwork/views/jsp/URLTagTest.java
index 6ce6770d7..764f4dd6d 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/URLTagTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/URLTagTest.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp;
+package org.apache.struts.action2.views.jsp;
 
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.JspWriter;
diff --git a/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockBodyContent.java b/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockBodyContent.java
index 5256e8c11..fc2dfd8ca 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockBodyContent.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockBodyContent.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp;
+package org.apache.struts.action2.views.jsp;
 
 import javax.servlet.jsp.JspWriter;
 import javax.servlet.jsp.tagext.BodyContent;
diff --git a/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockHttpServletRequest.java b/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockHttpServletRequest.java
index 80e0e3884..4709f456c 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockHttpServletRequest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockHttpServletRequest.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp;
+package org.apache.struts.action2.views.jsp;
 
 import com.mockobjects.servlet.MockHttpServletRequest;
 import junit.framework.AssertionFailedError;
diff --git a/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockHttpServletResponse.java b/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockHttpServletResponse.java
index 85e442869..3d66f03f9 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockHttpServletResponse.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockHttpServletResponse.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp;
+package org.apache.struts.action2.views.jsp;
 
 import com.mockobjects.servlet.MockHttpServletResponse;
 
diff --git a/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockHttpSession.java b/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockHttpSession.java
index 748d87ddd..d5e79c47f 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockHttpSession.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockHttpSession.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp;
+package org.apache.struts.action2.views.jsp;
 
 import com.mockobjects.servlet.MockHttpSession;
 
diff --git a/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockJspWriter.java b/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockJspWriter.java
index 24bfd5992..a8f9cc52d 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockJspWriter.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockJspWriter.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp;
+package org.apache.struts.action2.views.jsp;
 
 import com.mockobjects.servlet.MockJspWriter;
 
diff --git a/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockPageContext.java b/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockPageContext.java
index 769691bf6..23f933a9a 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockPageContext.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockPageContext.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp;
+package org.apache.struts.action2.views.jsp;
 
 import com.mockobjects.servlet.MockPageContext;
 
diff --git a/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockServletContext.java b/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockServletContext.java
index 3b4b53959..333cb241e 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockServletContext.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/WebWorkMockServletContext.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp;
+package org.apache.struts.action2.views.jsp;
 
 import javax.servlet.RequestDispatcher;
 import javax.servlet.Servlet;
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/AbstractRichtexteditorTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/AbstractRichtexteditorTest.java
index d6c619a59..2bb9964b5 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/AbstractRichtexteditorTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/AbstractRichtexteditorTest.java
@@ -2,14 +2,14 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 
 import com.mockobjects.servlet.MockHttpServletResponse;
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
 import com.opensymphony.xwork.mock.MockActionInvocation;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/ActionErrorTagTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/ActionErrorTagTest.java
index a28245dab..eeb2161b6 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/ActionErrorTagTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/ActionErrorTagTest.java
@@ -2,15 +2,15 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
-import com.opensymphony.webwork.views.jsp.ui.ActionErrorTag;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.views.jsp.ui.ActionErrorTag;
 import com.opensymphony.xwork.Action;
 import com.opensymphony.xwork.ActionSupport;
 
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/ActionMessageTagTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/ActionMessageTagTest.java
index bfd25a24c..aec4c6e1b 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/ActionMessageTagTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/ActionMessageTagTest.java
@@ -2,14 +2,14 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
 import com.opensymphony.xwork.Action;
 import com.opensymphony.xwork.ActionSupport;
 
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/AnchorTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/AnchorTest.java
index 097fbd041..512844f6b 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/AnchorTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/AnchorTest.java
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.TestAction;
-import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.TestAction;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
 
 
 /**
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/CheckboxListTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/CheckboxListTest.java
index ed65da8db..bf5d62be5 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/CheckboxListTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/CheckboxListTest.java
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.TestAction;
-import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.TestAction;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -21,11 +21,11 @@ import java.util.Map;
 public class CheckboxListTest extends AbstractUITagTest {
 
     /**
-     * Initialize a map of {@link com.opensymphony.webwork.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
-     * property testing. Will be used when calling {@link #verifyGenericProperties(com.opensymphony.webwork.views.jsp.ui.AbstractUITag,
+     * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
+     * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag,
      * String, String[])} as properties to verify.<p/> This implementation extends testdata from AbstractUITag.
      *
-     * @return A Map of PropertyHolders values bound to {@link com.opensymphony.webwork.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
+     * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
      *         as key.
      */
     protected Map initializedGenericTagTestProperties() {
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/CheckboxTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/CheckboxTest.java
index 4febdddab..f4b5f7b85 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/CheckboxTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/CheckboxTest.java
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.TestAction;
-import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.TestAction;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
 
 import java.util.Map;
 
@@ -20,11 +20,11 @@ public class CheckboxTest extends AbstractUITagTest {
     }
 
     /**
-     * Initialize a map of {@link com.opensymphony.webwork.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
-     * property testing. Will be used when calling {@link #verifyGenericProperties(com.opensymphony.webwork.views.jsp.ui.AbstractUITag,
+     * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
+     * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag,
      * String, String[])} as properties to verify.<p/> This implementation extends testdata from AbstractUITag.
      *
-     * @return A Map of PropertyHolders values bound to {@link com.opensymphony.webwork.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
+     * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
      *         as key.
      */
     protected Map initializedGenericTagTestProperties() {
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/ComboBoxTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/ComboBoxTest.java
index 7fe30f188..a6e7eff91 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/ComboBoxTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/ComboBoxTest.java
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.TestAction;
-import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.TestAction;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/Component-param.txt b/src/test/com/opensymphony/webwork/views/jsp/ui/Component-param.txt
index 6535dd10e..3805eaa8a 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/Component-param.txt
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/Component-param.txt
@@ -1,7 +1,7 @@
 param hello     = world
 param argle     = bargle
 param glip      = glop
-param obj.Class = class com.opensymphony.webwork.views.jsp.ui.ComponentTag
+param obj.Class = class org.apache.struts.action2.views.jsp.ui.ComponentTag
 
 param array[0] = a
 param array[1] = b
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/ComponentTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/ComponentTest.java
index fb3688719..7d87f338b 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/ComponentTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/ComponentTest.java
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.TestAction;
-import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.TestAction;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
 
 
 /**
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/DatePickerTagTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/DatePickerTagTest.java
index c30ed6b5f..45299de70 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/DatePickerTagTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/DatePickerTagTest.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
 import com.opensymphony.xwork.ActionContext;
 
 import java.util.Locale;
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/DateTagTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/DateTagTest.java
index 42b4edb8a..40cef8ee7 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/DateTagTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/DateTagTest.java
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.views.jsp.AbstractTagTest;
-import com.opensymphony.webwork.views.jsp.DateTag;
+import org.apache.struts.action2.views.jsp.AbstractTagTest;
+import org.apache.struts.action2.views.jsp.DateTag;
 import com.opensymphony.xwork.ActionContext;
 
 import java.text.DateFormat;
@@ -14,7 +14,7 @@ import java.util.Calendar;
 import java.util.Date;
 
 /**
- * Unit test for {@link com.opensymphony.webwork.components.Date}.
+ * Unit test for {@link org.apache.struts.action2.components.Date}.
  *
  * @author Claus Ibsen
  */
@@ -62,7 +62,7 @@ public class DateTagTest extends AbstractTagTest {
         tag.doStartTag();
 
         // component test must be done between start and end tag
-        com.opensymphony.webwork.components.Date component = (com.opensymphony.webwork.components.Date) tag.getComponent();
+        org.apache.struts.action2.components.Date component = (org.apache.struts.action2.components.Date) tag.getComponent();
         assertEquals("myDate", component.getName());
         assertEquals(format, component.getFormat());
         assertEquals(false, component.isNice());
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/DebugTagTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/DebugTagTest.java
index 9a13af189..612979082 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/DebugTagTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/DebugTagTest.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
 
 /**
  * Unit test for {@link DebugTag}.
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/DivTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/DivTest.java
index c327ed111..9022fd726 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/DivTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/DivTest.java
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.TestAction;
-import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.TestAction;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
 
 
 /**
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/DoubleSelectTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/DoubleSelectTest.java
index db9ff9061..f511eb017 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/DoubleSelectTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/DoubleSelectTest.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.TestAction;
-import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.TestAction;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/FieldErrorTagTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/FieldErrorTagTest.java
index 0291cad4c..643ecb24a 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/FieldErrorTagTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/FieldErrorTagTest.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -10,8 +10,8 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
-import com.opensymphony.webwork.views.jsp.ParamTag;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.views.jsp.ParamTag;
 import com.opensymphony.xwork.Action;
 import com.opensymphony.xwork.ActionSupport;
 
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/FileTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/FileTest.java
index 44d21ede9..1eb301cdb 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/FileTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/FileTest.java
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.TestAction;
-import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.TestAction;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
 
 import java.util.Map;
 
@@ -41,11 +41,11 @@ public class FileTest extends AbstractUITagTest {
     }
 
     /**
-     * Initialize a map of {@link com.opensymphony.webwork.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
-     * property testing. Will be used when calling {@link #verifyGenericProperties(com.opensymphony.webwork.views.jsp.ui.AbstractUITag,
+     * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
+     * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag,
      * String, String[])} as properties to verify.<p/> This implementation extends testdata from AbstractUITag.
      *
-     * @return A Map of PropertyHolders values bound to {@link com.opensymphony.webwork.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
+     * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
      *         as key.
      */
     protected Map initializedGenericTagTestProperties() {
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/FormTagTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/FormTagTest.java
index a20d4002d..d126101b0 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/FormTagTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/FormTagTest.java
@@ -2,14 +2,14 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.TestAction;
-import com.opensymphony.webwork.TestConfigurationProvider;
-import com.opensymphony.webwork.WebWorkConstants;
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
-import com.opensymphony.webwork.views.jsp.ActionTag;
+import org.apache.struts.action2.TestAction;
+import org.apache.struts.action2.TestConfigurationProvider;
+import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.views.jsp.ActionTag;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.config.ConfigurationManager;
 
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/HeadTagTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/HeadTagTest.java
index a66767ed5..bdd7854ff 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/HeadTagTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/HeadTagTest.java
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
-import com.opensymphony.webwork.components.Head;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.components.Head;
 
 /**
  * Unit test for {@link HeadTag}.
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/HiddenTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/HiddenTest.java
index 46f33ea17..6a78e251a 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/HiddenTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/HiddenTest.java
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.TestAction;
-import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.TestAction;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
 
 import java.util.Map;
 import java.util.HashMap;
@@ -35,11 +35,11 @@ public class HiddenTest extends AbstractUITagTest {
     }
 
     /**
-     * Initialize a map of {@link com.opensymphony.webwork.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
-     * property testing. Will be used when calling {@link #verifyGenericProperties(com.opensymphony.webwork.views.jsp.ui.AbstractUITag,
+     * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
+     * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag,
      * String, String[])} as properties to verify.<p/> This implementation extends testdata from AbstractUITag.
      *
-     * @return A Map of PropertyHolders values bound to {@link com.opensymphony.webwork.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
+     * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
      *         as key.
      */
     protected Map initializedGenericTagTestProperties() {
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/JspTemplateTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/JspTemplateTest.java
index 053ad4607..4545216bf 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/JspTemplateTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/JspTemplateTest.java
@@ -1,9 +1,9 @@
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
 import com.mockobjects.dynamic.C;
 import com.mockobjects.dynamic.Mock;
-import com.opensymphony.webwork.TestAction;
-import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.TestAction;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
 
 import javax.servlet.RequestDispatcher;
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/LabelTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/LabelTest.java
index dc5edba88..9a9979209 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/LabelTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/LabelTest.java
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.TestAction;
-import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.TestAction;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
 
 import java.util.Map;
 import java.util.HashMap;
@@ -52,11 +52,11 @@ public class LabelTest extends AbstractUITagTest {
     }
 
     /**
-     * Initialize a map of {@link com.opensymphony.webwork.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
-     * property testing. Will be used when calling {@link #verifyGenericProperties(com.opensymphony.webwork.views.jsp.ui.AbstractUITag,
+     * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
+     * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag,
      * String, String[])} as properties to verify.<p/> This implementation extends testdata from AbstractUITag.
      *
-     * @return A Map of PropertyHolders values bound to {@link com.opensymphony.webwork.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
+     * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
      *         as key.
      */
     protected Map initializedGenericTagTestProperties() {
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/MockTag.java b/src/test/com/opensymphony/webwork/views/jsp/ui/MockTag.java
index a171b4eb8..76bda58cd 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/MockTag.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/MockTag.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
 import javax.servlet.jsp.tagext.BodyTagSupport;
 import java.util.Calendar;
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/OptionTransferSelectTagTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/OptionTransferSelectTagTest.java
index 2e5801e2d..1d5f29acc 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/OptionTransferSelectTagTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/OptionTransferSelectTagTest.java
@@ -2,13 +2,13 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.opensymphony.webwork.TestAction;
-import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.TestAction;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
 
 /**
  * 
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/PasswordTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/PasswordTest.java
index 01438336e..986065e5f 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/PasswordTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/PasswordTest.java
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.TestAction;
-import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.TestAction;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
 
 
 /**
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/RadioTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/RadioTest.java
index 350224f62..9834770b1 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/RadioTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/RadioTest.java
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.TestAction;
-import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.TestAction;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
 
 import java.util.HashMap;
 import java.util.ArrayList;
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/ResetTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/ResetTest.java
index baf379b18..fe274a8b1 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/ResetTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/ResetTest.java
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.TestAction;
-import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.TestAction;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -85,11 +85,11 @@ public class ResetTest extends AbstractUITagTest {
     }
 
     /**
-     * Initialize a map of {@link com.opensymphony.webwork.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
+     * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
      * property testing. Will be used when calling {@link #verifyGenericProperties(AbstractUITag,
      * String, String[])} as properties to verify.<p/> This implementation extends testdata from AbstractUITag.
      *
-     * @return A Map of PropertyHolders values bound to {@link com.opensymphony.webwork.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
+     * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
      *         as key.
      */
     protected Map initializedGenericTagTestProperties() {
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/RichTextEditorTagTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/RichTextEditorTagTest.java
index 7c598955c..b84823247 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/RichTextEditorTagTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/RichTextEditorTagTest.java
@@ -2,11 +2,11 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
 import java.util.Locale;
 
-import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
 import com.opensymphony.xwork.ActionContext;
 
 /**
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/RichtexteditorCreateFolderResultTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/RichtexteditorCreateFolderResultTest.java
index 50b55d1c4..f31127e13 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/RichtexteditorCreateFolderResultTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/RichtexteditorCreateFolderResultTest.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.AbstractRichtexteditorConnector;
+import org.apache.struts.action2.components.AbstractRichtexteditorConnector;
 
 
 /**
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/RichtexteditorFileUploadResultTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/RichtexteditorFileUploadResultTest.java
index 2eae1aa58..194e11eee 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/RichtexteditorFileUploadResultTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/RichtexteditorFileUploadResultTest.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.AbstractRichtexteditorConnector;
+import org.apache.struts.action2.components.AbstractRichtexteditorConnector;
 
 /**
  * 
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/RichtexteditorGetFoldersAndFilesResultTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/RichtexteditorGetFoldersAndFilesResultTest.java
index a41eb3f38..e89400c43 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/RichtexteditorGetFoldersAndFilesResultTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/RichtexteditorGetFoldersAndFilesResultTest.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.AbstractRichtexteditorConnector;
+import org.apache.struts.action2.components.AbstractRichtexteditorConnector;
 
 /**
  * 
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/RichtexteditorGetFoldersResultTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/RichtexteditorGetFoldersResultTest.java
index 6e4dee093..d99d6d146 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/RichtexteditorGetFoldersResultTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/RichtexteditorGetFoldersResultTest.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.AbstractRichtexteditorConnector;
+import org.apache.struts.action2.components.AbstractRichtexteditorConnector;
 
 /**
  * Test case for RichtexteditorGetFoldersResultTest.
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/SelectTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/SelectTest.java
index 74d7707e1..ef0e566d9 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/SelectTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/SelectTest.java
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.TestAction;
-import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.TestAction;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/SubmitAjaxTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/SubmitAjaxTest.java
index 799cc9bf7..18ddb242b 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/SubmitAjaxTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/SubmitAjaxTest.java
@@ -2,9 +2,9 @@
  * Copyright:	Copyright (c) From Down & Around, Inc.
  */
 
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
 
 /**
  * @author Ian Roughley
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/SubmitTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/SubmitTest.java
index 53440c4f4..47e290239 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/SubmitTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/SubmitTest.java
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.TestAction;
-import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.TestAction;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
 
 import java.util.Map;
 import java.util.HashMap;
@@ -199,11 +199,11 @@ public class SubmitTest extends AbstractUITagTest {
     }
 
     /**
-     * Initialize a map of {@link com.opensymphony.webwork.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
-     * property testing. Will be used when calling {@link #verifyGenericProperties(com.opensymphony.webwork.views.jsp.ui.AbstractUITag,
+     * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
+     * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag,
      * String, String[])} as properties to verify.<p/> This implementation extends testdata from AbstractUITag.
      *
-     * @return A Map of PropertyHolders values bound to {@link com.opensymphony.webwork.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
+     * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
      *         as key.
      */
     protected Map initializedGenericTagTestProperties() {
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/TestAction1.java b/src/test/com/opensymphony/webwork/views/jsp/ui/TestAction1.java
index aef1b425d..818aa8e0e 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/TestAction1.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/TestAction1.java
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2004 Opensymphony. All Rights Reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
 import com.opensymphony.xwork.ActionSupport;
 
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/TextareaTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/TextareaTest.java
index fc44c0fdf..2fb43beb7 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/TextareaTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/TextareaTest.java
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.TestAction;
-import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.TestAction;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
 
 import java.util.Map;
 
@@ -43,11 +43,11 @@ public class TextareaTest extends AbstractUITagTest {
     }
 
     /**
-     * Initialize a map of {@link com.opensymphony.webwork.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
-     * property testing. Will be used when calling {@link #verifyGenericProperties(com.opensymphony.webwork.views.jsp.ui.AbstractUITag,
+     * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
+     * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag,
      * String, String[])} as properties to verify.<p/> This implementation extends testdata from AbstractUITag.
      *
-     * @return A Map of PropertyHolders values bound to {@link com.opensymphony.webwork.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
+     * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
      *         as key.
      */
     protected Map initializedGenericTagTestProperties() {
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/TextfieldTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/TextfieldTest.java
index ee9c29d0d..4dd5c4f67 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/TextfieldTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/TextfieldTest.java
@@ -2,11 +2,11 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.TestAction;
-import com.opensymphony.webwork.views.freemarker.tags.TextFieldModel;
-import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.TestAction;
+import org.apache.struts.action2.views.freemarker.tags.TextFieldModel;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
 import freemarker.template.TransformControl;
 
 import java.util.HashMap;
@@ -20,11 +20,11 @@ import java.util.Map;
 public class TextfieldTest extends AbstractUITagTest {
 
     /**
-     * Initialize a map of {@link com.opensymphony.webwork.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
-     * property testing. Will be used when calling {@link #verifyGenericProperties(com.opensymphony.webwork.views.jsp.ui.AbstractUITag,
+     * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag
+     * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag,
      * String, String[])} as properties to verify.<p/> This implementation extends testdata from AbstractUITag.
      *
-     * @return A Map of PropertyHolders values bound to {@link com.opensymphony.webwork.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
+     * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()}
      *         as key.
      */
     protected Map initializedGenericTagTestProperties() {
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/TokenTagTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/TokenTagTest.java
index 27924be76..6ea815ffd 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/TokenTagTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/TokenTagTest.java
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.util.TokenHelper;
-import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.util.TokenHelper;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
 
 import javax.servlet.jsp.JspException;
 
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/TooltipTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/TooltipTest.java
index 0c4aef7bc..545ec78d6 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/TooltipTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/TooltipTest.java
@@ -2,14 +2,14 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
 import com.mockobjects.servlet.MockBodyContent;
 import com.mockobjects.servlet.MockJspWriter;
-import com.opensymphony.webwork.TestConfigurationProvider;
-import com.opensymphony.webwork.views.jsp.AbstractUITagTest;
-import com.opensymphony.webwork.views.jsp.ParamTag;
-import com.opensymphony.webwork.views.jsp.WebWorkMockBodyContent;
+import org.apache.struts.action2.TestConfigurationProvider;
+import org.apache.struts.action2.views.jsp.AbstractUITagTest;
+import org.apache.struts.action2.views.jsp.ParamTag;
+import org.apache.struts.action2.views.jsp.WebWorkMockBodyContent;
 import com.opensymphony.xwork.config.ConfigurationManager;
 
 /**
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/UpDownSelectTagTest.java b/src/test/com/opensymphony/webwork/views/jsp/ui/UpDownSelectTagTest.java
index 76bf7b66b..5652f6d06 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/UpDownSelectTagTest.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/UpDownSelectTagTest.java
@@ -2,15 +2,15 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-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.Action;
 import com.opensymphony.xwork.ActionSupport;
 
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/User.java b/src/test/com/opensymphony/webwork/views/jsp/ui/User.java
index 689c7a7de..b13cb1562 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/User.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/User.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
 
 /**
diff --git a/src/test/com/opensymphony/webwork/views/jsp/ui/WebWorkBodyContent.java b/src/test/com/opensymphony/webwork/views/jsp/ui/WebWorkBodyContent.java
index 64214ac54..623a5a4d7 100644
--- a/src/test/com/opensymphony/webwork/views/jsp/ui/WebWorkBodyContent.java
+++ b/src/test/com/opensymphony/webwork/views/jsp/ui/WebWorkBodyContent.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
 import javax.servlet.jsp.JspWriter;
 import javax.servlet.jsp.tagext.BodyContent;
diff --git a/src/test/com/opensymphony/webwork/views/util/ContextUtilTest.java b/src/test/com/opensymphony/webwork/views/util/ContextUtilTest.java
index 24451debb..786b10257 100755
--- a/src/test/com/opensymphony/webwork/views/util/ContextUtilTest.java
+++ b/src/test/com/opensymphony/webwork/views/util/ContextUtilTest.java
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.util;
+package org.apache.struts.action2.views.util;
 
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.WebWorkConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.WebWorkConstants;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import junit.framework.TestCase;
 
diff --git a/src/test/com/opensymphony/webwork/views/util/ResourceUtilTest.java b/src/test/com/opensymphony/webwork/views/util/ResourceUtilTest.java
index 7c46a42af..d65a8b92d 100644
--- a/src/test/com/opensymphony/webwork/views/util/ResourceUtilTest.java
+++ b/src/test/com/opensymphony/webwork/views/util/ResourceUtilTest.java
@@ -3,7 +3,7 @@
  * All rights reserved.
  */
 
-package com.opensymphony.webwork.views.util;
+package org.apache.struts.action2.views.util;
 /**
  * <code>ResourceUtilTest</code>
  *
diff --git a/src/test/com/opensymphony/webwork/views/util/TextUtilTest.java b/src/test/com/opensymphony/webwork/views/util/TextUtilTest.java
index 75e94e403..5243e0acf 100644
--- a/src/test/com/opensymphony/webwork/views/util/TextUtilTest.java
+++ b/src/test/com/opensymphony/webwork/views/util/TextUtilTest.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.util;
+package org.apache.struts.action2.views.util;
 
 import junit.framework.TestCase;
 
diff --git a/src/test/com/opensymphony/webwork/views/util/UrlHelperTest.java b/src/test/com/opensymphony/webwork/views/util/UrlHelperTest.java
index 27369895a..3e8ae5792 100644
--- a/src/test/com/opensymphony/webwork/views/util/UrlHelperTest.java
+++ b/src/test/com/opensymphony/webwork/views/util/UrlHelperTest.java
@@ -2,12 +2,12 @@
  * Copyright (c) 2002-2005 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.util;
+package org.apache.struts.action2.views.util;
 
 import com.mockobjects.dynamic.Mock;
-import com.opensymphony.webwork.WebWorkTestCase;
-import com.opensymphony.webwork.WebWorkConstants;
-import com.opensymphony.webwork.config.Configuration;
+import org.apache.struts.action2.WebWorkTestCase;
+import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.config.Configuration;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/src/test/com/opensymphony/webwork/views/xslt/XSLTResultTest.java b/src/test/com/opensymphony/webwork/views/xslt/XSLTResultTest.java
index 7cd15e594..c566b47ea 100644
--- a/src/test/com/opensymphony/webwork/views/xslt/XSLTResultTest.java
+++ b/src/test/com/opensymphony/webwork/views/xslt/XSLTResultTest.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.xslt;
+package org.apache.struts.action2.views.xslt;
 
-import com.opensymphony.webwork.ServletActionContext;
+import org.apache.struts.action2.ServletActionContext;
 import com.opensymphony.xwork.Action;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.mock.MockActionInvocation;
diff --git a/src/test/webwork.properties b/src/test/webwork.properties
index af7a75eea..d30f2bb48 100644
--- a/src/test/webwork.properties
+++ b/src/test/webwork.properties
@@ -7,7 +7,7 @@ webwork.multipart.maxSize=12345
 webwork.custom.properties=test,com/opensymphony/webwork/othertest
 
 # added the MockTag to the path of Tags that the TagDirective will search through
-webwork.velocity.tag.path = com.opensymphony.webwork.views.velocity.ui, org.displaytag.tags
+webwork.velocity.tag.path = org.apache.struts.action2.views.velocity.ui, org.displaytag.tags
 
 webwork.ui.templateDir = template
 
diff --git a/webapps/blank/src/java/com/opensymphony/webwork/example/HomeAction.java b/webapps/blank/src/java/com/opensymphony/webwork/example/HomeAction.java
index 1d5bec009..bcad09ddc 100644
--- a/webapps/blank/src/java/com/opensymphony/webwork/example/HomeAction.java
+++ b/webapps/blank/src/java/com/opensymphony/webwork/example/HomeAction.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2006, Your Corporation. All Rights Reserved.
  */
 
-package com.opensymphony.webwork.example;
+package org.apache.struts.action2.example;
 
 import com.opensymphony.xwork.ActionSupport;
 
diff --git a/webapps/blank/src/test/com/opensymphony/webwork/example/HomeActionTest.java b/webapps/blank/src/test/com/opensymphony/webwork/example/HomeActionTest.java
index 3b6febab3..63d8b5051 100644
--- a/webapps/blank/src/test/com/opensymphony/webwork/example/HomeActionTest.java
+++ b/webapps/blank/src/test/com/opensymphony/webwork/example/HomeActionTest.java
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2006, Your Corporation. All Rights Reserved.
  */
-package com.opensymphony.webwork.example;
+package org.apache.struts.action2.example;
 
 import com.opensymphony.xwork.ActionSupport;
 
diff --git a/webapps/blank/src/webapp/WEB-INF/classes/xwork.xml b/webapps/blank/src/webapp/WEB-INF/classes/xwork.xml
index c7e48888b..18a3832d3 100644
--- a/webapps/blank/src/webapp/WEB-INF/classes/xwork.xml
+++ b/webapps/blank/src/webapp/WEB-INF/classes/xwork.xml
@@ -7,7 +7,7 @@
 
         <default-action-ref name="home" />
 
-        <action name="home" class="com.opensymphony.webwork.example.HomeAction">
+        <action name="home" class="org.apache.struts.action2.example.HomeAction">
             <result>/WEB-INF/pages/home.jsp</result>
         </action>
 
diff --git a/webapps/blank/src/webapp/WEB-INF/web.xml b/webapps/blank/src/webapp/WEB-INF/web.xml
index 5328756f3..45d5fae67 100644
--- a/webapps/blank/src/webapp/WEB-INF/web.xml
+++ b/webapps/blank/src/webapp/WEB-INF/web.xml
@@ -6,7 +6,7 @@
 
     <filter>
         <filter-name>webwork</filter-name>
-        <filter-class>com.opensymphony.webwork.dispatcher.FilterDispatcher</filter-class>
+        <filter-class>org.apache.struts.action2.dispatcher.FilterDispatcher</filter-class>
     </filter>
 
     <filter-mapping>
diff --git a/webapps/portlet/src/etc/exo/web.xml b/webapps/portlet/src/etc/exo/web.xml
index 2a5fde7f8..4becd48d2 100644
--- a/webapps/portlet/src/etc/exo/web.xml
+++ b/webapps/portlet/src/etc/exo/web.xml
@@ -14,7 +14,7 @@
 	<filter>
 		<filter-name>webwork</filter-name>
 		<filter-class>
-			com.opensymphony.webwork.dispatcher.FilterDispatcher
+			org.apache.struts.action2.dispatcher.FilterDispatcher
 		</filter-class>
 	</filter>
 
@@ -29,7 +29,7 @@
 	</listener>
 	<listener>
 		<listener-class>
-			com.opensymphony.webwork.portlet.context.ServletContextHolderListener
+			org.apache.struts.action2.portlet.context.ServletContextHolderListener
 		</listener-class>
 	</listener>
 	<listener>
@@ -41,7 +41,7 @@
 	<servlet>
 		<servlet-name>preparator</servlet-name>
 		<servlet-class>
-			com.opensymphony.webwork.portlet.context.PreparatorServlet
+			org.apache.struts.action2.portlet.context.PreparatorServlet
 		</servlet-class>
 	</servlet>
 	<servlet>
diff --git a/webapps/portlet/src/etc/gridsphere/web.xml b/webapps/portlet/src/etc/gridsphere/web.xml
index 2836d216b..9f4d657db 100644
--- a/webapps/portlet/src/etc/gridsphere/web.xml
+++ b/webapps/portlet/src/etc/gridsphere/web.xml
@@ -14,7 +14,7 @@
 	<filter>
 		<filter-name>webwork</filter-name>
 		<filter-class>
-			com.opensymphony.webwork.dispatcher.FilterDispatcher
+			org.apache.struts.action2.dispatcher.FilterDispatcher
 		</filter-class>
 	</filter>
 
@@ -29,7 +29,7 @@
 	</listener>
 	<listener>
 		<listener-class>
-			com.opensymphony.webwork.portlet.context.ServletContextHolderListener
+			org.apache.struts.action2.portlet.context.ServletContextHolderListener
 		</listener-class>
 	</listener>
 	<listener>
@@ -41,7 +41,7 @@
 	<servlet>
 		<servlet-name>preparator</servlet-name>
 		<servlet-class>
-			com.opensymphony.webwork.portlet.context.PreparatorServlet
+			org.apache.struts.action2.portlet.context.PreparatorServlet
 		</servlet-class>
 	</servlet>
 	<servlet>
diff --git a/webapps/portlet/src/etc/liferay3.6.1/web.xml b/webapps/portlet/src/etc/liferay3.6.1/web.xml
index 5755df58b..80f49a0d4 100644
--- a/webapps/portlet/src/etc/liferay3.6.1/web.xml
+++ b/webapps/portlet/src/etc/liferay3.6.1/web.xml
@@ -17,7 +17,7 @@
 	<filter>
 		<filter-name>webwork</filter-name>
 		<filter-class>
-			com.opensymphony.webwork.dispatcher.FilterDispatcher
+			org.apache.struts.action2.dispatcher.FilterDispatcher
 		</filter-class>
 	</filter>
 
@@ -37,7 +37,7 @@
 	</listener>
 	<listener>
 		<listener-class>
-			com.opensymphony.webwork.portlet.context.ServletContextHolderListener
+			org.apache.struts.action2.portlet.context.ServletContextHolderListener
 		</listener-class>
 	</listener>
 
@@ -50,7 +50,7 @@
 		<init-param>
 			<param-name>portlet-class</param-name>
 			<param-value>
-				com.opensymphony.webwork.portlet.dispatcher.Jsr168Dispatcher
+				org.apache.struts.action2.portlet.dispatcher.Jsr168Dispatcher
 			</param-value>
 		</init-param>
 		<load-on-startup>0</load-on-startup>
@@ -59,7 +59,7 @@
 	<servlet>
 		<servlet-name>preparator</servlet-name>
 		<servlet-class>
-			com.opensymphony.webwork.portlet.context.PreparatorServlet
+			org.apache.struts.action2.portlet.context.PreparatorServlet
 		</servlet-class>
 	</servlet>
 	<servlet>
diff --git a/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/ChartExampleAction.java b/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/ChartExampleAction.java
index ee179576a..859c903f1 100644
--- a/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/ChartExampleAction.java
+++ b/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/ChartExampleAction.java
@@ -4,7 +4,7 @@
  * TODO To change the template for this generated file go to
  * Window - Preferences - Java - Code Style - Code Templates
  */
-package com.opensymphony.webwork.portlet.example;
+package org.apache.struts.action2.portlet.example;
 
 import java.util.Date;
 import java.util.Map;
diff --git a/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/ExampleAction.java b/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/ExampleAction.java
index 28b1f7cec..edd33f944 100644
--- a/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/ExampleAction.java
+++ b/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/ExampleAction.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.portlet.example;
+package org.apache.struts.action2.portlet.example;
 
 import java.util.Map;
 
diff --git a/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/FormExample.java b/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/FormExample.java
index b0c4f10fd..e174ebb30 100644
--- a/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/FormExample.java
+++ b/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/FormExample.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.portlet.example;
+package org.apache.struts.action2.portlet.example;
 
 import com.opensymphony.xwork.ActionSupport;
 
diff --git a/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/FormExampleWithValidation.java b/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/FormExampleWithValidation.java
index 49bf594d9..5bbd6b5df 100644
--- a/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/FormExampleWithValidation.java
+++ b/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/FormExampleWithValidation.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.portlet.example;
+package org.apache.struts.action2.portlet.example;
 
 import com.opensymphony.xwork.ActionSupport;
 
diff --git a/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/FormResultAction.java b/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/FormResultAction.java
index 7f7a820ba..44af04fb5 100644
--- a/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/FormResultAction.java
+++ b/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/FormResultAction.java
@@ -2,14 +2,14 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.portlet.example;
+package org.apache.struts.action2.portlet.example;
 
 import java.util.Collection;
 import java.util.Map;
 
 import javax.portlet.RenderRequest;
 
-import com.opensymphony.webwork.portlet.context.PortletActionContext;
+import org.apache.struts.action2.portlet.context.PortletActionContext;
 import com.opensymphony.xwork.ActionSupport;
 
 /**
diff --git a/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/FormTestAction.java b/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/FormTestAction.java
index 105541959..f742c80d6 100644
--- a/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/FormTestAction.java
+++ b/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/FormTestAction.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.portlet.example;
+package org.apache.struts.action2.portlet.example;
 
 import com.opensymphony.xwork.ActionSupport;
 
diff --git a/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/SavePrefsAction.java b/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/SavePrefsAction.java
index affe9327f..1f9a19f39 100644
--- a/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/SavePrefsAction.java
+++ b/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/SavePrefsAction.java
@@ -2,12 +2,12 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.portlet.example;
+package org.apache.struts.action2.portlet.example;
 
 import javax.portlet.ActionRequest;
 import javax.portlet.PortletPreferences;
 
-import com.opensymphony.webwork.portlet.context.PortletActionContext;
+import org.apache.struts.action2.portlet.context.PortletActionContext;
 import com.opensymphony.xwork.ActionSupport;
 
 /**
diff --git a/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/spring/SpringAction.java b/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/spring/SpringAction.java
index 60d7ef821..267d8b949 100644
--- a/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/spring/SpringAction.java
+++ b/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/spring/SpringAction.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.portlet.example.spring;
+package org.apache.struts.action2.portlet.example.spring;
 
 import java.util.List;
 
diff --git a/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/spring/ThingManager.java b/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/spring/ThingManager.java
index 933962103..5adc9dc64 100644
--- a/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/spring/ThingManager.java
+++ b/webapps/portlet/src/java/com/opensymphony/webwork/portlet/example/spring/ThingManager.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.portlet.example.spring;
+package org.apache.struts.action2.portlet.example.spring;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/webapps/portlet/src/java/xwork.xml b/webapps/portlet/src/java/xwork.xml
index ae9f6d57a..68486b298 100644
--- a/webapps/portlet/src/java/xwork.xml
+++ b/webapps/portlet/src/java/xwork.xml
@@ -16,19 +16,19 @@
 			<result name="success">/WEB-INF/view/index.jsp</result>
 		</action>
 
-		<action name="chartExample" class="com.opensymphony.webwork.portlet.example.ChartExampleAction">
+		<action name="chartExample" class="org.apache.struts.action2.portlet.example.ChartExampleAction">
 			<result name="success">/WEB-INF/view/chartExample.jsp</result>
 		</action>
 
 		<action name="formExample"
-			class="com.opensymphony.webwork.portlet.example.FormExample" method="input">
+			class="org.apache.struts.action2.portlet.example.FormExample" method="input">
 			<result name="input">
 				/WEB-INF/view/formExampleInput.jsp
 			</result>
 		</action>
 
 		<action name="processFormExample"
-			class="com.opensymphony.webwork.portlet.example.FormExample">
+			class="org.apache.struts.action2.portlet.example.FormExample">
 			<result name="input">
 				/WEB-INF/view/formExampleInput.jsp
 			</result>
@@ -38,14 +38,14 @@
 		</action>
 
 		<action name="validationExample"
-			class="com.opensymphony.webwork.portlet.example.FormExample" method="input">
+			class="org.apache.struts.action2.portlet.example.FormExample" method="input">
 			<result name="input">
 				/WEB-INF/view/formExampleInputValidation.jsp
 			</result>
 		</action>
 
 		<action name="processValidationExample"
-			class="com.opensymphony.webwork.portlet.example.FormExample">
+			class="org.apache.struts.action2.portlet.example.FormExample">
 			<result name="success">
 				/WEB-INF/view/formExample.jsp
 			</result>
@@ -103,11 +103,11 @@
 		</action>
 
 		<action name="processFreeMarkerExample"
-			class="com.opensymphony.webwork.portlet.example.FormExample">
+			class="org.apache.struts.action2.portlet.example.FormExample">
 			<result name="success">/view/processFreeMarkerView.action?firstName=${firstName}&amp;lastName=${lastName}</result>
 		</action>
 		
-		<action name="processFreeMarkerView" class="com.opensymphony.webwork.portlet.example.FormExample">
+		<action name="processFreeMarkerView" class="org.apache.struts.action2.portlet.example.FormExample">
 			<result type="freemarker" name="success">/WEB-INF/view/freeMarkerExample.ftl</result>
 		</action>
 		
@@ -128,14 +128,14 @@
 			<result name="success">/WEB-INF/edit/test.jsp</result>
 		</action>
 		<action name="formExampleEdit"
-			class="com.opensymphony.webwork.portlet.example.FormExample" method="input">
+			class="org.apache.struts.action2.portlet.example.FormExample" method="input">
 			<result name="input">
 				/WEB-INF/edit/formExampleInput.jsp
 			</result>
 		</action>
 
 		<action name="processFormExampleEdit"
-			class="com.opensymphony.webwork.portlet.example.FormExample">
+			class="org.apache.struts.action2.portlet.example.FormExample">
 			<result name="input">
 				/WEB-INF/edtt/formExampleInput.jsp
 			</result>
@@ -145,7 +145,7 @@
 		</action>
 
 		<action name="processFormExampleForward"
-			class="com.opensymphony.webwork.portlet.example.FormExample">
+			class="org.apache.struts.action2.portlet.example.FormExample">
 			<result name="success">
 				/WEB-INF/edit/formExample.jsp
 			</result>
diff --git a/webapps/portlet/src/webapp/WEB-INF/applicationContext.xml b/webapps/portlet/src/webapp/WEB-INF/applicationContext.xml
index 86e7f76c6..469e1b18c 100644
--- a/webapps/portlet/src/webapp/WEB-INF/applicationContext.xml
+++ b/webapps/portlet/src/webapp/WEB-INF/applicationContext.xml
@@ -11,10 +11,10 @@
 
 <beans default-autowire="autodetect">
 	<bean id="thingManager"
-		class="com.opensymphony.webwork.portlet.example.spring.ThingManager">
+		class="org.apache.struts.action2.portlet.example.spring.ThingManager">
 	</bean>
 	<bean id="springAction"
-		class="com.opensymphony.webwork.portlet.example.spring.SpringAction" singleton="false">
+		class="org.apache.struts.action2.portlet.example.spring.SpringAction" singleton="false">
 		<property name="thingManager">
 			<ref bean="thingManager" />
 		</property>
diff --git a/webapps/portlet/src/webapp/WEB-INF/dwr.xml b/webapps/portlet/src/webapp/WEB-INF/dwr.xml
index d07fce0c2..1252b19a2 100644
--- a/webapps/portlet/src/webapp/WEB-INF/dwr.xml
+++ b/webapps/portlet/src/webapp/WEB-INF/dwr.xml
@@ -10,7 +10,7 @@
 <dwr>
     <allow>
         <create creator="new" javascript="validator">
-            <param name="class" value="com.opensymphony.webwork.validators.DWRValidator"/>
+            <param name="class" value="org.apache.struts.action2.validators.DWRValidator"/>
         </create>
         <convert converter="bean" match="com.opensymphony.xwork.ValidationAwareSupport"/>
     </allow>
@@ -18,7 +18,7 @@
     <signatures>
         <![CDATA[
         import java.util.Map;
-        import com.opensymphony.webwork.validators.DWRValidator;
+        import org.apache.struts.action2.validators.DWRValidator;
 
         DWRValidator.doPost(String, String, Map<String, String>);
         ]]>
diff --git a/webapps/portlet/src/webapp/WEB-INF/portlet.xml b/webapps/portlet/src/webapp/WEB-INF/portlet.xml
index cae30dc83..7ac786038 100644
--- a/webapps/portlet/src/webapp/WEB-INF/portlet.xml
+++ b/webapps/portlet/src/webapp/WEB-INF/portlet.xml
@@ -6,7 +6,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http:
     <portlet-name>WebWorkPortlet</portlet-name>
     <display-name xml:lang="EN">WebWork2 Test Portlet</display-name>
     
-    <portlet-class>com.opensymphony.webwork.portlet.dispatcher.Jsr168Dispatcher</portlet-class>
+    <portlet-class>org.apache.struts.action2.portlet.dispatcher.Jsr168Dispatcher</portlet-class>
 
     <init-param>
 		<!-- The view mode namespace. Maps to a namespace in the xwork config file -->
@@ -63,7 +63,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http:
     <portlet-name>WebWorkPortlet2</portlet-name>
     <display-name xml:lang="EN">WebWork2 Test Portlet2</display-name>
     
-    <portlet-class>com.opensymphony.webwork.portlet.dispatcher.Jsr168Dispatcher</portlet-class>
+    <portlet-class>org.apache.struts.action2.portlet.dispatcher.Jsr168Dispatcher</portlet-class>
 
     <init-param>
 		<!-- The view mode namespace. Maps to a namespace in the xwork config file -->
diff --git a/webapps/portlet/src/webapp/WEB-INF/web.xml b/webapps/portlet/src/webapp/WEB-INF/web.xml
index daf2ca125..c863b67aa 100644
--- a/webapps/portlet/src/webapp/WEB-INF/web.xml
+++ b/webapps/portlet/src/webapp/WEB-INF/web.xml
@@ -9,7 +9,7 @@
 	<filter id="filterdispatcher">
 		<filter-name>webwork</filter-name>
 		<filter-class>
-			com.opensymphony.webwork.dispatcher.FilterDispatcher
+			org.apache.struts.action2.dispatcher.FilterDispatcher
 		</filter-class>
 	</filter>
 
@@ -24,7 +24,7 @@
 	</listener>
 	<listener>
 		<listener-class>
-			com.opensymphony.webwork.portlet.context.ServletContextHolderListener
+			org.apache.struts.action2.portlet.context.ServletContextHolderListener
 		</listener-class>
 	</listener>
 
@@ -32,7 +32,7 @@
 	<servlet id="preparator">
 		<servlet-name>preparator</servlet-name>
 		<servlet-class>
-			com.opensymphony.webwork.portlet.context.PreparatorServlet
+			org.apache.struts.action2.portlet.context.PreparatorServlet
 		</servlet-class>
 	</servlet>
 	<servlet id="dwr">
diff --git a/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/actions/AbstractModifyCartAction.java b/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/actions/AbstractModifyCartAction.java
index 3f710ee32..7f6d2df58 100644
--- a/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/actions/AbstractModifyCartAction.java
+++ b/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/actions/AbstractModifyCartAction.java
@@ -1,10 +1,10 @@
 /*
  * Copyright (c) 2005 Your Corporation. All Rights Reserved.
  */
-package com.opensymphony.webwork.example.ajax.actions;
+package org.apache.struts.action2.example.ajax.actions;
 
-import com.opensymphony.webwork.example.ajax.catalog.Catalog;
-import com.opensymphony.webwork.example.ajax.catalog.Product;
+import org.apache.struts.action2.example.ajax.catalog.Catalog;
+import org.apache.struts.action2.example.ajax.catalog.Product;
 
 /**
  * AbstractModifyCartAction
diff --git a/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/actions/ActiveCategory.java b/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/actions/ActiveCategory.java
index 86520cf83..fe627b5c2 100644
--- a/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/actions/ActiveCategory.java
+++ b/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/actions/ActiveCategory.java
@@ -1,12 +1,12 @@
 /*
  * Copyright (c) 2005 Your Corporation. All Rights Reserved.
  */
-package com.opensymphony.webwork.example.ajax.actions;
+package org.apache.struts.action2.example.ajax.actions;
 
-import com.opensymphony.webwork.example.ajax.cart.ShoppingCart;
-import com.opensymphony.webwork.example.ajax.catalog.Catalog;
-import com.opensymphony.webwork.example.ajax.catalog.Category;
-import com.opensymphony.webwork.interceptor.SessionAware;
+import org.apache.struts.action2.example.ajax.cart.ShoppingCart;
+import org.apache.struts.action2.example.ajax.catalog.Catalog;
+import org.apache.struts.action2.example.ajax.catalog.Category;
+import org.apache.struts.action2.interceptor.SessionAware;
 import com.opensymphony.xwork.ActionSupport;
 
 import java.util.Map;
diff --git a/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/actions/SetActiveCategory.java b/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/actions/SetActiveCategory.java
index aebfb3b8a..985184268 100644
--- a/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/actions/SetActiveCategory.java
+++ b/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/actions/SetActiveCategory.java
@@ -1,9 +1,9 @@
 /*
  * Copyright (c) 2005 Your Corporation. All Rights Reserved.
  */
-package com.opensymphony.webwork.example.ajax.actions;
+package org.apache.struts.action2.example.ajax.actions;
 
-import com.opensymphony.webwork.interceptor.SessionAware;
+import org.apache.struts.action2.interceptor.SessionAware;
 import com.opensymphony.xwork.ActionSupport;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/actions/ShowCart.java b/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/actions/ShowCart.java
index 074355e3a..27604c812 100644
--- a/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/actions/ShowCart.java
+++ b/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/actions/ShowCart.java
@@ -1,9 +1,9 @@
 /*
  * Copyright (c) 2005 Your Corporation. All Rights Reserved.
  */
-package com.opensymphony.webwork.example.ajax.actions;
+package org.apache.struts.action2.example.ajax.actions;
 
-import com.opensymphony.webwork.example.ajax.cart.ShoppingCart;
+import org.apache.struts.action2.example.ajax.cart.ShoppingCart;
 import com.opensymphony.xwork.ActionSupport;
 
 import java.util.Iterator;
diff --git a/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/actions/ShowCatalog.java b/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/actions/ShowCatalog.java
index c4d1c6f77..77db14da4 100644
--- a/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/actions/ShowCatalog.java
+++ b/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/actions/ShowCatalog.java
@@ -1,9 +1,9 @@
 /*
  * Copyright (c) 2005 Your Corporation. All Rights Reserved.
  */
-package com.opensymphony.webwork.example.ajax.actions;
+package org.apache.struts.action2.example.ajax.actions;
 
-import com.opensymphony.webwork.example.ajax.catalog.Catalog;
+import org.apache.struts.action2.example.ajax.catalog.Catalog;
 import com.opensymphony.xwork.ActionSupport;
 
 /**
diff --git a/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/actions/UpdateQuantityInCart.java b/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/actions/UpdateQuantityInCart.java
index 15e7aaf88..867b509c2 100644
--- a/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/actions/UpdateQuantityInCart.java
+++ b/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/actions/UpdateQuantityInCart.java
@@ -1,9 +1,9 @@
 /*
  * Copyright (c) 2005 Your Corporation. All Rights Reserved.
  */
-package com.opensymphony.webwork.example.ajax.actions;
+package org.apache.struts.action2.example.ajax.actions;
 
-import com.opensymphony.webwork.example.ajax.cart.ShoppingCart;
+import org.apache.struts.action2.example.ajax.cart.ShoppingCart;
 
 /**
  * UpdateQuantityInCart
diff --git a/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/cart/DefaultCart.java b/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/cart/DefaultCart.java
index 8f7d23097..055e27b96 100644
--- a/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/cart/DefaultCart.java
+++ b/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/cart/DefaultCart.java
@@ -1,9 +1,9 @@
 /*
  * Copyright (c) 2005 Your Corporation. All Rights Reserved.
  */
-package com.opensymphony.webwork.example.ajax.cart;
+package org.apache.struts.action2.example.ajax.cart;
 
-import com.opensymphony.webwork.example.ajax.catalog.Product;
+import org.apache.struts.action2.example.ajax.catalog.Product;
 
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/cart/ShoppingCart.java b/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/cart/ShoppingCart.java
index 52f98aedf..efc3ee0f3 100644
--- a/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/cart/ShoppingCart.java
+++ b/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/cart/ShoppingCart.java
@@ -1,9 +1,9 @@
 /*
  * Copyright (c) 2005 Your Corporation. All Rights Reserved.
  */
-package com.opensymphony.webwork.example.ajax.cart;
+package org.apache.struts.action2.example.ajax.cart;
 
-import com.opensymphony.webwork.example.ajax.catalog.Product;
+import org.apache.struts.action2.example.ajax.catalog.Product;
 
 import java.util.Set;
 import java.io.Serializable;
diff --git a/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/catalog/Catalog.java b/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/catalog/Catalog.java
index ab4533bb5..456147b3e 100644
--- a/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/catalog/Catalog.java
+++ b/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/catalog/Catalog.java
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2005 Your Corporation. All Rights Reserved.
  */
-package com.opensymphony.webwork.example.ajax.catalog;
+package org.apache.struts.action2.example.ajax.catalog;
 
 import java.util.Set;
 import java.io.Serializable;
diff --git a/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/catalog/Category.java b/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/catalog/Category.java
index 08cc78309..f92d65e76 100644
--- a/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/catalog/Category.java
+++ b/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/catalog/Category.java
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2005 Your Corporation. All Rights Reserved.
  */
-package com.opensymphony.webwork.example.ajax.catalog;
+package org.apache.struts.action2.example.ajax.catalog;
 
 /**
  * Category
diff --git a/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/catalog/Identifiable.java b/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/catalog/Identifiable.java
index b1be9bca5..d30aed69c 100644
--- a/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/catalog/Identifiable.java
+++ b/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/catalog/Identifiable.java
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2005 Your Corporation. All Rights Reserved.
  */
-package com.opensymphony.webwork.example.ajax.catalog;
+package org.apache.struts.action2.example.ajax.catalog;
 
 /**
  * Identifiable
diff --git a/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/catalog/Product.java b/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/catalog/Product.java
index 3bff272fc..af97fd8f7 100644
--- a/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/catalog/Product.java
+++ b/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/catalog/Product.java
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2005 Your Corporation. All Rights Reserved.
  */
-package com.opensymphony.webwork.example.ajax.catalog;
+package org.apache.struts.action2.example.ajax.catalog;
 
 /**
  * Product
diff --git a/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/catalog/TestCatalog.java b/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/catalog/TestCatalog.java
index c7441e7a9..2dd54eb11 100644
--- a/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/catalog/TestCatalog.java
+++ b/webapps/shopping-cart/src/java/com/opensymphony/webwork/example/ajax/catalog/TestCatalog.java
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2005 Your Corporation. All Rights Reserved.
  */
-package com.opensymphony.webwork.example.ajax.catalog;
+package org.apache.struts.action2.example.ajax.catalog;
 
 import java.util.*;
 
diff --git a/webapps/shopping-cart/src/webapp/WEB-INF/applicationContext.xml b/webapps/shopping-cart/src/webapp/WEB-INF/applicationContext.xml
index 05381acc1..57897be7b 100644
--- a/webapps/shopping-cart/src/webapp/WEB-INF/applicationContext.xml
+++ b/webapps/shopping-cart/src/webapp/WEB-INF/applicationContext.xml
@@ -5,11 +5,11 @@
 
     <bean id="catalog"
           singleton="true"
-          class="com.opensymphony.webwork.example.ajax.catalog.TestCatalog" />
+          class="org.apache.struts.action2.example.ajax.catalog.TestCatalog" />
 
     <bean id="shoppingCart"
           singleton="true"
-          class="com.opensymphony.webwork.example.ajax.cart.DefaultCart" />
+          class="org.apache.struts.action2.example.ajax.cart.DefaultCart" />
 
 
 </beans>
diff --git a/webapps/shopping-cart/src/webapp/WEB-INF/classes/xwork.xml b/webapps/shopping-cart/src/webapp/WEB-INF/classes/xwork.xml
index f24f85a3d..4be041de2 100644
--- a/webapps/shopping-cart/src/webapp/WEB-INF/classes/xwork.xml
+++ b/webapps/shopping-cart/src/webapp/WEB-INF/classes/xwork.xml
@@ -21,30 +21,30 @@
 
         <default-interceptor-ref name="catalogStack"/>
 
-        <action name="catalog" class="com.opensymphony.webwork.example.ajax.actions.ShowCatalog">
+        <action name="catalog" class="org.apache.struts.action2.example.ajax.actions.ShowCatalog">
             <result name="success">/category.jsp</result>
         </action>
 
-        <action name="cart" class="com.opensymphony.webwork.example.ajax.actions.ShowCart">
+        <action name="cart" class="org.apache.struts.action2.example.ajax.actions.ShowCart">
             <result name="success">/cart.jsp</result>
         </action>
 
-        <action name="main" class="com.opensymphony.webwork.example.ajax.actions.ActiveCategory">
+        <action name="main" class="org.apache.struts.action2.example.ajax.actions.ActiveCategory">
             <result name="success">/category-main.jsp</result>
         </action>
 
 
     </package>
     <package name="catalog-remote" namespace="/catalog/remote" extends="catalog">
-        <action name="activeCategory" class="com.opensymphony.webwork.example.ajax.actions.ActiveCategory">
+        <action name="activeCategory" class="org.apache.struts.action2.example.ajax.actions.ActiveCategory">
             <result name="success">/category.jsp</result>
         </action>
 
-        <action name="setActiveCategory" class="com.opensymphony.webwork.example.ajax.actions.SetActiveCategory">
+        <action name="setActiveCategory" class="org.apache.struts.action2.example.ajax.actions.SetActiveCategory">
             <result name="success" type="chain">activeCategory</result>
         </action>
 
-        <action name="updateQuantity" class="com.opensymphony.webwork.example.ajax.actions.UpdateQuantityInCart"/>
+        <action name="updateQuantity" class="org.apache.struts.action2.example.ajax.actions.UpdateQuantityInCart"/>
 
     </package>
 </xwork>
diff --git a/webapps/shopping-cart/src/webapp/WEB-INF/dwr.xml b/webapps/shopping-cart/src/webapp/WEB-INF/dwr.xml
index c18ee50dd..60783f0a1 100644
--- a/webapps/shopping-cart/src/webapp/WEB-INF/dwr.xml
+++ b/webapps/shopping-cart/src/webapp/WEB-INF/dwr.xml
@@ -4,7 +4,7 @@
 <dwr>
     <allow>
         <create creator="new" javascript="validator">
-            <param name="class" value="com.opensymphony.webwork.validators.DWRValidator"/>
+            <param name="class" value="org.apache.struts.action2.validators.DWRValidator"/>
         </create>
         <convert converter="bean" match="com.opensymphony.xwork.ValidationAwareSupport"/>
     </allow>
@@ -12,7 +12,7 @@
     <signatures>
         <![CDATA[
         import java.util.Map;
-        import com.opensymphony.webwork.validators.DWRValidator;
+        import org.apache.struts.action2.validators.DWRValidator;
 
         DWRValidator.doPost(String, String, Map<String, String>);
         ]]>
diff --git a/webapps/shopping-cart/src/webapp/WEB-INF/web.xml b/webapps/shopping-cart/src/webapp/WEB-INF/web.xml
index e76d76aa6..873399d01 100644
--- a/webapps/shopping-cart/src/webapp/WEB-INF/web.xml
+++ b/webapps/shopping-cart/src/webapp/WEB-INF/web.xml
@@ -6,7 +6,7 @@
 
     <filter>
         <filter-name>webwork</filter-name>
-        <filter-class>com.opensymphony.webwork.dispatcher.FilterDispatcher</filter-class>
+        <filter-class>org.apache.struts.action2.dispatcher.FilterDispatcher</filter-class>
     </filter>
 
     <filter>
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/DateAction.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/DateAction.java
index 1c3a7cba6..27e337537 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/DateAction.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/DateAction.java
@@ -3,7 +3,7 @@
  * All rights reserved.
  */
 
-package com.opensymphony.webwork.showcase;
+package org.apache.struts.action2.showcase;
 
 import com.opensymphony.xwork.ActionSupport;
 
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/Guess.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/Guess.java
index 13d3a6084..e4f9a67a4 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/Guess.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/Guess.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.showcase;
+package org.apache.struts.action2.showcase;
 
 import com.opensymphony.xwork.ActionSupport;
 import com.opensymphony.xwork.Action;
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/LotsOfOptiontransferselectAction.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/LotsOfOptiontransferselectAction.java
index c0765a6b4..af4f70e7d 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/LotsOfOptiontransferselectAction.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/LotsOfOptiontransferselectAction.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.showcase;
+package org.apache.struts.action2.showcase;
 
 import java.util.LinkedHashMap;
 import java.util.List;
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/LotsOfRichtexteditorAction.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/LotsOfRichtexteditorAction.java
index ddb86c0e3..fe550b660 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/LotsOfRichtexteditorAction.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/LotsOfRichtexteditorAction.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.showcase;
+package org.apache.struts.action2.showcase;
 
 import com.opensymphony.xwork.ActionSupport;
 
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/UITagExample.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/UITagExample.java
index 2b041140a..0b97663aa 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/UITagExample.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/UITagExample.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.showcase;
+package org.apache.struts.action2.showcase;
 
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.interceptor.ServletRequestAware;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.interceptor.ServletRequestAware;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionSupport;
 import com.opensymphony.xwork.Validateable;
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/AbstractCRUDAction.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/AbstractCRUDAction.java
index 07d12c527..58c3b12b1 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/AbstractCRUDAction.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/AbstractCRUDAction.java
@@ -48,12 +48,12 @@
  * SUCH DAMAGE.
  * ====================================================================
  */
-package com.opensymphony.webwork.showcase.action;
+package org.apache.struts.action2.showcase.action;
 
 import org.apache.log4j.Logger;
 import com.opensymphony.xwork.ActionSupport;
-import com.opensymphony.webwork.showcase.dao.Dao;
-import com.opensymphony.webwork.showcase.model.IdEntity;
+import org.apache.struts.action2.showcase.dao.Dao;
+import org.apache.struts.action2.showcase.model.IdEntity;
 
 import java.util.Collection;
 import java.io.Serializable;
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/EmployeeAction.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/EmployeeAction.java
index 3aeebe46a..8698fcfcc 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/EmployeeAction.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/EmployeeAction.java
@@ -48,13 +48,13 @@
  * SUCH DAMAGE.
  * ====================================================================
  */
-package com.opensymphony.webwork.showcase.action;
+package org.apache.struts.action2.showcase.action;
 
-import com.opensymphony.webwork.showcase.dao.Dao;
-import com.opensymphony.webwork.showcase.dao.EmployeeDao;
-import com.opensymphony.webwork.showcase.model.Employee;
-import com.opensymphony.webwork.showcase.model.Skill;
-import com.opensymphony.webwork.showcase.application.TestDataProvider;
+import org.apache.struts.action2.showcase.dao.Dao;
+import org.apache.struts.action2.showcase.dao.EmployeeDao;
+import org.apache.struts.action2.showcase.model.Employee;
+import org.apache.struts.action2.showcase.model.Skill;
+import org.apache.struts.action2.showcase.application.TestDataProvider;
 import com.opensymphony.xwork.Preparable;
 import org.apache.log4j.Logger;
 
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/SkillAction.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/SkillAction.java
index 1431791ed..12e1d48e2 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/SkillAction.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/SkillAction.java
@@ -48,11 +48,11 @@
  * SUCH DAMAGE.
  * ====================================================================
  */
-package com.opensymphony.webwork.showcase.action;
+package org.apache.struts.action2.showcase.action;
 
-import com.opensymphony.webwork.showcase.dao.Dao;
-import com.opensymphony.webwork.showcase.dao.SkillDao;
-import com.opensymphony.webwork.showcase.model.Skill;
+import org.apache.struts.action2.showcase.dao.Dao;
+import org.apache.struts.action2.showcase.dao.SkillDao;
+import org.apache.struts.action2.showcase.model.Skill;
 import com.opensymphony.xwork.Preparable;
 import org.apache.log4j.Logger;
 
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/actionchaining/ActionChain1.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/actionchaining/ActionChain1.java
index 968cf7739..47648ba21 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/actionchaining/ActionChain1.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/actionchaining/ActionChain1.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.showcase.actionchaining;
+package org.apache.struts.action2.showcase.actionchaining;
 
 import com.opensymphony.xwork.ActionSupport;
 
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/actionchaining/ActionChain2.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/actionchaining/ActionChain2.java
index 8f60b2d6e..db449de90 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/actionchaining/ActionChain2.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/actionchaining/ActionChain2.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.showcase.actionchaining;
+package org.apache.struts.action2.showcase.actionchaining;
 
 import com.opensymphony.xwork.ActionSupport;
 
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/actionchaining/ActionChain3.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/actionchaining/ActionChain3.java
index 8c8f7692e..cbc801d36 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/actionchaining/ActionChain3.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/actionchaining/ActionChain3.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.showcase.actionchaining;
+package org.apache.struts.action2.showcase.actionchaining;
 
 import com.opensymphony.xwork.ActionSupport;
 
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/ajax/AjaxTestAction.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/ajax/AjaxTestAction.java
index 21676e815..e5dfee3f0 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/ajax/AjaxTestAction.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/ajax/AjaxTestAction.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.showcase.ajax;
+package org.apache.struts.action2.showcase.ajax;
 
 import com.opensymphony.xwork.Action;
 
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/application/MemoryStorage.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/application/MemoryStorage.java
index d5efe8dc7..acb774444 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/application/MemoryStorage.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/application/MemoryStorage.java
@@ -48,14 +48,14 @@
  * SUCH DAMAGE.
  * ====================================================================
  */
-package com.opensymphony.webwork.showcase.application;
+package org.apache.struts.action2.showcase.application;
 
-import com.opensymphony.webwork.showcase.exception.CreateException;
-import com.opensymphony.webwork.showcase.exception.DuplicateKeyException;
-import com.opensymphony.webwork.showcase.exception.StorageException;
-import com.opensymphony.webwork.showcase.exception.UpdateException;
-import com.opensymphony.webwork.showcase.model.IdEntity;
-import com.opensymphony.webwork.showcase.application.Storage;
+import org.apache.struts.action2.showcase.exception.CreateException;
+import org.apache.struts.action2.showcase.exception.DuplicateKeyException;
+import org.apache.struts.action2.showcase.exception.StorageException;
+import org.apache.struts.action2.showcase.exception.UpdateException;
+import org.apache.struts.action2.showcase.model.IdEntity;
+import org.apache.struts.action2.showcase.application.Storage;
 import org.apache.log4j.Logger;
 
 import java.io.Serializable;
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/application/Storage.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/application/Storage.java
index 061dc2fd1..3b15e73c0 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/application/Storage.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/application/Storage.java
@@ -48,12 +48,12 @@
  * SUCH DAMAGE.
  * ====================================================================
  */
-package com.opensymphony.webwork.showcase.application;
+package org.apache.struts.action2.showcase.application;
 
-import com.opensymphony.webwork.showcase.model.IdEntity;
-import com.opensymphony.webwork.showcase.exception.CreateException;
-import com.opensymphony.webwork.showcase.exception.UpdateException;
-import com.opensymphony.webwork.showcase.exception.StorageException;
+import org.apache.struts.action2.showcase.model.IdEntity;
+import org.apache.struts.action2.showcase.exception.CreateException;
+import org.apache.struts.action2.showcase.exception.UpdateException;
+import org.apache.struts.action2.showcase.exception.StorageException;
 
 import java.io.Serializable;
 import java.util.Collection;
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/application/TestDataProvider.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/application/TestDataProvider.java
index bb0d51795..4de98bab5 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/application/TestDataProvider.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/application/TestDataProvider.java
@@ -48,13 +48,13 @@
  * SUCH DAMAGE.
  * ====================================================================
  */
-package com.opensymphony.webwork.showcase.application;
+package org.apache.struts.action2.showcase.application;
 
-import com.opensymphony.webwork.showcase.dao.EmployeeDao;
-import com.opensymphony.webwork.showcase.dao.SkillDao;
-import com.opensymphony.webwork.showcase.exception.StorageException;
-import com.opensymphony.webwork.showcase.model.Employee;
-import com.opensymphony.webwork.showcase.model.Skill;
+import org.apache.struts.action2.showcase.dao.EmployeeDao;
+import org.apache.struts.action2.showcase.dao.SkillDao;
+import org.apache.struts.action2.showcase.exception.StorageException;
+import org.apache.struts.action2.showcase.model.Employee;
+import org.apache.struts.action2.showcase.model.Skill;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.InitializingBean;
 
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/AbstractDao.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/AbstractDao.java
index 51b452126..199df070c 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/AbstractDao.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/AbstractDao.java
@@ -48,14 +48,14 @@
  * SUCH DAMAGE.
  * ====================================================================
  */
-package com.opensymphony.webwork.showcase.dao;
+package org.apache.struts.action2.showcase.dao;
 
 import org.apache.log4j.Logger;
-import com.opensymphony.webwork.showcase.model.IdEntity;
-import com.opensymphony.webwork.showcase.exception.CreateException;
-import com.opensymphony.webwork.showcase.exception.UpdateException;
-import com.opensymphony.webwork.showcase.exception.StorageException;
-import com.opensymphony.webwork.showcase.application.Storage;
+import org.apache.struts.action2.showcase.model.IdEntity;
+import org.apache.struts.action2.showcase.exception.CreateException;
+import org.apache.struts.action2.showcase.exception.UpdateException;
+import org.apache.struts.action2.showcase.exception.StorageException;
+import org.apache.struts.action2.showcase.application.Storage;
 
 import java.io.Serializable;
 import java.util.Collection;
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/Dao.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/Dao.java
index 0fa887c29..d14ff39c3 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/Dao.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/Dao.java
@@ -48,12 +48,12 @@
  * SUCH DAMAGE.
  * ====================================================================
  */
-package com.opensymphony.webwork.showcase.dao;
+package org.apache.struts.action2.showcase.dao;
 
-import com.opensymphony.webwork.showcase.model.IdEntity;
-import com.opensymphony.webwork.showcase.exception.CreateException;
-import com.opensymphony.webwork.showcase.exception.UpdateException;
-import com.opensymphony.webwork.showcase.exception.StorageException;
+import org.apache.struts.action2.showcase.model.IdEntity;
+import org.apache.struts.action2.showcase.exception.CreateException;
+import org.apache.struts.action2.showcase.exception.UpdateException;
+import org.apache.struts.action2.showcase.exception.StorageException;
 
 import java.io.Serializable;
 import java.util.Collection;
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/EmployeeDao.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/EmployeeDao.java
index e6e866695..e700517ae 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/EmployeeDao.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/EmployeeDao.java
@@ -48,11 +48,11 @@
  * SUCH DAMAGE.
  * ====================================================================
  */
-package com.opensymphony.webwork.showcase.dao;
+package org.apache.struts.action2.showcase.dao;
 
-import com.opensymphony.webwork.showcase.model.Employee;
-import com.opensymphony.webwork.showcase.model.IdEntity;
-import com.opensymphony.webwork.showcase.model.Skill;
+import org.apache.struts.action2.showcase.model.Employee;
+import org.apache.struts.action2.showcase.model.IdEntity;
+import org.apache.struts.action2.showcase.model.Skill;
 import org.apache.log4j.Logger;
 
 import java.util.List;
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/SkillDao.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/SkillDao.java
index 7c3f23f43..b67771a5c 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/SkillDao.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/SkillDao.java
@@ -48,9 +48,9 @@
  * SUCH DAMAGE.
  * ====================================================================
  */
-package com.opensymphony.webwork.showcase.dao;
+package org.apache.struts.action2.showcase.dao;
 
-import com.opensymphony.webwork.showcase.model.Skill;
+import org.apache.struts.action2.showcase.model.Skill;
 import org.apache.log4j.Logger;
 
 /**
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/CreateException.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/CreateException.java
index 3332970b7..4680f9816 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/CreateException.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/CreateException.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.showcase.exception;
+package org.apache.struts.action2.showcase.exception;
 
 import org.apache.log4j.Logger;
 
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/DeleteException.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/DeleteException.java
index de2c49f64..30021cc60 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/DeleteException.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/DeleteException.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.showcase.exception;
+package org.apache.struts.action2.showcase.exception;
 
 import org.apache.log4j.Logger;
 
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/DuplicateKeyException.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/DuplicateKeyException.java
index 633d374ea..3298e6038 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/DuplicateKeyException.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/DuplicateKeyException.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.showcase.exception;
+package org.apache.struts.action2.showcase.exception;
 
 import org.apache.log4j.Logger;
 
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/StorageException.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/StorageException.java
index 960d1dba9..388120a7e 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/StorageException.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/StorageException.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.showcase.exception;
+package org.apache.struts.action2.showcase.exception;
 
 import org.apache.log4j.Logger;
 
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/UpdateException.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/UpdateException.java
index 674094cfe..4b5528337 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/UpdateException.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/UpdateException.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.showcase.exception;
+package org.apache.struts.action2.showcase.exception;
 
 import org.apache.log4j.Logger;
 
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/filedownload/FileDownloadAction.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/filedownload/FileDownloadAction.java
index 468a159d5..33f1a6b4c 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/filedownload/FileDownloadAction.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/filedownload/FileDownloadAction.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.showcase.filedownload;
+package org.apache.struts.action2.showcase.filedownload;
 
-import com.opensymphony.webwork.ServletActionContext;
+import org.apache.struts.action2.ServletActionContext;
 import com.opensymphony.xwork.Action;
 
 import java.io.InputStream;
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/fileupload/FileUploadAction.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/fileupload/FileUploadAction.java
index b746a21c3..59f04bcd5 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/fileupload/FileUploadAction.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/fileupload/FileUploadAction.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.showcase.fileupload;
+package org.apache.struts.action2.showcase.fileupload;
 
 import com.opensymphony.xwork.ActionSupport;
 
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/jasper/JasperAction.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/jasper/JasperAction.java
index 377a1c133..84dba95a9 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/jasper/JasperAction.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/jasper/JasperAction.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2005 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.showcase.jasper;
+package org.apache.struts.action2.showcase.jasper;
 
 import java.util.Set;
 import java.io.File;
@@ -10,8 +10,8 @@ import java.io.File;
 import net.sf.jasperreports.engine.JasperCompileManager;
 
 import com.opensymphony.xwork.ActionSupport;
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.showcase.person.PersonManager;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.showcase.person.PersonManager;
 
 /**
  * @author Philip Luppens
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/model/Employee.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/model/Employee.java
index efb86b2db..52d7056ba 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/model/Employee.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/model/Employee.java
@@ -48,7 +48,7 @@
  * SUCH DAMAGE.
  * ====================================================================
  */
-package com.opensymphony.webwork.showcase.model;
+package org.apache.struts.action2.showcase.model;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/model/IdEntity.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/model/IdEntity.java
index 420411660..bb6596d26 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/model/IdEntity.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/model/IdEntity.java
@@ -48,7 +48,7 @@
  * SUCH DAMAGE.
  * ====================================================================
  */
-package com.opensymphony.webwork.showcase.model;
+package org.apache.struts.action2.showcase.model;
 
 import java.io.Serializable;
 
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/model/Skill.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/model/Skill.java
index 03eac02f5..64c7e2daf 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/model/Skill.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/model/Skill.java
@@ -48,7 +48,7 @@
  * SUCH DAMAGE.
  * ====================================================================
  */
-package com.opensymphony.webwork.showcase.model;
+package org.apache.struts.action2.showcase.model;
 
 import java.io.Serializable;
 
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/modelDriven/Gangster.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/modelDriven/Gangster.java
index 6f4ca8440..d7906897f 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/modelDriven/Gangster.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/modelDriven/Gangster.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.showcase.modelDriven;
+package org.apache.struts.action2.showcase.modelDriven;
 
 import java.io.Serializable;
 
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/modelDriven/ModelDrivenAction.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/modelDriven/ModelDrivenAction.java
index 02fa52208..3d4554fa2 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/modelDriven/ModelDrivenAction.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/modelDriven/ModelDrivenAction.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.showcase.modelDriven;
+package org.apache.struts.action2.showcase.modelDriven;
 
 import com.opensymphony.xwork.ActionSupport;
 import com.opensymphony.xwork.ModelDriven;
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/CreatePerson.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/CreatePerson.java
index 00a787208..038f0e721 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/CreatePerson.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/CreatePerson.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.showcase.person;
+package org.apache.struts.action2.showcase.person;
 
 import com.opensymphony.xwork.ActionSupport;
 
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/EditPerson-conversion.properties b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/EditPerson-conversion.properties
index 89b716e9a..4e4e5dc7e 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/EditPerson-conversion.properties
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/EditPerson-conversion.properties
@@ -1,3 +1,3 @@
 KeyProperty_persons=id
-Element_persons=com.opensymphony.webwork.showcase.person.Person
+Element_persons=org.apache.struts.action2.showcase.person.Person
 CreateIfNull_persons=true
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/EditPerson.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/EditPerson.java
index cc84b45f2..261bbe08b 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/EditPerson.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/EditPerson.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.showcase.person;
+package org.apache.struts.action2.showcase.person;
 
 import com.opensymphony.xwork.ActionSupport;
 
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/ListPeople.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/ListPeople.java
index 59bb4e22f..25492d9c4 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/ListPeople.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/ListPeople.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.showcase.person;
+package org.apache.struts.action2.showcase.person;
 
 import com.opensymphony.xwork.ActionSupport;
 
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/Person.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/Person.java
index 5e4c03897..da61403f1 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/Person.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/Person.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.showcase.person;
+package org.apache.struts.action2.showcase.person;
 
 /**
  * User: plightbo
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/PersonManager.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/PersonManager.java
index 3ef133a5d..52873b6df 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/PersonManager.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/person/PersonManager.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.showcase.person;
+package org.apache.struts.action2.showcase.person;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/actiontag/ActionTagDemo.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/actiontag/ActionTagDemo.java
index c1b3b09da..56e8e03bf 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/actiontag/ActionTagDemo.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/actiontag/ActionTagDemo.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.showcase.tag.nonui.actiontag;
+package org.apache.struts.action2.showcase.tag.nonui.actiontag;
 
 import com.opensymphony.xwork.ActionSupport;
 
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java
index 03a0030c2..e0452b963 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.showcase.tag.nonui.iteratortag;
+package org.apache.struts.action2.showcase.tag.nonui.iteratortag;
 
 import com.opensymphony.xwork.ActionSupport;
 import com.opensymphony.xwork.Validateable;
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java
index 7e2b0f8ed..dca8605bd 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.showcase.tag.nonui.iteratortag;
+package org.apache.struts.action2.showcase.tag.nonui.iteratortag;
 
 import com.opensymphony.xwork.ActionSupport;
 
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java
index a7d07cee2..cd7e7ae92 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.showcase.tag.nonui.iteratortag;
+package org.apache.struts.action2.showcase.tag.nonui.iteratortag;
 
 import com.opensymphony.xwork.ActionSupport;
 import com.opensymphony.xwork.Validateable;
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java
index 1b1e5a51f..64a082005 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.showcase.tag.nonui.iteratortag;
+package org.apache.struts.action2.showcase.tag.nonui.iteratortag;
 
 import com.opensymphony.xwork.ActionSupport;
 import com.opensymphony.xwork.Validateable;
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/token/TokenAction.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/token/TokenAction.java
index 401b2c1d2..c8339b68a 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/token/TokenAction.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/token/TokenAction.java
@@ -3,7 +3,7 @@
  * All rights reserved.
  */
 
-package com.opensymphony.webwork.showcase.token;
+package org.apache.struts.action2.showcase.token;
 
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionSupport;
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/AbstractValidationActionSupport.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/AbstractValidationActionSupport.java
index 047af0212..24f838be5 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/AbstractValidationActionSupport.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/AbstractValidationActionSupport.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.showcase.validation;
+package org.apache.struts.action2.showcase.validation;
 
 import com.opensymphony.xwork.ActionSupport;
 
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/FieldValidatorsExampleAction.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/FieldValidatorsExampleAction.java
index b03418c09..7a8f6b6cb 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/FieldValidatorsExampleAction.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/FieldValidatorsExampleAction.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.showcase.validation;
+package org.apache.struts.action2.showcase.validation;
 
 import java.sql.Date;
 import java.util.Random;
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/NonFieldValidatorsExampleAction.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/NonFieldValidatorsExampleAction.java
index bfb9a1ba6..215b17ed0 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/NonFieldValidatorsExampleAction.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/NonFieldValidatorsExampleAction.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.showcase.validation;
+package org.apache.struts.action2.showcase.validation;
 
 /**
  * @author tm_jee
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/QuizAction.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/QuizAction.java
index baac48721..14d8eb865 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/QuizAction.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/QuizAction.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.showcase.validation;
+package org.apache.struts.action2.showcase.validation;
 
 import com.opensymphony.xwork.ActionSupport;
 
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/User.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/User.java
index f165f681c..f808809c3 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/User.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/User.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.showcase.validation;
+package org.apache.struts.action2.showcase.validation;
 
 import java.sql.Date;
 
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/VisitorValidatorsExampleAction.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/VisitorValidatorsExampleAction.java
index 67d788a7c..837b2ae91 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/VisitorValidatorsExampleAction.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/validation/VisitorValidatorsExampleAction.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.showcase.validation;
+package org.apache.struts.action2.showcase.validation;
 
 /**
  * @author tm_jee
diff --git a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/wait/LongProcessAction.java b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/wait/LongProcessAction.java
index 6b64475be..12f4e708b 100644
--- a/webapps/showcase/src/java/com/opensymphony/webwork/showcase/wait/LongProcessAction.java
+++ b/webapps/showcase/src/java/com/opensymphony/webwork/showcase/wait/LongProcessAction.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.showcase.wait;
+package org.apache.struts.action2.showcase.wait;
 
 import com.opensymphony.xwork.ActionSupport;
 
diff --git a/webapps/showcase/src/webapp/WEB-INF/applicationContext.xml b/webapps/showcase/src/webapp/WEB-INF/applicationContext.xml
index cac7ff40c..6629f243e 100644
--- a/webapps/showcase/src/webapp/WEB-INF/applicationContext.xml
+++ b/webapps/showcase/src/webapp/WEB-INF/applicationContext.xml
@@ -2,13 +2,13 @@
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <beans default-autowire="byName">
 
-    <bean id="storage" class="com.opensymphony.webwork.showcase.application.MemoryStorage" singleton="true"/>
+    <bean id="storage" class="org.apache.struts.action2.showcase.application.MemoryStorage" singleton="true"/>
 
-    <bean id="testDataProvider" class="com.opensymphony.webwork.showcase.application.TestDataProvider" singleton="true" lazy-init="false"/>
+    <bean id="testDataProvider" class="org.apache.struts.action2.showcase.application.TestDataProvider" singleton="true" lazy-init="false"/>
 
-    <bean id="skillDao" class="com.opensymphony.webwork.showcase.dao.SkillDao"/>
-    <bean id="employeeDao" class="com.opensymphony.webwork.showcase.dao.EmployeeDao"/>
+    <bean id="skillDao" class="org.apache.struts.action2.showcase.dao.SkillDao"/>
+    <bean id="employeeDao" class="org.apache.struts.action2.showcase.dao.EmployeeDao"/>
 
-    <bean id="personManager" class="com.opensymphony.webwork.showcase.person.PersonManager" singleton="true"/>
+    <bean id="personManager" class="org.apache.struts.action2.showcase.person.PersonManager" singleton="true"/>
     
 </beans>
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/log4j.properties b/webapps/showcase/src/webapp/WEB-INF/classes/log4j.properties
index 2b16cee8e..44a410e3b 100644
--- a/webapps/showcase/src/webapp/WEB-INF/classes/log4j.properties
+++ b/webapps/showcase/src/webapp/WEB-INF/classes/log4j.properties
@@ -24,7 +24,7 @@ log4j.logger.noModule=FATAL
 
 # OpenSymphony Stuff
 log4j.logger.com.opensymphony=INFO
-log4j.logger.com.opensymphony.webwork=DEBUG
+log4j.logger.org.apache.struts.action2=DEBUG
 
 # Spring Stuff
 log4j.logger.org.springframework=INFO
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/webwork.properties b/webapps/showcase/src/webapp/WEB-INF/classes/webwork.properties
index c433fe1f8..783800f27 100644
--- a/webapps/showcase/src/webapp/WEB-INF/classes/webwork.properties
+++ b/webapps/showcase/src/webapp/WEB-INF/classes/webwork.properties
@@ -1,7 +1,7 @@
 webwork.i18n.reload=true
 webwork.devMode = true
 webwork.configuration.xml.reload=true
-webwork.continuations.package = com.opensymphony.webwork.showcase
+webwork.continuations.package = org.apache.struts.action2.showcase
 webwork.objectFactory = spring
 webwork.custom.i18n.resources=globalMessages
 #webwork.action.extension=jspa
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-actionchaining.xml b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-actionchaining.xml
index df27f6472..f777a8ae0 100644
--- a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-actionchaining.xml
+++ b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-actionchaining.xml
@@ -8,13 +8,13 @@
 	<include file="webwork-default.xml" />
 	
 	<package name="actionchaining" extends="webwork-default" namespace="/actionchaining">
-		<action name="actionChain1" class="com.opensymphony.webwork.showcase.actionchaining.ActionChain1">
+		<action name="actionChain1" class="org.apache.struts.action2.showcase.actionchaining.ActionChain1">
 			<result type="chain">actionChain2</result>		
 		</action>
-		<action name="actionChain2" class="com.opensymphony.webwork.showcase.actionchaining.ActionChain2">
+		<action name="actionChain2" class="org.apache.struts.action2.showcase.actionchaining.ActionChain2">
 			<result type="chain">actionChain3</result>
 		</action>
-		<action name="actionChain3" class="com.opensymphony.webwork.showcase.actionchaining.ActionChain3">
+		<action name="actionChain3" class="org.apache.struts.action2.showcase.actionchaining.ActionChain3">
 			<result>/actionchaining/actionChainingResult.jsp</result>
 		</action>
 	</package>
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-ajax.xml b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-ajax.xml
index 189410b73..e04709fa2 100644
--- a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-ajax.xml
+++ b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-ajax.xml
@@ -4,15 +4,15 @@
     <include file="webwork-default.xml"/>
 
     <package name="ajax" extends="webwork-default">
-        <action name="AjaxTest" class="com.opensymphony.webwork.showcase.ajax.AjaxTestAction">
+        <action name="AjaxTest" class="org.apache.struts.action2.showcase.ajax.AjaxTestAction">
             <result name="success">/ajax/AjaxResult.jsp</result>
         </action>
 
-        <action name="AjaxRemoteLink" class="com.opensymphony.webwork.showcase.ajax.AjaxTestAction">
+        <action name="AjaxRemoteLink" class="org.apache.struts.action2.showcase.ajax.AjaxTestAction">
             <result name="success">/ajax/AjaxResult2.js</result>
         </action>
 
-        <action name="AjaxRemoteForm" class="com.opensymphony.webwork.showcase.ajax.AjaxTestAction">
+        <action name="AjaxRemoteForm" class="org.apache.struts.action2.showcase.ajax.AjaxTestAction">
             <result name="success">/ajax/AjaxResult3.jsp</result>
         </action>
 
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-continuations.xml b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-continuations.xml
index 153d5bf56..5b3044079 100644
--- a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-continuations.xml
+++ b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-continuations.xml
@@ -3,7 +3,7 @@
     <include file="webwork-default.xml"/>
 
     <package name="continuations" extends="webwork-default" namespace="/continuations">
-        <action name="guess" class="com.opensymphony.webwork.showcase.Guess">
+        <action name="guess" class="org.apache.struts.action2.showcase.Guess">
             <result type="freemarker">guess.ftl</result>
         </action>
     </package>
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-filedownload.xml b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-filedownload.xml
index 5889d4359..d508e3a52 100644
--- a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-filedownload.xml
+++ b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-filedownload.xml
@@ -11,7 +11,7 @@
 
         <default-action-ref name="download"/>
 
-        <action name="download" class="com.opensymphony.webwork.showcase.filedownload.FileDownloadAction">
+        <action name="download" class="org.apache.struts.action2.showcase.filedownload.FileDownloadAction">
 			<result name="success" type="stream">
                 <param name="contentType">image/jpeg</param>
                 <param name="inputName">imageStream</param>
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-fileupload.xml b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-fileupload.xml
index 5acd60b78..66e35c313 100644
--- a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-fileupload.xml
+++ b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-fileupload.xml
@@ -11,11 +11,11 @@
         
         <default-action-ref name="upload"/>
 
-        <action name="upload" class="com.opensymphony.webwork.showcase.fileupload.FileUploadAction" method="input">
+        <action name="upload" class="org.apache.struts.action2.showcase.fileupload.FileUploadAction" method="input">
 			<result>upload.jsp</result>
 		</action>
 
-        <action name="doUpload" class="com.opensymphony.webwork.showcase.fileupload.FileUploadAction" method="upload">
+        <action name="doUpload" class="org.apache.struts.action2.showcase.fileupload.FileUploadAction" method="upload">
 			<result>upload-success.jsp</result>
 		</action>
 
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-model-driven.xml b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-model-driven.xml
index d45b51de1..c5b3d6393 100644
--- a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-model-driven.xml
+++ b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-model-driven.xml
@@ -9,12 +9,12 @@
 
 	<package name="modelDriven" extends="webwork-default" namespace="/modelDriven">
 	    <!-- Diplay entry page that uses Model-Driven technique -->
-		<action name="modelDriven" class="com.opensymphony.webwork.showcase.modelDriven.ModelDrivenAction" method="input">
+		<action name="modelDriven" class="org.apache.struts.action2.showcase.modelDriven.ModelDrivenAction" method="input">
 			<result>modelDriven.jsp</result>
 		</action>
 		
 		<!-- Display the result page whose content is populated using the Model-Driven technique -->
-		<action name="modelDrivenResult" class="com.opensymphony.webwork.showcase.modelDriven.ModelDrivenAction">
+		<action name="modelDrivenResult" class="org.apache.struts.action2.showcase.modelDriven.ModelDrivenAction">
 			<result>modelDrivenResult.jsp</result>
 		</action>
 	</package>
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-person.xml b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-person.xml
index 1b86d688d..ae2508f66 100644
--- a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-person.xml
+++ b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-person.xml
@@ -6,13 +6,13 @@
     <include file="webwork-default.xml"/>
 
     <package name="person" extends="webwork-default" namespace="/person">
-        <action name="listPeople" class="com.opensymphony.webwork.showcase.person.ListPeople">
+        <action name="listPeople" class="org.apache.struts.action2.showcase.person.ListPeople">
             <interceptor-ref name="validationWorkflowStack"/>
             <result type="freemarker">listPeople.ftl</result>
         </action>
 
         <!-- our JasperReports example -->
-        <action name="jasperList" class="com.opensymphony.webwork.showcase.jasper.JasperAction">
+        <action name="jasperList" class="org.apache.struts.action2.showcase.jasper.JasperAction">
             <result name="success" type="jasper">
                 <param name="location">/jasper/sample_report.jasper</param>
                 <param name="dataSource">people</param>
@@ -21,16 +21,16 @@
         </action>
 
 
-        <action name="newPerson" class="com.opensymphony.webwork.showcase.person.CreatePerson">
+        <action name="newPerson" class="org.apache.struts.action2.showcase.person.CreatePerson">
             <result type="redirect">listPeople.action</result>
             <result name="input" type="freemarker">newPerson.ftl</result>
         </action>
 
-        <action name="editPerson" class="com.opensymphony.webwork.showcase.person.EditPerson">
+        <action name="editPerson" class="org.apache.struts.action2.showcase.person.EditPerson">
             <result>editPeople.jsp</result>
         </action>
 
-        <action name="doEditPerson" class="com.opensymphony.webwork.showcase.person.EditPerson" method="save">
+        <action name="doEditPerson" class="org.apache.struts.action2.showcase.person.EditPerson" method="save">
             <result name="error">editPeople.jsp</result>
             <result type="redirect">listPeople.action</result>
         </action>
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-tags-non-ui.xml b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-tags-non-ui.xml
index 231318911..aa50c22ef 100644
--- a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-tags-non-ui.xml
+++ b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-tags-non-ui.xml
@@ -11,10 +11,10 @@
 	<!-- ================================== -->
 	
 	<package name="actionTag" extends="webwork-default" namespace="/tags/non-ui/actionTag">
-		<action name="showActionTagDemo" class="com.opensymphony.webwork.showcase.tag.nonui.actiontag.ActionTagDemo" method="show">
+		<action name="showActionTagDemo" class="org.apache.struts.action2.showcase.tag.nonui.actiontag.ActionTagDemo" method="show">
 			<result>/tags/non-ui/actionTag/showActionTagDemo.jsp</result>
 		</action>
-		<action name="includePage" class="com.opensymphony.webwork.showcase.tag.nonui.actiontag.ActionTagDemo" method="doInclude">
+		<action name="includePage" class="org.apache.struts.action2.showcase.tag.nonui.actiontag.ActionTagDemo" method="doInclude">
 			<result>/tags/non-ui/actionTag/includedPage.jsp</result>
 		</action>
 		<action name="includePage2">
@@ -33,10 +33,10 @@
 	<!-- ==================================== -->
 	
 	<package name="iteratorGeneratorTag" extends="webwork-default" namespace="/tags/non-ui/iteratorGeneratorTag">
-		<action name="showGeneratorTagDemo" class="com.opensymphony.webwork.showcase.tag.nonui.iteratortag.IteratorGeneratorTagDemo" method="input">
+		<action name="showGeneratorTagDemo" class="org.apache.struts.action2.showcase.tag.nonui.iteratortag.IteratorGeneratorTagDemo" method="input">
 			<result>/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp</result>
 		</action>
-		<action name="submitGeneratorTagDemo" class="com.opensymphony.webwork.showcase.tag.nonui.iteratortag.IteratorGeneratorTagDemo" method="submit">
+		<action name="submitGeneratorTagDemo" class="org.apache.struts.action2.showcase.tag.nonui.iteratortag.IteratorGeneratorTagDemo" method="submit">
 			<result name="input">/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp</result>
 			<result>/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp</result>
 		</action>
@@ -47,10 +47,10 @@
 	<!-- === Package for AppendIteratorTag Demo ===  -->
 	<!-- ========================================== -->
 	<package name="appendIteratorTag" extends="webwork-default" namespace="/tags/non-ui/appendIteratorTag">
-		<action name="showAppendTagDemo" class="com.opensymphony.webwork.showcase.tag.nonui.iteratortag.AppendIteratorTagDemo" method="input">
+		<action name="showAppendTagDemo" class="org.apache.struts.action2.showcase.tag.nonui.iteratortag.AppendIteratorTagDemo" method="input">
 			<result>/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp</result>
 		</action>
-		<action name="submitAppendTagDemo" class="com.opensymphony.webwork.showcase.tag.nonui.iteratortag.AppendIteratorTagDemo" method="submit">
+		<action name="submitAppendTagDemo" class="org.apache.struts.action2.showcase.tag.nonui.iteratortag.AppendIteratorTagDemo" method="submit">
 			<result name="input">/tag/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp</result>
 			<result>/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp</result>
 		</action>
@@ -61,10 +61,10 @@
 	<!-- === Package for MergeIteratorTag Demo === -->
 	<!-- ========================================= -->
 	<package name="mergeIteratorTag" extends="webwork-default" namespace="/tags/non-ui/mergeIteratorTag">
-		<action name="showMergeTagDemo" class="com.opensymphony.webwork.showcase.tag.nonui.iteratortag.MergeIteratorTagDemo" method="input">
+		<action name="showMergeTagDemo" class="org.apache.struts.action2.showcase.tag.nonui.iteratortag.MergeIteratorTagDemo" method="input">
 			<result>/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp</result>
 		</action>
-		<action name="submitMergeTagDemo" class="com.opensymphony.webwork.showcase.tag.nonui.iteratortag.MergeIteratorTagDemo" method="submit">
+		<action name="submitMergeTagDemo" class="org.apache.struts.action2.showcase.tag.nonui.iteratortag.MergeIteratorTagDemo" method="submit">
 			<result name="input">/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp</result>
 			<result>/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp</result>
 		</action>
@@ -74,10 +74,10 @@
 	<!-- === Package for SubsetIteratorTag Demo === -->
 	<!-- =========================================== -->
 	<package name="subsetIteratorTag" extends="webwork-default" namespace="/tags/non-ui/subsetIteratorTag">
-		<action name="showSubsetTagDemo" class="com.opensymphony.webwork.showcase.tag.nonui.iteratortag.SubsetIteratorTagDemo" method="input">
+		<action name="showSubsetTagDemo" class="org.apache.struts.action2.showcase.tag.nonui.iteratortag.SubsetIteratorTagDemo" method="input">
 			<result>/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp</result>
 		</action>
-		<action name="submitSubsetTagDemo" class="com.opensymphony.webwork.showcase.tag.nonui.iteratortag.SubsetIteratorTagDemo" method="submit">
+		<action name="submitSubsetTagDemo" class="org.apache.struts.action2.showcase.tag.nonui.iteratortag.SubsetIteratorTagDemo" method="submit">
 			<result name="input">/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp</result>
 			<result>/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp</result>
 		</action>
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-tags-ui.xml b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-tags-ui.xml
index edc4516a0..543b8798a 100644
--- a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-tags-ui.xml
+++ b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-tags-ui.xml
@@ -3,33 +3,33 @@
     <include file="webwork-default.xml"/>
 
     <package name="ui-tags" extends="webwork-default" namespace="/tags/ui">
-        <action name="example" class="com.opensymphony.webwork.showcase.UITagExample">
+        <action name="example" class="org.apache.struts.action2.showcase.UITagExample">
             <result>example.jsp</result>
             <result name="input">example.jsp</result>
         </action>
-        <action name="exampleSubmit" class="com.opensymphony.webwork.showcase.UITagExample" method="doSubmit">
+        <action name="exampleSubmit" class="org.apache.struts.action2.showcase.UITagExample" method="doSubmit">
         	<result>exampleSubmited.jsp</result>
         	<result name="input">example.jsp</result>
         </action>
-        <action name="exampleVelocity" class="com.opensymphony.webwork.showcase.UITagExample">
+        <action name="exampleVelocity" class="org.apache.struts.action2.showcase.UITagExample">
             <result type="velocity">example.vm</result>
             <result name="input" type="velocity">example.vm</result>
         </action>
-        <action name="exampleSubmitVelocity" class="com.opensymphony.webwork.showcase.UITagExample" method="doSubmit">
+        <action name="exampleSubmitVelocity" class="org.apache.struts.action2.showcase.UITagExample" method="doSubmit">
         	<result type="velocity">exampleSubmited.vm</result>
         	<result name="input" type="velocity">example.vm</result>
         </action>
-        <action name="lotsOfOptiontransferselect" class="com.opensymphony.webwork.showcase.LotsOfOptiontransferselectAction" method="input">
+        <action name="lotsOfOptiontransferselect" class="org.apache.struts.action2.showcase.LotsOfOptiontransferselectAction" method="input">
         	<result>lotsOfOptiontransferselect.jsp</result>
         </action>
-        <action name="lotsOfOptiontransferselectSubmit" class="com.opensymphony.webwork.showcase.LotsOfOptiontransferselectAction" method="submit">
+        <action name="lotsOfOptiontransferselectSubmit" class="org.apache.struts.action2.showcase.LotsOfOptiontransferselectAction" method="submit">
         	<result name="input">lotsOfOptiontransferselect.jsp</result>
         	<result>lotsOfOptiontransferselectSubmit.jsp</result>
         </action>
-        <action name="lotsOfRichtexteditor" class="com.opensymphony.webwork.showcase.LotsOfRichtexteditorAction" method="input">
+        <action name="lotsOfRichtexteditor" class="org.apache.struts.action2.showcase.LotsOfRichtexteditorAction" method="input">
         	<result>lotsOfRichtexteditor.jsp</result>
         </action>
-        <action name="lotsOfRichtexteditorSubmit" class="com.opensymphony.webwork.showcase.LotsOfRichtexteditorAction" method="submit">
+        <action name="lotsOfRichtexteditorSubmit" class="org.apache.struts.action2.showcase.LotsOfRichtexteditorAction" method="submit">
         	<result name="input">lotsOfRichtexteditor.jsp</result>
 			<result>lotsOfRichtexteditorSubmit.jsp</result>        
         </action>
@@ -41,7 +41,7 @@
     
     
     <package name="richtexteditor-browse" extends="webwork-default" namespace="/webwork/richtexteditor/editor/filemanager/browser/default/connectors/jsp">
-    	<action name="connector" class="com.opensymphony.webwork.components.DefaultRichtexteditorConnector" method="browse">
+    	<action name="connector" class="org.apache.struts.action2.components.DefaultRichtexteditorConnector" method="browse">
     		<result name="getFolders" type="richtexteditorGetFolders" />
     		<result name="getFoldersAndFiles" type="richtexteditorGetFoldersAndFiles" />
     		<result name="createFolder" type="richtexteditorCreateFolder" />
@@ -50,7 +50,7 @@
     </package>
     
     <package name="richtexteditor-upload" extends="webwork-default" namespace="/webwork/richtexteditor/editor/filemanager/upload">
-		<action name="uploader" class="com.opensymphony.webwork.components.DefaultRichtexteditorConnector" method="upload">
+		<action name="uploader" class="org.apache.struts.action2.components.DefaultRichtexteditorConnector" method="upload">
 			<result name="richtexteditorFileUpload" />
 		</action>    
     </package>
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-token.xml b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-token.xml
index e3519641c..a8f9b8f32 100644
--- a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-token.xml
+++ b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-token.xml
@@ -4,12 +4,12 @@
 
     <package name="token" extends="webwork-default" namespace="/token">
 
-        <action name="tokenPrepare" class="com.opensymphony.webwork.showcase.token.TokenAction">
+        <action name="tokenPrepare" class="org.apache.struts.action2.showcase.token.TokenAction">
             <interceptor-ref name="defaultStack"/>
             <result name="input">example1.jsp</result>
         </action>
 
-        <action name="transfer" class="com.opensymphony.webwork.showcase.token.TokenAction">
+        <action name="transfer" class="org.apache.struts.action2.showcase.token.TokenAction">
             <interceptor-ref name="defaultStack"/>
             <interceptor-ref name="token"/>
             <result name="invalid.token">doublePost.jsp</result>
@@ -18,12 +18,12 @@
 
 
 
-        <action name="tokenPrepare2" class="com.opensymphony.webwork.showcase.token.TokenAction">
+        <action name="tokenPrepare2" class="org.apache.struts.action2.showcase.token.TokenAction">
             <interceptor-ref name="defaultStack"/>
             <result name="input">example2.jsp</result>
         </action>
 
-        <action name="transfer2" class="com.opensymphony.webwork.showcase.token.TokenAction">
+        <action name="transfer2" class="org.apache.struts.action2.showcase.token.TokenAction">
             <interceptor-ref name="defaultStack"/>
             <interceptor-ref name="token"/>
             <result name="invalid.token">doublePost.jsp</result>
@@ -32,12 +32,12 @@
 
 
 
-        <action name="tokenPrepare3" class="com.opensymphony.webwork.showcase.token.TokenAction">
+        <action name="tokenPrepare3" class="org.apache.struts.action2.showcase.token.TokenAction">
             <interceptor-ref name="defaultStack"/>
             <result name="input">example3.jsp</result>
         </action>
 
-        <action name="transfer3" class="com.opensymphony.webwork.showcase.token.TokenAction">
+        <action name="transfer3" class="org.apache.struts.action2.showcase.token.TokenAction">
             <interceptor-ref name="defaultStack"/>
             <interceptor-ref name="token-session"/>
             <result name="invalid.token">doublePost.jsp</result>
@@ -45,13 +45,13 @@
         </action>
 
 
-        <action name="tokenPrepare4" class="com.opensymphony.webwork.showcase.token.TokenAction">
+        <action name="tokenPrepare4" class="org.apache.struts.action2.showcase.token.TokenAction">
             <interceptor-ref name="defaultStack"/>
             <interceptor-ref name="createSession"/> <!-- we must have a session when using freemarker and the @ww.token tag -->
             <result name="input" type="freemarker">example4.ftl</result>
         </action>
 
-        <action name="transfer4" class="com.opensymphony.webwork.showcase.token.TokenAction">
+        <action name="transfer4" class="org.apache.struts.action2.showcase.token.TokenAction">
             <interceptor-ref name="defaultStack"/>
             <interceptor-ref name="token"/>
             <result name="invalid.token">doublePost.jsp</result>
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-validation.xml b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-validation.xml
index 126c5aa2e..89b5d222b 100755
--- a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-validation.xml
+++ b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-validation.xml
@@ -6,22 +6,22 @@
 	<include file="webwork-default.xml" />
 
 	<package name="validation" extends="webwork-default" namespace="/validation">
-	    <action name="quizBasic" class="com.opensymphony.webwork.showcase.validation.QuizAction">
+	    <action name="quizBasic" class="org.apache.struts.action2.showcase.validation.QuizAction">
             <result name="input">quiz-basic.jsp</result>
             <result>quiz-success.jsp</result>
         </action>
 
-        <action name="quizClient" class="com.opensymphony.webwork.showcase.validation.QuizAction">
+        <action name="quizClient" class="org.apache.struts.action2.showcase.validation.QuizAction">
             <result name="input">quiz-client.jsp</result>
             <result>quiz-success.jsp</result>
         </action>
 
-        <action name="quizClientCss" class="com.opensymphony.webwork.showcase.validation.QuizAction">
+        <action name="quizClientCss" class="org.apache.struts.action2.showcase.validation.QuizAction">
             <result name="input">quiz-client-css.jsp</result>
             <result>quiz-success.jsp</result>
         </action>
 
-        <action name="quizAjax" class="com.opensymphony.webwork.showcase.validation.QuizAction">
+        <action name="quizAjax" class="org.apache.struts.action2.showcase.validation.QuizAction">
             <result name="input">quiz-ajax.jsp</result>
             <result>quiz-success.jsp</result>
         </action>
@@ -39,11 +39,11 @@
 		<!-- === Field Validators === -->
 		<!-- ======================== -->
 		
-		<action name="showFieldValidatorsExamples" class="com.opensymphony.webwork.showcase.validation.FieldValidatorsExampleAction" method="input">
+		<action name="showFieldValidatorsExamples" class="org.apache.struts.action2.showcase.validation.FieldValidatorsExampleAction" method="input">
 			<result name="input" type="dispatcher">/validation/fieldValidatorsExample.jsp</result>
 		</action>
 		
-		<action name="submitFieldValidatorsExamples" class="com.opensymphony.webwork.showcase.validation.FieldValidatorsExampleAction" method="submit">
+		<action name="submitFieldValidatorsExamples" class="org.apache.struts.action2.showcase.validation.FieldValidatorsExampleAction" method="submit">
 			<result name="input" type="dispatcher">/validation/fieldValidatorsExample.jsp</result>
 			<result type="dispatcher">/validation/successFieldValidatorsExample.jsp</result>
 		</action>
@@ -54,11 +54,11 @@
 		<!-- === Non Field Validators === -->
 		<!-- ============================ -->
 		
-		<action name="showNonFieldValidatorsExamples" class="com.opensymphony.webwork.showcase.validation.NonFieldValidatorsExampleAction" method="input">
+		<action name="showNonFieldValidatorsExamples" class="org.apache.struts.action2.showcase.validation.NonFieldValidatorsExampleAction" method="input">
 			<result name="input">/validation/nonFieldValidatorsExample.jsp</result>		
 		</action>
 		
-		<action name="submitNonFieldValidatorsExamples" class="com.opensymphony.webwork.showcase.validation.NonFieldValidatorsExampleAction" method="submit">
+		<action name="submitNonFieldValidatorsExamples" class="org.apache.struts.action2.showcase.validation.NonFieldValidatorsExampleAction" method="submit">
 			<result name="input">/validation/nonFieldValidatorsExample.jsp</result>		
 			<result>/validation/successNonFieldValidatorsExample.jsp</result>
 		</action>
@@ -69,11 +69,11 @@
 		<!-- === Visitor Validators === -->
 		<!-- ========================== -->
 		
-		<action name="showVisitorValidatorsExamples" class="com.opensymphony.webwork.showcase.validation.VisitorValidatorsExampleAction" method="input">
+		<action name="showVisitorValidatorsExamples" class="org.apache.struts.action2.showcase.validation.VisitorValidatorsExampleAction" method="input">
 			<result name="input">/validation/visitorValidatorsExample.jsp</result>
 		</action>
 		
-		<action name="submitVisitorValidatorsExamples" class="com.opensymphony.webwork.showcase.validation.VisitorValidatorsExampleAction" method="submit">
+		<action name="submitVisitorValidatorsExamples" class="org.apache.struts.action2.showcase.validation.VisitorValidatorsExampleAction" method="submit">
 			<result name="input">/validation/visitorValidatorsExample.jsp</result>
 			<result>/validation/successVisitorValidatorsExample.jsp</result>
 		</action>
@@ -84,11 +84,11 @@
 		<!-- === Visitor Validators === -->
 		<!-- ========================== -->
 
-		<action name="clientSideValidationExample" class="com.opensymphony.webwork.showcase.validation.FieldValidatorsExampleAction" method="input">
+		<action name="clientSideValidationExample" class="org.apache.struts.action2.showcase.validation.FieldValidatorsExampleAction" method="input">
 			<result name="input">/validation/clientSideValidationExample.jsp</result>
 		</action>
 
-		<action name="submitClientSideValidationExample" class="com.opensymphony.webwork.showcase.validation.FieldValidatorsExampleAction" method="submit">
+		<action name="submitClientSideValidationExample" class="org.apache.struts.action2.showcase.validation.FieldValidatorsExampleAction" method="submit">
 			<result name="input">/validation/clientSideValidationExample.jsp</result>
 			<result>/validation/successClientSideValidationExample.jsp</result>
 		</action>
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-wait.xml b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-wait.xml
index be7cad19f..04ac2a2fb 100644
--- a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-wait.xml
+++ b/webapps/showcase/src/webapp/WEB-INF/classes/xwork-wait.xml
@@ -4,14 +4,14 @@
 
     <package name="wait" extends="webwork-default" namespace="/wait">
 
-        <action name="longProcess1" class="com.opensymphony.webwork.showcase.wait.LongProcessAction">
+        <action name="longProcess1" class="org.apache.struts.action2.showcase.wait.LongProcessAction">
             <interceptor-ref name="defaultStack"/>
             <interceptor-ref name="execAndWait"/>
             <result name="wait">wait.jsp</result>
             <result name="success">complete.jsp</result>
         </action>
 
-        <action name="longProcess2" class="com.opensymphony.webwork.showcase.wait.LongProcessAction">
+        <action name="longProcess2" class="org.apache.struts.action2.showcase.wait.LongProcessAction">
             <interceptor-ref name="defaultStack"/>
             <interceptor-ref name="execAndWait">
                 <param name="delay">2000</param>
@@ -20,7 +20,7 @@
             <result name="success">complete.jsp</result>
         </action>
 
-        <action name="longProcess3" class="com.opensymphony.webwork.showcase.wait.LongProcessAction">
+        <action name="longProcess3" class="org.apache.struts.action2.showcase.wait.LongProcessAction">
             <interceptor-ref name="defaultStack"/>
             <interceptor-ref name="execAndWait">
                 <param name="delay">3000</param>
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork.xml b/webapps/showcase/src/webapp/WEB-INF/classes/xwork.xml
index b3b2fc4bd..c7b155cae 100644
--- a/webapps/showcase/src/webapp/WEB-INF/classes/xwork.xml
+++ b/webapps/showcase/src/webapp/WEB-INF/classes/xwork.xml
@@ -44,7 +44,7 @@
             <result>showcase.jsp</result>
         </action>
 
-        <action name="date" class="com.opensymphony.webwork.showcase.DateAction">
+        <action name="date" class="org.apache.struts.action2.showcase.DateAction">
             <result name="success">/date.jsp</result>
         </action>
 
@@ -53,20 +53,20 @@
     <package name="skill" extends="default" namespace="/skill">
         <default-interceptor-ref name="crudStack"/>
 
-        <action name="list" class="com.opensymphony.webwork.showcase.action.SkillAction" method="list">
+        <action name="list" class="org.apache.struts.action2.showcase.action.SkillAction" method="list">
             <result>/empmanager/listSkills.jsp</result>
             <interceptor-ref name="basicStack"/>
         </action>
-        <action name="edit" class="com.opensymphony.webwork.showcase.action.SkillAction">
+        <action name="edit" class="org.apache.struts.action2.showcase.action.SkillAction">
             <result>/empmanager/editSkill.jsp</result>
             <interceptor-ref name="params" />
             <interceptor-ref name="basicStack"/>
         </action>
-        <action name="save" class="com.opensymphony.webwork.showcase.action.SkillAction" method="save">
+        <action name="save" class="org.apache.struts.action2.showcase.action.SkillAction" method="save">
             <result name="input">/empmanager/editSkill.jsp</result>
             <result type="redirect">edit.action?skillName=${currentSkill.name}</result>
         </action>
-        <action name="delete" class="com.opensymphony.webwork.showcase.action.SkillAction" method="delete">
+        <action name="delete" class="org.apache.struts.action2.showcase.action.SkillAction" method="delete">
             <result name="error">/empmanager/editSkill.jsp</result>
             <result type="redirect">edit.action?skillName=${currentSkill.name}</result>
         </action>
@@ -75,19 +75,19 @@
     <package name="employee" extends="default" namespace="/employee">
         <default-interceptor-ref name="crudStack"/>
 
-        <action name="list" class="com.opensymphony.webwork.showcase.action.EmployeeAction" method="list">
+        <action name="list" class="org.apache.struts.action2.showcase.action.EmployeeAction" method="list">
             <result>/empmanager/listEmployees.jsp</result>
             <interceptor-ref name="basicStack"/>
         </action>
-        <action name="edit" class="com.opensymphony.webwork.showcase.action.EmployeeAction">
+        <action name="edit" class="org.apache.struts.action2.showcase.action.EmployeeAction">
             <result>/empmanager/editEmployee.jsp</result>
             <interceptor-ref name="crudStack"><param name="validation.excludeMethods">execute</param></interceptor-ref>
         </action>
-        <action name="save" class="com.opensymphony.webwork.showcase.action.EmployeeAction" method="save">
+        <action name="save" class="org.apache.struts.action2.showcase.action.EmployeeAction" method="save">
             <result name="input">/empmanager/editEmployee.jsp</result>
             <result type="redirect">edit.action?empId=${currentEmployee.empId}</result>
         </action>
-        <action name="delete" class="com.opensymphony.webwork.showcase.action.EmployeeAction" method="delete">
+        <action name="delete" class="org.apache.struts.action2.showcase.action.EmployeeAction" method="delete">
             <result name="error">/empmanager/editEmployee.jsp</result>
             <result type="redirect">edit.action?empId=${currentEmployee.empId}</result>
         </action>
diff --git a/webapps/showcase/src/webapp/WEB-INF/dwr.xml b/webapps/showcase/src/webapp/WEB-INF/dwr.xml
index 30f6ef121..3d36e17dd 100644
--- a/webapps/showcase/src/webapp/WEB-INF/dwr.xml
+++ b/webapps/showcase/src/webapp/WEB-INF/dwr.xml
@@ -8,7 +8,7 @@
 <dwr>
     <allow>
         <create creator="new" javascript="validator">
-            <param name="class" value="com.opensymphony.webwork.validators.DWRValidator"/>
+            <param name="class" value="org.apache.struts.action2.validators.DWRValidator"/>
         </create>
         <convert converter="bean" match="com.opensymphony.xwork.ValidationAwareSupport"/>
     </allow>
@@ -16,7 +16,7 @@
     <signatures>
         <![CDATA[
         import java.util.Map;
-        import com.opensymphony.webwork.validators.DWRValidator;
+        import org.apache.struts.action2.validators.DWRValidator;
 
         DWRValidator.doPost(String, String, Map<String, String>);
         ]]>
diff --git a/webapps/showcase/src/webapp/WEB-INF/web.xml b/webapps/showcase/src/webapp/WEB-INF/web.xml
index b95342dd3..c0decc076 100644
--- a/webapps/showcase/src/webapp/WEB-INF/web.xml
+++ b/webapps/showcase/src/webapp/WEB-INF/web.xml
@@ -6,12 +6,12 @@
 
     <filter>
         <filter-name>webwork-cleanup</filter-name>
-        <filter-class>com.opensymphony.webwork.dispatcher.ActionContextCleanUp</filter-class>
+        <filter-class>org.apache.struts.action2.dispatcher.ActionContextCleanUp</filter-class>
     </filter>
 
     <filter>
         <filter-name>webwork</filter-name>
-        <filter-class>com.opensymphony.webwork.dispatcher.FilterDispatcher</filter-class>
+        <filter-class>org.apache.struts.action2.dispatcher.FilterDispatcher</filter-class>
     </filter>
 
     <filter>
@@ -61,15 +61,15 @@
     <!-- SNIPPET START: example.velocity.filter.chain
         <filter>
             <filter-name>webwork-cleanup</filter-name>
-            <filter-class>com.opensymphony.webwork.dispatcher.ActionContextCleanUp</filter-class>
+            <filter-class>org.apache.struts.action2.dispatcher.ActionContextCleanUp</filter-class>
         </filter>
         <filter>
             <filter-name>sitemesh</filter-name>
-            <filter-class>com.opensymphony.webwork.sitemesh.VelocityPageFilter</filter-class>
+            <filter-class>org.apache.struts.action2.sitemesh.VelocityPageFilter</filter-class>
         </filter>
         <filter>
             <filter-name>webwork</filter-name>
-            <filter-class>com.opensymphony.webwork.dispatcher.FilterDispatcher</filter-class>
+            <filter-class>org.apache.struts.action2.dispatcher.FilterDispatcher</filter-class>
         </filter>
 
         <filter-mapping>
@@ -89,15 +89,15 @@
     <!-- SNIPPET START: example.freemarker.filter.chain
     <filter>
         <filter-name>webwork-cleanup</filter-name>
-        <filter-class>com.opensymphony.webwork.dispatcher.ActionContextCleanUp</filter-class>
+        <filter-class>org.apache.struts.action2.dispatcher.ActionContextCleanUp</filter-class>
     </filter>
     <filter>
         <filter-name>sitemesh</filter-name>
-        <filter-class>com.opensymphony.webwork.sitemesh.FreeMarkerPageFilter</filter-class>
+        <filter-class>org.apache.struts.action2.sitemesh.FreeMarkerPageFilter</filter-class>
     </filter>
     <filter>
         <filter-name>webwork</filter-name>
-        <filter-class>com.opensymphony.webwork.dispatcher.FilterDispatcher</filter-class>
+        <filter-class>org.apache.struts.action2.dispatcher.FilterDispatcher</filter-class>
     </filter>
 
     <filter-mapping>
diff --git a/webapps/showcase/src/webapp/token/index.jsp b/webapps/showcase/src/webapp/token/index.jsp
index 09030ea7e..5f2798e39 100644
--- a/webapps/showcase/src/webapp/token/index.jsp
+++ b/webapps/showcase/src/webapp/token/index.jsp
@@ -14,8 +14,8 @@
     from time to time. This token is then validated with the HttpSession that it is the first time
     it is submitted, if not we have a double post and therefore can prevent the second submit action.
     <p/>
-    For more information check out javadoc for com.opensymphony.webwork.interceptor.TokenInterceptor
-    and com.opensymphony.webwork.interceptor.TokenSessionStoreInterceptor.
+    For more information check out javadoc for org.apache.struts.action2.interceptor.TokenInterceptor
+    and org.apache.struts.action2.interceptor.TokenSessionStoreInterceptor.
 
     <br/>
     <br/><a href="tokenPrepare!input.action">Example 1 (token based .jsp example)</a>
diff --git a/webapps/starter/src/webapp/WEB-INF/web.xml b/webapps/starter/src/webapp/WEB-INF/web.xml
index 9784553e6..53d662e5b 100644
--- a/webapps/starter/src/webapp/WEB-INF/web.xml
+++ b/webapps/starter/src/webapp/WEB-INF/web.xml
@@ -7,7 +7,7 @@
     <!-- START SNIPPET: example -->
     <filter>
         <filter-name>webwork</filter-name>
-        <filter-class>com.opensymphony.webwork.dispatcher.FilterDispatcher</filter-class>
+        <filter-class>org.apache.struts.action2.dispatcher.FilterDispatcher</filter-class>
     </filter>
 
     <filter-mapping>
@@ -23,13 +23,13 @@
     <!-- START SNIPPET: compatibility
     <servlet>
         <servlet-name>JspSupportServlet</servlet-name>
-        <servlet-class>com.opensymphony.webwork.views.JspSupportServlet</servlet-class>
+        <servlet-class>org.apache.struts.action2.views.JspSupportServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
 
     <servlet>
         <servlet-name>action</servlet-name>
-        <servlet-class>com.opensymphony.webwork.dispatcher.ServletDispatcher</servlet-class>
+        <servlet-class>org.apache.struts.action2.dispatcher.ServletDispatcher</servlet-class>
     </servlet>
 
     <servlet-mapping>