diff --git a/src/java/org/apache/struts/action2/Main.java b/src/java/org/apache/struts/action2/Main.java
index 115206c64..db5a99fbd 100644
--- a/src/java/org/apache/struts/action2/Main.java
+++ b/src/java/org/apache/struts/action2/Main.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork;
+package org.apache.struts.action2;
 
 import java.io.File;
 import java.io.FilenameFilter;
@@ -127,7 +127,7 @@ public class Main {
                 return;
             }
 
-            launch("com.opensymphony.webwork.quickstart.QuickStart", programArgs, urls);
+            launch("org.apache.struts.action2.quickstart.QuickStart", programArgs, urls);
             return;
         }
 
@@ -140,7 +140,7 @@ public class Main {
         }
 
         if ("sitegraph".equals(command)) {
-            launch("com.opensymphony.webwork.sitegraph.SiteGraph", programArgs, urls);
+            launch("org.apache.struts.action2.sitegraph.SiteGraph", programArgs, urls);
         }
     }
 
diff --git a/src/java/org/apache/struts/action2/RequestUtils.java b/src/java/org/apache/struts/action2/RequestUtils.java
index 828fc00ff..b2fe3ba53 100644
--- a/src/java/org/apache/struts/action2/RequestUtils.java
+++ b/src/java/org/apache/struts/action2/RequestUtils.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork;
+package org.apache.struts.action2;
 
 import javax.servlet.http.HttpServletRequest;
 
diff --git a/src/java/org/apache/struts/action2/ServletActionContext.java b/src/java/org/apache/struts/action2/ServletActionContext.java
index dc3594684..c3b0ece21 100644
--- a/src/java/org/apache/struts/action2/ServletActionContext.java
+++ b/src/java/org/apache/struts/action2/ServletActionContext.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.util.OgnlValueStack;
diff --git a/src/java/org/apache/struts/action2/WebWorkConstants.java b/src/java/org/apache/struts/action2/WebWorkConstants.java
index ec9f39f7b..0cc94f6b1 100644
--- a/src/java/org/apache/struts/action2/WebWorkConstants.java
+++ b/src/java/org/apache/struts/action2/WebWorkConstants.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork;
+package org.apache.struts.action2;
 
 /**
  * This class provides a central location for framework constants related to
diff --git a/src/java/org/apache/struts/action2/WebWorkStatics.java b/src/java/org/apache/struts/action2/WebWorkStatics.java
index a139ff50a..3a2281c8a 100644
--- a/src/java/org/apache/struts/action2/WebWorkStatics.java
+++ b/src/java/org/apache/struts/action2/WebWorkStatics.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork;
+package org.apache.struts.action2;
 
 
 /**
diff --git a/src/java/org/apache/struts/action2/WebWorkTestCase.java b/src/java/org/apache/struts/action2/WebWorkTestCase.java
index 17ba684a5..559e81708 100644
--- a/src/java/org/apache/struts/action2/WebWorkTestCase.java
+++ b/src/java/org/apache/struts/action2/WebWorkTestCase.java
@@ -1,6 +1,6 @@
-package com.opensymphony.webwork;
+package org.apache.struts.action2;
 
-import com.opensymphony.webwork.config.Configuration;
+import org.apache.struts.action2.config.Configuration;
 import com.opensymphony.xwork.XWorkTestCase;
 
 /**
diff --git a/src/java/org/apache/struts/action2/components/AbstractRichtexteditorConnector.java b/src/java/org/apache/struts/action2/components/AbstractRichtexteditorConnector.java
index f6c53c085..b21d39e8c 100644
--- a/src/java/org/apache/struts/action2/components/AbstractRichtexteditorConnector.java
+++ b/src/java/org/apache/struts/action2/components/AbstractRichtexteditorConnector.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.io.Serializable;
 
@@ -12,8 +12,8 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.opensymphony.webwork.interceptor.ServletRequestAware;
-import com.opensymphony.webwork.interceptor.ServletResponseAware;
+import org.apache.struts.action2.interceptor.ServletRequestAware;
+import org.apache.struts.action2.interceptor.ServletResponseAware;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionSupport;
 
@@ -29,7 +29,7 @@ import com.opensymphony.xwork.ActionSupport;
  * <!-- START SNIPPET: example -->
  * 
  *   &lt;package name="richtexteditor-browse" extends="webwork-default" namespace="/webwork/richtexteditor/editor/filemanager/browser/default/connectors/jsp"&gt;
- *   	&lt;action name="connector" class="com.opensymphony.webwork.components.DefaultRichtexteditorConnector" method="browse">
+ *   	&lt;action name="connector" class="org.apache.struts.action2.components.DefaultRichtexteditorConnector" method="browse">
  *   		&lt;result name="getFolders" type="richtexteditorGetFolders" /&gt;
  *   		&lt;result name="getFoldersAndFiles" type="richtexteditorGetFoldersAndFiles" /&gt;
  *   		&lt;result name="createFolder" type="richtexteditorCreateFolder" /&gt;
@@ -38,7 +38,7 @@ import com.opensymphony.xwork.ActionSupport;
  *   &lt;/package&gt;
  * 
  *   &lt;package name="richtexteditor-upload" extends="webwork-default" namespace="/webwork/richtexteditor/editor/filemanager/upload"&gt;
- *		&lt;action name="uploader" class="com.opensymphony.webwork.components.DefaultRichtexteditorConnector" method="upload"&gt;
+ *		&lt;action name="uploader" class="org.apache.struts.action2.components.DefaultRichtexteditorConnector" method="upload"&gt;
  *			&lt;result name="richtexteditorFileUpload" /&gt;
  *		&lt;/action&gt;    
  *   &lt;/package&gt;
@@ -49,7 +49,7 @@ import com.opensymphony.xwork.ActionSupport;
  * 
  * @author tm_jee
  * @version $Date: 2006/03/08 20:22:33 $ $Id: AbstractRichtexteditorConnector.java,v 1.4 2006/03/08 20:22:33 rainerh Exp $
- * @see com.opensymphony.webwork.components.DefaultRichtexteditorConnector
+ * @see org.apache.struts.action2.components.DefaultRichtexteditorConnector
  */
 public abstract class AbstractRichtexteditorConnector extends ActionSupport implements ServletRequestAware, ServletResponseAware {
 	
diff --git a/src/java/org/apache/struts/action2/components/ActionComponent.java b/src/java/org/apache/struts/action2/components/ActionComponent.java
index 89be68142..338e73ca9 100644
--- a/src/java/org/apache/struts/action2/components/ActionComponent.java
+++ b/src/java/org/apache/struts/action2/components/ActionComponent.java
@@ -1,9 +1,9 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.dispatcher.DispatcherUtils;
-import com.opensymphony.webwork.dispatcher.RequestMap;
-import com.opensymphony.webwork.views.jsp.TagUtils;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.dispatcher.DispatcherUtils;
+import org.apache.struts.action2.dispatcher.RequestMap;
+import org.apache.struts.action2.views.jsp.TagUtils;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionProxy;
 import com.opensymphony.xwork.ActionProxyFactory;
@@ -90,7 +90,7 @@ import java.util.Map;
  * @version $Revision: 1.22 $
  * @since 2.2
  *
- * @ww.tag name="action" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ActionTag"
+ * @ww.tag name="action" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ActionTag"
  * description="Execute an action from within a view"
  */
 public class ActionComponent extends Component {
@@ -169,7 +169,7 @@ public class ActionComponent extends Component {
      * and the namespace will be saved into the instance variables proxy and
      * namespace respectively.
      *
-     * @see com.opensymphony.webwork.views.jsp.TagUtils#buildNamespace
+     * @see org.apache.struts.action2.views.jsp.TagUtils#buildNamespace
      */
     private void executeAction() {
         String actualName = findString(name, "name", "Action name is required. Example: updatePerson");
diff --git a/src/java/org/apache/struts/action2/components/ActionError.java b/src/java/org/apache/struts/action2/components/ActionError.java
index 67505c5b8..aec24dc26 100644
--- a/src/java/org/apache/struts/action2/components/ActionError.java
+++ b/src/java/org/apache/struts/action2/components/ActionError.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.util.OgnlValueStack;
 
@@ -32,7 +32,7 @@ import javax.servlet.http.HttpServletResponse;
  *
  * @author tm_jee
  * @version $Date: 2006/01/01 15:16:03 $ $Id: ActionError.java,v 1.5 2006/01/01 15:16:03 tmjee Exp $
- * @ww.tag name="actionerror" tld-body-content="empty" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.ActionErrorTag"
+ * @ww.tag name="actionerror" tld-body-content="empty" tld-tag-class="org.apache.struts.action2.views.jsp.ui.ActionErrorTag"
  * description="Render action errors if they exists"
  * @since 2.2
  */
diff --git a/src/java/org/apache/struts/action2/components/ActionMessage.java b/src/java/org/apache/struts/action2/components/ActionMessage.java
index 6cce6940f..e74e0cac0 100644
--- a/src/java/org/apache/struts/action2/components/ActionMessage.java
+++ b/src/java/org/apache/struts/action2/components/ActionMessage.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.util.OgnlValueStack;
 
@@ -30,7 +30,7 @@ import javax.servlet.http.HttpServletResponse;
  *
  * @author tm_jee
  * @version $Date: 2006/01/07 20:43:28 $ $Id: ActionMessage.java,v 1.6 2006/01/07 20:43:28 plightbo Exp $
- * @ww.tag name="actionmessage" tld-body-content="empty" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.ActionMessageTag"
+ * @ww.tag name="actionmessage" tld-body-content="empty" tld-tag-class="org.apache.struts.action2.views.jsp.ui.ActionMessageTag"
  * description="Render action messages if they exists"
  * @since 2.2
  */
diff --git a/src/java/org/apache/struts/action2/components/Anchor.java b/src/java/org/apache/struts/action2/components/Anchor.java
index 0b2a43a5b..d78b78b12 100644
--- a/src/java/org/apache/struts/action2/components/Anchor.java
+++ b/src/java/org/apache/struts/action2/components/Anchor.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -63,7 +63,7 @@ import javax.servlet.http.HttpServletResponse;
  * @author Ian Roughley
  * @author Rene Gielen
  * @version $Revision: 1.5 $
- * @ww.tag name="a" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.AnchorTag"
+ * @ww.tag name="a" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.AnchorTag"
  * description="Render a HTML href element that when clicked calls a URL via remote XMLHttpRequest"
  * @since 2.2
  */
diff --git a/src/java/org/apache/struts/action2/components/AppendIterator.java b/src/java/org/apache/struts/action2/components/AppendIterator.java
index 65150d8fb..e390ddecc 100644
--- a/src/java/org/apache/struts/action2/components/AppendIterator.java
+++ b/src/java/org/apache/struts/action2/components/AppendIterator.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.io.Writer;
 import java.util.ArrayList;
@@ -12,9 +12,9 @@ import java.util.List;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.opensymphony.webwork.components.Param.UnnamedParametric;
-import com.opensymphony.webwork.util.AppendIteratorFilter;
-import com.opensymphony.webwork.util.MakeIterator;
+import org.apache.struts.action2.components.Param.UnnamedParametric;
+import org.apache.struts.action2.util.AppendIteratorFilter;
+import org.apache.struts.action2.util.MakeIterator;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 /**
@@ -95,10 +95,10 @@ import com.opensymphony.xwork.util.OgnlValueStack;
  *
  * @author tm_jee ( tm_jee (at) yahoo.co.uk )
  * @version $Date: 2006/03/18 15:57:09 $ $Id: AppendIterator.java,v 1.10 2006/03/18 15:57:09 rgielen Exp $
- * @see com.opensymphony.webwork.util.AppendIteratorFilter
- * @see com.opensymphony.webwork.views.jsp.iterator.AppendIteratorTag
+ * @see org.apache.struts.action2.util.AppendIteratorFilter
+ * @see org.apache.struts.action2.views.jsp.iterator.AppendIteratorTag
  *
- * @ww.tag name="append" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.iterator.AppendIteratorTag"
+ * @ww.tag name="append" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.iterator.AppendIteratorTag"
  * description="Append the values of a list of iterators to one iterator"
  */
 public class AppendIterator extends Component implements UnnamedParametric {
diff --git a/src/java/org/apache/struts/action2/components/Bean.java b/src/java/org/apache/struts/action2/components/Bean.java
index 8acb4dae8..6182586f6 100644
--- a/src/java/org/apache/struts/action2/components/Bean.java
+++ b/src/java/org/apache/struts/action2/components/Bean.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.util.ClassLoaderUtil;
 import com.opensymphony.xwork.ObjectFactory;
@@ -33,13 +33,13 @@ import java.io.Writer;
  * <pre>
  * <!-- START SNIPPET: examples -->
  * &lt;-- in freemarker form --&gt;
- * [ww.bean name="com.opensymphony.webwork.example.counter.SimpleCounter" id="counter"]
+ * [ww.bean name="org.apache.struts.action2.example.counter.SimpleCounter" id="counter"]
  *   [ww:param name="foo" value="BAR"/]
  *   The value of foo is : [ww:property value="foo"/], when inside the bean tag.<br />
  * [/ww:bean]
  *
  * &lt;-- in jsp form --&gt;
- * &lt;ww:bean name="com.opensymphony.webwork.example.counter.SimpleCounter" id="counter"&gt;
+ * &lt;ww:bean name="org.apache.struts.action2.example.counter.SimpleCounter" id="counter"&gt;
  * 	 &lt;ww:param name="foo" value="BAR" /&gt;
  *   The value of foot is : &lt;ww:property value="foo"/&gt;, when inside the bean tag &lt;br /&gt;
  * &lt;/ww:bean&gt;
@@ -76,7 +76,7 @@ import java.io.Writer;
  *
  * @see Param
  *
- * @ww.tag name="bean" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.BeanTag"
+ * @ww.tag name="bean" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.BeanTag"
  * description="Instantiate a JavaBean and place it in the context."
  */
 public class Bean extends Component {
diff --git a/src/java/org/apache/struts/action2/components/Checkbox.java b/src/java/org/apache/struts/action2/components/Checkbox.java
index fb4ad09d8..b3e3d996b 100644
--- a/src/java/org/apache/struts/action2/components/Checkbox.java
+++ b/src/java/org/apache/struts/action2/components/Checkbox.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -31,7 +31,7 @@ import javax.servlet.http.HttpServletResponse;
  * @version $Revision: 1.9 $
  * @since 2.2
  *
- * @ww.tag name="checkbox" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.CheckboxTag"
+ * @ww.tag name="checkbox" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.CheckboxTag"
  * description="Render a checkbox input field"
   */
 public class Checkbox extends UIBean {
diff --git a/src/java/org/apache/struts/action2/components/CheckboxList.java b/src/java/org/apache/struts/action2/components/CheckboxList.java
index f3f567f2d..98c0f54a1 100644
--- a/src/java/org/apache/struts/action2/components/CheckboxList.java
+++ b/src/java/org/apache/struts/action2/components/CheckboxList.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletResponse;
  * @version $Revision: 1.6 $
  * @since 2.2
  *
- * @ww.tag name="checkboxlist" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.CheckboxListTag"
+ * @ww.tag name="checkboxlist" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.CheckboxListTag"
  * description="Render a list of checkboxes"
   */
 public class CheckboxList extends ListUIBean {
diff --git a/src/java/org/apache/struts/action2/components/ClosingUIBean.java b/src/java/org/apache/struts/action2/components/ClosingUIBean.java
index dc24e6451..64a121449 100644
--- a/src/java/org/apache/struts/action2/components/ClosingUIBean.java
+++ b/src/java/org/apache/struts/action2/components/ClosingUIBean.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 import org.apache.commons.logging.Log;
diff --git a/src/java/org/apache/struts/action2/components/ComboBox.java b/src/java/org/apache/struts/action2/components/ComboBox.java
index 8d3f93416..b7d22a4ea 100644
--- a/src/java/org/apache/struts/action2/components/ComboBox.java
+++ b/src/java/org/apache/struts/action2/components/ComboBox.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -43,7 +43,7 @@ import javax.servlet.http.HttpServletResponse;
  * @version $Revision: 1.8 $
  * @since 2.2
  *
- * @ww.tag name="combobox" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.ComboBoxTag"
+ * @ww.tag name="combobox" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.ComboBoxTag"
  * description="Widget that fills a text box from a select"
   */
 public class ComboBox extends TextField {
diff --git a/src/java/org/apache/struts/action2/components/Component.java b/src/java/org/apache/struts/action2/components/Component.java
index d9fe3f6cc..703e9c7b7 100644
--- a/src/java/org/apache/struts/action2/components/Component.java
+++ b/src/java/org/apache/struts/action2/components/Component.java
@@ -1,12 +1,12 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
-import com.opensymphony.webwork.util.FastByteArrayOutputStream;
-import com.opensymphony.webwork.views.jsp.TagUtils;
-import com.opensymphony.webwork.views.util.ContextUtil;
-import com.opensymphony.webwork.views.util.UrlHelper;
-import com.opensymphony.webwork.dispatcher.mapper.ActionMapping;
-import com.opensymphony.webwork.dispatcher.mapper.ActionMapper;
-import com.opensymphony.webwork.dispatcher.mapper.ActionMapperFactory;
+import org.apache.struts.action2.util.FastByteArrayOutputStream;
+import org.apache.struts.action2.views.jsp.TagUtils;
+import org.apache.struts.action2.views.util.ContextUtil;
+import org.apache.struts.action2.views.util.UrlHelper;
+import org.apache.struts.action2.dispatcher.mapper.ActionMapping;
+import org.apache.struts.action2.dispatcher.mapper.ActionMapper;
+import org.apache.struts.action2.dispatcher.mapper.ActionMapperFactory;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import com.opensymphony.xwork.util.TextParseUtil;
 import org.apache.commons.logging.Log;
@@ -297,7 +297,7 @@ public class Component {
     }
 
     /**
-     * Renders an action URL by consulting the {@link com.opensymphony.webwork.dispatcher.mapper.ActionMapper}.
+     * Renders an action URL by consulting the {@link org.apache.struts.action2.dispatcher.mapper.ActionMapper}.
      * @param action      the action
      * @param namespace   the namespace
      * @param method      the method
diff --git a/src/java/org/apache/struts/action2/components/Date.java b/src/java/org/apache/struts/action2/components/Date.java
index 6543f7f2e..b82e71a09 100644
--- a/src/java/org/apache/struts/action2/components/Date.java
+++ b/src/java/org/apache/struts/action2/components/Date.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.TextProvider;
@@ -124,7 +124,7 @@ import java.util.List;
  *
  *
  * @ww.tag name="date" tld-body-content="empty"
- *         tld-tag-class="com.opensymphony.webwork.views.jsp.DateTag"
+ *         tld-tag-class="org.apache.struts.action2.views.jsp.DateTag"
  *         description="Render a formatted date."
  */
 public class Date extends Component {
diff --git a/src/java/org/apache/struts/action2/components/DatePicker.java b/src/java/org/apache/struts/action2/components/DatePicker.java
index 111e5638e..2122ac723 100644
--- a/src/java/org/apache/struts/action2/components/DatePicker.java
+++ b/src/java/org/apache/struts/action2/components/DatePicker.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.util.OgnlValueStack;
@@ -83,7 +83,7 @@ import java.util.Locale;
  * @author Patrick Lightbody
  * @author Rene Gielen
  * @version $Revision: 1.12 $
- * @ww.tag name="datepicker" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.DatePickerTag"
+ * @ww.tag name="datepicker" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.DatePickerTag"
  * description="Render datepicker"
  * @since 2.2
  */
diff --git a/src/java/org/apache/struts/action2/components/Debug.java b/src/java/org/apache/struts/action2/components/Debug.java
index e5dc50730..dc9549bca 100644
--- a/src/java/org/apache/struts/action2/components/Debug.java
+++ b/src/java/org/apache/struts/action2/components/Debug.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlUtil;
 import com.opensymphony.xwork.util.OgnlValueStack;
@@ -40,7 +40,7 @@ import java.util.Map;
  * @version $Revision: 1.2 $
  * @since 2.2
  *
- * @ww.tag name="debug" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.DebugTag"
+ * @ww.tag name="debug" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.DebugTag"
  * description="Render debug tag"
   */
 public class Debug extends UIBean {
diff --git a/src/java/org/apache/struts/action2/components/DefaultRichtexteditorConnector.java b/src/java/org/apache/struts/action2/components/DefaultRichtexteditorConnector.java
index be4facd62..ff0af09ae 100644
--- a/src/java/org/apache/struts/action2/components/DefaultRichtexteditorConnector.java
+++ b/src/java/org/apache/struts/action2/components/DefaultRichtexteditorConnector.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.io.FileFilter;
 import java.io.FileInputStream;
@@ -20,8 +20,8 @@ import javax.servlet.ServletContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.opensymphony.webwork.util.ServletContextAware;
-import com.opensymphony.webwork.views.util.UrlHelper;
+import org.apache.struts.action2.util.ServletContextAware;
+import org.apache.struts.action2.views.util.UrlHelper;
 
 /**
  * 
diff --git a/src/java/org/apache/struts/action2/components/Div.java b/src/java/org/apache/struts/action2/components/Div.java
index 60fa8ba52..94849cc33 100644
--- a/src/java/org/apache/struts/action2/components/Div.java
+++ b/src/java/org/apache/struts/action2/components/Div.java
@@ -1,8 +1,8 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 import com.opensymphony.util.TextUtils;
-import com.opensymphony.webwork.views.util.UrlHelper;
+import org.apache.struts.action2.views.util.UrlHelper;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFactory;
  * @version $Revision: 1.11 $
  * @since 2.2
  *
- * @ww.tag name="div" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.DivTag"
+ * @ww.tag name="div" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.DivTag"
  * description="Render HTML div providing content from remote call via AJAX"
   */
 public class Div extends RemoteCallUIBean {
diff --git a/src/java/org/apache/struts/action2/components/DoubleListUIBean.java b/src/java/org/apache/struts/action2/components/DoubleListUIBean.java
index 8f84e3a54..ba9670b45 100644
--- a/src/java/org/apache/struts/action2/components/DoubleListUIBean.java
+++ b/src/java/org/apache/struts/action2/components/DoubleListUIBean.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import java.util.Map;
 
diff --git a/src/java/org/apache/struts/action2/components/DoubleSelect.java b/src/java/org/apache/struts/action2/components/DoubleSelect.java
index 2a687303f..b32cc2673 100644
--- a/src/java/org/apache/struts/action2/components/DoubleSelect.java
+++ b/src/java/org/apache/struts/action2/components/DoubleSelect.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletResponse;
  * @version $Revision: 1.11 $
  * @since 2.2
  *
- * @ww.tag name="doubleselect" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.DoubleSelectTag"
+ * @ww.tag name="doubleselect" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.DoubleSelectTag"
  * description="Renders two HTML select elements with second one changing displayed values depending on selected entry of first one."
  */
 public class DoubleSelect extends DoubleListUIBean {
diff --git a/src/java/org/apache/struts/action2/components/Else.java b/src/java/org/apache/struts/action2/components/Else.java
index 20a6b5239..eb18910cb 100644
--- a/src/java/org/apache/struts/action2/components/Else.java
+++ b/src/java/org/apache/struts/action2/components/Else.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -36,7 +36,7 @@ import java.util.Map;
  *
  * @author Rick Salsa (rsal@mb.sympatico.ca)
  * @author tmjee
- * @ww.tag name="else" bodycontent="JSP" description="Else tag"  tld-tag-class="com.opensymphony.webwork.views.jsp.ElseTag"
+ * @ww.tag name="else" bodycontent="JSP" description="Else tag"  tld-tag-class="org.apache.struts.action2.views.jsp.ElseTag"
  */
 public class Else extends Component {
     public Else(OgnlValueStack stack) {
diff --git a/src/java/org/apache/struts/action2/components/ElseIf.java b/src/java/org/apache/struts/action2/components/ElseIf.java
index 82ffb0c0a..c65db88dd 100644
--- a/src/java/org/apache/struts/action2/components/ElseIf.java
+++ b/src/java/org/apache/struts/action2/components/ElseIf.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -40,7 +40,7 @@ import java.io.Writer;
  *
  * @author Rick Salsa (rsal@mb.sympatico.ca)
  * @author tmjee
- * @ww.tag name="elseif" tld-body-content="JSP" description="Elseif tag"  tld-tag-class="com.opensymphony.webwork.views.jsp.ElseIfTag"
+ * @ww.tag name="elseif" tld-body-content="JSP" description="Elseif tag"  tld-tag-class="org.apache.struts.action2.views.jsp.ElseIfTag"
  */
 public class ElseIf extends Component {
     public ElseIf(OgnlValueStack stack) {
diff --git a/src/java/org/apache/struts/action2/components/FieldError.java b/src/java/org/apache/struts/action2/components/FieldError.java
index a34e76a7c..cfd270963 100644
--- a/src/java/org/apache/struts/action2/components/FieldError.java
+++ b/src/java/org/apache/struts/action2/components/FieldError.java
@@ -2,9 +2,9 @@
  * 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.Param.UnnamedParametric;
+import org.apache.struts.action2.components.Param.UnnamedParametric;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
@@ -65,7 +65,7 @@ import java.util.List;
  *
  * @author tm_jee
  * @version $Date: 2006/01/01 15:16:03 $ $Id: FieldError.java,v 1.7 2006/01/01 15:16:03 tmjee Exp $
- * @ww.tag name="fielderror" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.FieldErrorTag"
+ * @ww.tag name="fielderror" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.FieldErrorTag"
  * description="Render field error (all or partial depending on param tag nested)if they exists"
  */
 public class FieldError extends UIBean implements UnnamedParametric {
diff --git a/src/java/org/apache/struts/action2/components/File.java b/src/java/org/apache/struts/action2/components/File.java
index 4c791ef6f..3196a1046 100644
--- a/src/java/org/apache/struts/action2/components/File.java
+++ b/src/java/org/apache/struts/action2/components/File.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -27,7 +27,7 @@ import org.apache.commons.logging.LogFactory;
  * @version $Revision: 1.11 $
  * @since 2.2
  *
- * @ww.tag name="file" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.FileTag"
+ * @ww.tag name="file" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.FileTag"
  * description="Render a file input field"
   */
 public class File extends UIBean {
diff --git a/src/java/org/apache/struts/action2/components/Form.java b/src/java/org/apache/struts/action2/components/Form.java
index 98245981c..b5fd1ef99 100644
--- a/src/java/org/apache/struts/action2/components/Form.java
+++ b/src/java/org/apache/struts/action2/components/Form.java
@@ -1,11 +1,11 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
-import com.opensymphony.webwork.dispatcher.mapper.ActionMapperFactory;
-import com.opensymphony.webwork.dispatcher.mapper.ActionMapping;
-import com.opensymphony.webwork.dispatcher.DispatcherUtils;
-import com.opensymphony.webwork.portlet.context.PortletActionContext;
-import com.opensymphony.webwork.portlet.util.PortletUrlHelper;
-import com.opensymphony.webwork.views.util.UrlHelper;
+import org.apache.struts.action2.dispatcher.mapper.ActionMapperFactory;
+import org.apache.struts.action2.dispatcher.mapper.ActionMapping;
+import org.apache.struts.action2.dispatcher.DispatcherUtils;
+import org.apache.struts.action2.portlet.context.PortletActionContext;
+import org.apache.struts.action2.portlet.util.PortletUrlHelper;
+import org.apache.struts.action2.views.util.UrlHelper;
 import com.opensymphony.xwork.config.ConfigurationManager;
 import com.opensymphony.xwork.config.entities.ActionConfig;
 import com.opensymphony.xwork.util.OgnlValueStack;
@@ -53,7 +53,7 @@ import java.util.Iterator;
  * @version $Date: 2006/03/18 15:49:26 $ $Id: Form.java,v 1.29 2006/03/18 15:49:26 rgielen Exp $
  * @since 2.2
  *
- * @ww.tag name="form" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.FormTag"
+ * @ww.tag name="form" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.FormTag"
  * description="Renders an input form"
   */
 public class Form extends ClosingUIBean {
diff --git a/src/java/org/apache/struts/action2/components/FormButton.java b/src/java/org/apache/struts/action2/components/FormButton.java
index e88618cd9..3182f2840 100644
--- a/src/java/org/apache/struts/action2/components/FormButton.java
+++ b/src/java/org/apache/struts/action2/components/FormButton.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
diff --git a/src/java/org/apache/struts/action2/components/GenericUIBean.java b/src/java/org/apache/struts/action2/components/GenericUIBean.java
index 859b7f506..2d4843757 100644
--- a/src/java/org/apache/struts/action2/components/GenericUIBean.java
+++ b/src/java/org/apache/struts/action2/components/GenericUIBean.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
-import com.opensymphony.webwork.util.ContainUtil;
+import org.apache.struts.action2.util.ContainUtil;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -54,7 +54,7 @@ import javax.servlet.http.HttpServletResponse;
  * @version $Revision: 1.5 $
  * @since 2.2
  *
- * @ww.tag name="component" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.ComponentTag"
+ * @ww.tag name="component" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.ComponentTag"
  * description="Render a custom ui widget"
  */
 public class GenericUIBean extends UIBean {
diff --git a/src/java/org/apache/struts/action2/components/Head.java b/src/java/org/apache/struts/action2/components/Head.java
index a00e628f0..38eb94828 100644
--- a/src/java/org/apache/struts/action2/components/Head.java
+++ b/src/java/org/apache/struts/action2/components/Head.java
@@ -2,11 +2,11 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
-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 javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -60,7 +60,7 @@ import javax.servlet.http.HttpServletResponse;
  * @author Patrick Lightbody
  * @author Rainer Hermanns
  * @author Rene Gielen
- * @ww.tag name="head" tld-body-content="empty" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.HeadTag"
+ * @ww.tag name="head" tld-body-content="empty" tld-tag-class="org.apache.struts.action2.views.jsp.ui.HeadTag"
  * description="Render a chunk of HEAD for your HTML file"
  * @since 2.2
  */
diff --git a/src/java/org/apache/struts/action2/components/Hidden.java b/src/java/org/apache/struts/action2/components/Hidden.java
index 9fbf8a0a5..0c44ce3f6 100644
--- a/src/java/org/apache/struts/action2/components/Hidden.java
+++ b/src/java/org/apache/struts/action2/components/Hidden.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -31,7 +31,7 @@ import javax.servlet.http.HttpServletResponse;
  * @version $Revision: 1.5 $
  * @since 2.2
  *
- * @ww.tag name="hidden" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.HiddenTag"
+ * @ww.tag name="hidden" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.HiddenTag"
  * description="Render a hidden input field"
   */
 public class Hidden extends UIBean {
diff --git a/src/java/org/apache/struts/action2/components/I18n.java b/src/java/org/apache/struts/action2/components/I18n.java
index 58b8b5754..adcebcc77 100644
--- a/src/java/org/apache/struts/action2/components/I18n.java
+++ b/src/java/org/apache/struts/action2/components/I18n.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.LocaleProvider;
@@ -63,7 +63,7 @@ import java.util.ResourceBundle;
  * @version $Revision: 1.13 $
  * @since 2.2
  *
- * @ww.tag name="i18n" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.I18nTag"
+ * @ww.tag name="i18n" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.I18nTag"
  * description="Get a resource bundle and place it on the value stack"
  */
 public class I18n extends Component {
diff --git a/src/java/org/apache/struts/action2/components/If.java b/src/java/org/apache/struts/action2/components/If.java
index 4ded4b661..c233abe68 100644
--- a/src/java/org/apache/struts/action2/components/If.java
+++ b/src/java/org/apache/struts/action2/components/If.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -43,7 +43,7 @@ import java.io.Writer;
  * @see Else
  * @see ElseIf
  *
- * @ww.tag name="if" tld-body-content="JSP" description="If tag" tld-tag-class="com.opensymphony.webwork.views.jsp.IfTag"
+ * @ww.tag name="if" tld-body-content="JSP" description="If tag" tld-tag-class="org.apache.struts.action2.views.jsp.IfTag"
  */
 public class If extends Component {
     public static final String ANSWER = "webwork.if.answer";
diff --git a/src/java/org/apache/struts/action2/components/Include.java b/src/java/org/apache/struts/action2/components/Include.java
index b7ef7baa9..f4c90c540 100644
--- a/src/java/org/apache/struts/action2/components/Include.java
+++ b/src/java/org/apache/struts/action2/components/Include.java
@@ -1,9 +1,9 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.util.FastByteArrayOutputStream;
-import com.opensymphony.webwork.RequestUtils;
-import com.opensymphony.webwork.WebWorkConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.util.FastByteArrayOutputStream;
+import org.apache.struts.action2.RequestUtils;
+import org.apache.struts.action2.WebWorkConstants;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import org.apache.commons.logging.Log;
@@ -69,7 +69,7 @@ import java.util.*;
  * @version $Revision: 1.20 $
  * @since 2.2
  *
- * @ww.tag name="include" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.IncludeTag"
+ * @ww.tag name="include" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.IncludeTag"
  * description="Include a servlet's output (result of servlet or a JSP page)"
  */
 public class Include extends Component {
diff --git a/src/java/org/apache/struts/action2/components/IteratorComponent.java b/src/java/org/apache/struts/action2/components/IteratorComponent.java
index 6178349c4..1997ba6b4 100644
--- a/src/java/org/apache/struts/action2/components/IteratorComponent.java
+++ b/src/java/org/apache/struts/action2/components/IteratorComponent.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
-import com.opensymphony.webwork.util.MakeIterator;
-import com.opensymphony.webwork.views.jsp.IteratorStatus;
+import org.apache.struts.action2.util.MakeIterator;
+import org.apache.struts.action2.views.jsp.IteratorStatus;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import java.io.Writer;
@@ -58,7 +58,7 @@ import java.util.Iterator;
  * <pre>
  * <!-- START SNIPPET: example2code -->
  * 
- * &lt;ww:bean name="com.opensymphony.webwork.example.IteratorExample" id="it"&gt;
+ * &lt;ww:bean name="org.apache.struts.action2.example.IteratorExample" id="it"&gt;
  *   &lt;ww:param name="day" value="'foo'"/&gt;
  *   &lt;ww:param name="day" value="'bar'"/&gt;
  * &lt;/ww:bean&gt;
@@ -140,7 +140,7 @@ import java.util.Iterator;
  * @author Rick Salsa (rsal@mb.sympatico.ca)
  * @author tm_jee ( tm_jee(at)yahoo.co.uk )
  * @version $Revision: 1.11 $
- * @ww.tag name="iterator" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.IteratorTag"
+ * @ww.tag name="iterator" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.IteratorTag"
  * description="Iterate over a iterable value"
  */
 public class IteratorComponent extends Component {
diff --git a/src/java/org/apache/struts/action2/components/Label.java b/src/java/org/apache/struts/action2/components/Label.java
index 21166aced..c5eab9ca8 100644
--- a/src/java/org/apache/struts/action2/components/Label.java
+++ b/src/java/org/apache/struts/action2/components/Label.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletResponse;
  * @version $Revision: 1.11 $
  * @since 2.2
  *
- * @ww.tag name="label" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.LabelTag"
+ * @ww.tag name="label" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.LabelTag"
  * description="Render a label that displays read-only information"
   */
 public class Label extends UIBean {
diff --git a/src/java/org/apache/struts/action2/components/ListUIBean.java b/src/java/org/apache/struts/action2/components/ListUIBean.java
index d047ecc2a..21e9725b8 100644
--- a/src/java/org/apache/struts/action2/components/ListUIBean.java
+++ b/src/java/org/apache/struts/action2/components/ListUIBean.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
-import com.opensymphony.webwork.util.ContainUtil;
-import com.opensymphony.webwork.util.MakeIterator;
+import org.apache.struts.action2.util.ContainUtil;
+import org.apache.struts.action2.util.MakeIterator;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/components/MergeIterator.java b/src/java/org/apache/struts/action2/components/MergeIterator.java
index 7dfa4d53b..9d694e4ed 100644
--- a/src/java/org/apache/struts/action2/components/MergeIterator.java
+++ b/src/java/org/apache/struts/action2/components/MergeIterator.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.io.Writer;
 import java.util.ArrayList;
@@ -12,9 +12,9 @@ import java.util.List;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.opensymphony.webwork.components.Param.UnnamedParametric;
-import com.opensymphony.webwork.util.MakeIterator;
-import com.opensymphony.webwork.util.MergeIteratorFilter;
+import org.apache.struts.action2.components.Param.UnnamedParametric;
+import org.apache.struts.action2.util.MakeIterator;
+import org.apache.struts.action2.util.MergeIteratorFilter;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 /**
@@ -108,10 +108,10 @@ import com.opensymphony.xwork.util.OgnlValueStack;
  *
  * @author tm_jee (tm_jee (at) yahoo.co.uk)
  * @version $Date: 2006/03/18 16:14:40 $ $Id: MergeIterator.java,v 1.10 2006/03/18 16:14:40 rgielen Exp $
- * @see com.opensymphony.webwork.util.MergeIteratorFilter
- * @see com.opensymphony.webwork.views.jsp.iterator.MergeIteratorTag
+ * @see org.apache.struts.action2.util.MergeIteratorFilter
+ * @see org.apache.struts.action2.views.jsp.iterator.MergeIteratorTag
  *
- * @ww.tag name="merge" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.iterator.MergeIteratorTag"
+ * @ww.tag name="merge" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.iterator.MergeIteratorTag"
  * description="Merge the values of a list of iterators into one iterator"
  */
 public class MergeIterator extends Component implements UnnamedParametric {
diff --git a/src/java/org/apache/struts/action2/components/OptionTransferSelect.java b/src/java/org/apache/struts/action2/components/OptionTransferSelect.java
index 67694735f..adb1d3c6e 100644
--- a/src/java/org/apache/struts/action2/components/OptionTransferSelect.java
+++ b/src/java/org/apache/struts/action2/components/OptionTransferSelect.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.ArrayList;
 import java.util.LinkedHashMap;
@@ -78,7 +78,7 @@ import com.opensymphony.xwork.util.OgnlValueStack;
  * 
  * @author tm_jee
  * @version $Date: 2006/03/18 16:14:42 $ $Id: OptionTransferSelect.java,v 1.9 2006/03/18 16:14:42 rgielen Exp $
- * @ww.tag name="optiontransferselect" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.OptionTransferSelectTag"
+ * @ww.tag name="optiontransferselect" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.OptionTransferSelectTag"
  * description="Renders an input form"
  */
 public class OptionTransferSelect extends DoubleListUIBean {
diff --git a/src/java/org/apache/struts/action2/components/Panel.java b/src/java/org/apache/struts/action2/components/Panel.java
index fa7dfe680..853e0bc6f 100644
--- a/src/java/org/apache/struts/action2/components/Panel.java
+++ b/src/java/org/apache/struts/action2/components/Panel.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 import org.apache.commons.logging.Log;
@@ -25,7 +25,7 @@ import java.io.Writer;
  *
  * @see TabbedPanel
  *
- * @ww.tag name="panel" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.PanelTag"
+ * @ww.tag name="panel" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.PanelTag"
  * description="Render a panel for tabbedPanel"
  */
 public class Panel extends Div {
diff --git a/src/java/org/apache/struts/action2/components/Param.java b/src/java/org/apache/struts/action2/components/Param.java
index adf9c8a50..293c80380 100644
--- a/src/java/org/apache/struts/action2/components/Param.java
+++ b/src/java/org/apache/struts/action2/components/Param.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -74,7 +74,7 @@ import java.io.Writer;
  * @see Bean
  * @see Text
  *
- * @ww.tag name="param" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ParamTag"
+ * @ww.tag name="param" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ParamTag"
  * description="Parametrize other tags"
  */
 public class Param extends Component {
diff --git a/src/java/org/apache/struts/action2/components/Password.java b/src/java/org/apache/struts/action2/components/Password.java
index 6824ff494..fb23aaa69 100644
--- a/src/java/org/apache/struts/action2/components/Password.java
+++ b/src/java/org/apache/struts/action2/components/Password.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletResponse;
  * @version $Revision: 1.8 $
  * @since 2.2
  *
- * @ww.tag name="password" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.PasswordTag"
+ * @ww.tag name="password" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.PasswordTag"
  * description="Render an HTML input tag of type password"
  */
 public class Password extends TextField {
diff --git a/src/java/org/apache/struts/action2/components/Property.java b/src/java/org/apache/struts/action2/components/Property.java
index 46070c41e..5b252c20c 100644
--- a/src/java/org/apache/struts/action2/components/Property.java
+++ b/src/java/org/apache/struts/action2/components/Property.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 import com.opensymphony.util.TextUtils;
@@ -71,7 +71,7 @@ import org.apache.commons.logging.LogFactory;
  * @author Rene Gielen
  * @version $Revision: 1.4 $
  *
- * @ww.tag name="property" tld-body-content="empty" tld-tag-class="com.opensymphony.webwork.views.jsp.PropertyTag"
+ * @ww.tag name="property" tld-body-content="empty" tld-tag-class="org.apache.struts.action2.views.jsp.PropertyTag"
  * description="Print out expression which evaluates against the stack"
  */
 public class Property extends Component {
diff --git a/src/java/org/apache/struts/action2/components/Push.java b/src/java/org/apache/struts/action2/components/Push.java
index ddb12a3fe..5abca0cff 100644
--- a/src/java/org/apache/struts/action2/components/Push.java
+++ b/src/java/org/apache/struts/action2/components/Push.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -92,7 +92,7 @@ import java.io.Writer;
  * @version $Revision: 1.15 $
  * @since 2.2
  *
- * @ww.tag name="push" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.PushTag"
+ * @ww.tag name="push" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.PushTag"
  * description="Push value on stack for simplified usage."
  */
 public class Push extends Component {
diff --git a/src/java/org/apache/struts/action2/components/Radio.java b/src/java/org/apache/struts/action2/components/Radio.java
index 8342a99fc..ab0c00d4e 100644
--- a/src/java/org/apache/struts/action2/components/Radio.java
+++ b/src/java/org/apache/struts/action2/components/Radio.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -32,7 +32,7 @@ import javax.servlet.http.HttpServletResponse;
  * @version $Revision: 1.6 $
  * @since 2.2
  *
- * @ww.tag name="radio" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.RadioTag"
+ * @ww.tag name="radio" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.RadioTag"
  * description="Renders a radio button input field"
  */
 public class Radio extends ListUIBean {
diff --git a/src/java/org/apache/struts/action2/components/RemoteCallUIBean.java b/src/java/org/apache/struts/action2/components/RemoteCallUIBean.java
index bc7e16f40..55505955e 100644
--- a/src/java/org/apache/struts/action2/components/RemoteCallUIBean.java
+++ b/src/java/org/apache/struts/action2/components/RemoteCallUIBean.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
diff --git a/src/java/org/apache/struts/action2/components/Reset.java b/src/java/org/apache/struts/action2/components/Reset.java
index 14fede064..28c53b572 100644
--- a/src/java/org/apache/struts/action2/components/Reset.java
+++ b/src/java/org/apache/struts/action2/components/Reset.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -40,7 +40,7 @@ import javax.servlet.http.HttpServletResponse;
  * @version $Revision: 1.4 $
  * @since 2.2.2
  *
- * @ww.tag name="reset" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.ResetTag"
+ * @ww.tag name="reset" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.ResetTag"
  * description="Render a reset button"
  */
 public class Reset extends FormButton {
diff --git a/src/java/org/apache/struts/action2/components/RichTextEditor.java b/src/java/org/apache/struts/action2/components/RichTextEditor.java
index 19a0a9e28..07252f4e5 100644
--- a/src/java/org/apache/struts/action2/components/RichTextEditor.java
+++ b/src/java/org/apache/struts/action2/components/RichTextEditor.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.ActionContext;
 import com.opensymphony.xwork.util.OgnlValueStack;
@@ -47,7 +47,7 @@ import java.util.Locale;
  *   &lt;package name="richtexteditor-browse" extends="webwork-default" 
  *   namespace="/webwork/richtexteditor/editor/filemanager/browser/default/connectors/jsp"&gt;
  *   	&lt;action name="connector" 
- *      class="com.opensymphony.webwork.components.DefaultRichtexteditorConnector" 
+ *      class="org.apache.struts.action2.components.DefaultRichtexteditorConnector" 
  *      method="browse">
  *   		&lt;result name="getFolders" type="richtexteditorGetFolders" /&gt;
  *   		&lt;result name="getFoldersAndFiles" type="richtexteditorGetFoldersAndFiles" /&gt;
@@ -108,7 +108,7 @@ import java.util.Locale;
  *   &lt;package name="richtexteditor-upload" extends="webwork-default" 
  *   namespace="/webwork/richtexteditor/editor/filemanager/upload"&gt;
  *		&lt;action name="uploader" 
- *       class="com.opensymphony.webwork.components.DefaultRichtexteditorConnector" 
+ *       class="org.apache.struts.action2.components.DefaultRichtexteditorConnector" 
  *       method="upload"&gt;
  *			&lt;result name="richtexteditorFileUpload" /&gt;
  *		&lt;/action&gt;    
@@ -180,7 +180,7 @@ import java.util.Locale;
  * @version $Date: 2006/03/18 15:45:33 $ $Id: RichTextEditor.java,v 1.9 2006/03/18 15:45:33 rgielen Exp $
  * @see AbstractRichtexteditorConnector
  * 
- * @ww.tag name="richtexteditor" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.RichTextEditorTag"
+ * @ww.tag name="richtexteditor" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.RichTextEditorTag"
  * description="Render a rich text editor element"
  */
 public class RichTextEditor extends UIBean {
diff --git a/src/java/org/apache/struts/action2/components/Select.java b/src/java/org/apache/struts/action2/components/Select.java
index 57b7209fd..1d060e2d1 100644
--- a/src/java/org/apache/struts/action2/components/Select.java
+++ b/src/java/org/apache/struts/action2/components/Select.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -59,7 +59,7 @@ import javax.servlet.http.HttpServletResponse;
  * @version $Revision: 1.9 $
  * @since 2.2
  *
- * @ww.tag name="select" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.SelectTag"
+ * @ww.tag name="select" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.SelectTag"
  * description="Render a select element"
  */
 public class Select extends ListUIBean {
diff --git a/src/java/org/apache/struts/action2/components/Set.java b/src/java/org/apache/struts/action2/components/Set.java
index e3ba9df55..0d622917b 100644
--- a/src/java/org/apache/struts/action2/components/Set.java
+++ b/src/java/org/apache/struts/action2/components/Set.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -44,7 +44,7 @@ import java.io.Writer;
  * @version $Revision: 1.12 $
  * @since 2.2
  *
- * @ww.tag name="set" tld-body-content="empty" tld-tag-class="com.opensymphony.webwork.views.jsp.SetTag"
+ * @ww.tag name="set" tld-body-content="empty" tld-tag-class="org.apache.struts.action2.views.jsp.SetTag"
  * description="Assigns a value to a variable in a specified scope"
  */
 public class Set extends Component {
diff --git a/src/java/org/apache/struts/action2/components/Submit.java b/src/java/org/apache/struts/action2/components/Submit.java
index bb54770db..068f61c06 100644
--- a/src/java/org/apache/struts/action2/components/Submit.java
+++ b/src/java/org/apache/struts/action2/components/Submit.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -145,7 +145,7 @@ import javax.servlet.http.HttpServletResponse;
  * @version $Revision: 1.16 $
  * @since 2.2
  *
- * @ww.tag name="submit" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.SubmitTag"
+ * @ww.tag name="submit" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.SubmitTag"
  * description="Render a submit button"
  */
 public class Submit extends FormButton {
diff --git a/src/java/org/apache/struts/action2/components/TabbedPanel.java b/src/java/org/apache/struts/action2/components/TabbedPanel.java
index 18eb5d2d3..307ccb41a 100644
--- a/src/java/org/apache/struts/action2/components/TabbedPanel.java
+++ b/src/java/org/apache/struts/action2/components/TabbedPanel.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -76,7 +76,7 @@ import java.util.List;
  *
  * @see Panel
  *
- * @ww.tag name="tabbedPanel" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.TabbedPanelTag"
+ * @ww.tag name="tabbedPanel" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.TabbedPanelTag"
  * description="Render a tabbedPanel widget."
  */
 public class TabbedPanel extends ClosingUIBean {
diff --git a/src/java/org/apache/struts/action2/components/Text.java b/src/java/org/apache/struts/action2/components/Text.java
index 9bc4b854f..b79d589b7 100644
--- a/src/java/org/apache/struts/action2/components/Text.java
+++ b/src/java/org/apache/struts/action2/components/Text.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import java.io.IOException;
 import java.io.Writer;
@@ -87,7 +87,7 @@ import com.opensymphony.xwork.util.OgnlValueStack;
  *
  * @see Param
  *
- * @ww.tag name="text" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.TextTag"
+ * @ww.tag name="text" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.TextTag"
  * description="Render a I18n text message."
  */
 public class Text extends Component implements Param.UnnamedParametric {
diff --git a/src/java/org/apache/struts/action2/components/TextArea.java b/src/java/org/apache/struts/action2/components/TextArea.java
index b7a2f52c4..614140423 100644
--- a/src/java/org/apache/struts/action2/components/TextArea.java
+++ b/src/java/org/apache/struts/action2/components/TextArea.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletResponse;
  *
  * @see TabbedPanel
  *
- * @ww.tag name="textarea" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.TextareaTag"
+ * @ww.tag name="textarea" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.TextareaTag"
  * description="Render HTML textarea tag."
  */
 public class TextArea extends UIBean {
diff --git a/src/java/org/apache/struts/action2/components/TextField.java b/src/java/org/apache/struts/action2/components/TextField.java
index 832055381..da5276cba 100644
--- a/src/java/org/apache/struts/action2/components/TextField.java
+++ b/src/java/org/apache/struts/action2/components/TextField.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletResponse;
  * @version $Revision: 1.10 $
  * @since 2.2
  *
- * @ww.tag name="textfield" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.TextFieldTag"
+ * @ww.tag name="textfield" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.TextFieldTag"
  * description="Render an HTML input field of type text"
  */
 public class TextField extends UIBean {
diff --git a/src/java/org/apache/struts/action2/components/Token.java b/src/java/org/apache/struts/action2/components/Token.java
index 2ab5cff5b..d310abaff 100644
--- a/src/java/org/apache/struts/action2/components/Token.java
+++ b/src/java/org/apache/struts/action2/components/Token.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
-import com.opensymphony.webwork.util.TokenHelper;
+import org.apache.struts.action2.util.TokenHelper;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
@@ -34,10 +34,10 @@ import java.util.Map;
  * @version $Date: 2006/03/18 16:24:46 $ $Id: Token.java,v 1.8 2006/03/18 16:24:46 rgielen Exp $
  * @since 2.2
  *
- * @see com.opensymphony.webwork.interceptor.TokenInterceptor
- * @see com.opensymphony.webwork.interceptor.TokenSessionStoreInterceptor
+ * @see org.apache.struts.action2.interceptor.TokenInterceptor
+ * @see org.apache.struts.action2.interceptor.TokenSessionStoreInterceptor
  *
- * @ww.tag name="token" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.TokenTag"
+ * @ww.tag name="token" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.TokenTag"
  * description="Stop double-submission of forms"
  */
 public class Token extends UIBean {
@@ -53,7 +53,7 @@ public class Token extends UIBean {
     }
 
     /**
-     * First looks for the token in the PageContext using the supplied name (or {@link com.opensymphony.webwork.util.TokenHelper#DEFAULT_TOKEN_NAME}
+     * First looks for the token in the PageContext using the supplied name (or {@link org.apache.struts.action2.util.TokenHelper#DEFAULT_TOKEN_NAME}
      * if no name is provided) so that the same token can be re-used for the scope of a request for the same name. If
      * the token is not in the PageContext, a new Token is created and set into the Session and the PageContext with
      * the name.
diff --git a/src/java/org/apache/struts/action2/components/Tree.java b/src/java/org/apache/struts/action2/components/Tree.java
index 9aaa1f89b..977323cb0 100644
--- a/src/java/org/apache/struts/action2/components/Tree.java
+++ b/src/java/org/apache/struts/action2/components/Tree.java
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2005 ePlus Corporation. All Rights Reserved.
  */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -28,7 +28,7 @@ import java.io.Writer;
  *
  * @author Jason Carreira <jcarreira@eplus.com>
  *
- * @ww.tag name="tree" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.TreeTag"
+ * @ww.tag name="tree" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.TreeTag"
  * description="Render a tree widget."
  */
 public class Tree extends ClosingUIBean {
diff --git a/src/java/org/apache/struts/action2/components/TreeNode.java b/src/java/org/apache/struts/action2/components/TreeNode.java
index cb06c38f3..ed5246252 100644
--- a/src/java/org/apache/struts/action2/components/TreeNode.java
+++ b/src/java/org/apache/struts/action2/components/TreeNode.java
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2005 Opensymphony. All Rights Reserved.
  */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletResponse;
  *
  * @author Jason Carreira <jcarreira@eplus.com>
  *
- * @ww.tag name="treenode" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.TreeNodeTag"
+ * @ww.tag name="treenode" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.TreeNodeTag"
  * description="Render a tree node within a tree widget."
  */
 public class TreeNode extends ClosingUIBean {
diff --git a/src/java/org/apache/struts/action2/components/UIBean.java b/src/java/org/apache/struts/action2/components/UIBean.java
index 18c5418cd..e10df8dce 100644
--- a/src/java/org/apache/struts/action2/components/UIBean.java
+++ b/src/java/org/apache/struts/action2/components/UIBean.java
@@ -2,15 +2,15 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
-import com.opensymphony.webwork.WebWorkConstants;
-import com.opensymphony.webwork.components.template.Template;
-import com.opensymphony.webwork.components.template.TemplateEngine;
-import com.opensymphony.webwork.components.template.TemplateEngineManager;
-import com.opensymphony.webwork.components.template.TemplateRenderingContext;
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.views.util.ContextUtil;
+import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.components.template.Template;
+import org.apache.struts.action2.components.template.TemplateEngine;
+import org.apache.struts.action2.components.template.TemplateEngineManager;
+import org.apache.struts.action2.components.template.TemplateRenderingContext;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.views.util.ContextUtil;
 import com.opensymphony.xwork.config.ConfigurationException;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import org.apache.commons.logging.Log;
diff --git a/src/java/org/apache/struts/action2/components/URL.java b/src/java/org/apache/struts/action2/components/URL.java
index bdfc87f7d..034c0292e 100644
--- a/src/java/org/apache/struts/action2/components/URL.java
+++ b/src/java/org/apache/struts/action2/components/URL.java
@@ -3,12 +3,12 @@
  * All rights reserved.
  */
 
-package com.opensymphony.webwork.components;
+package org.apache.struts.action2.components;
 
-import com.opensymphony.webwork.portlet.context.PortletActionContext;
-import com.opensymphony.webwork.portlet.util.PortletUrlHelper;
-import com.opensymphony.webwork.views.util.UrlHelper;
-import com.opensymphony.webwork.dispatcher.DispatcherUtils;
+import org.apache.struts.action2.portlet.context.PortletActionContext;
+import org.apache.struts.action2.portlet.util.PortletUrlHelper;
+import org.apache.struts.action2.views.util.UrlHelper;
+import org.apache.struts.action2.dispatcher.DispatcherUtils;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import com.opensymphony.xwork.util.XWorkContinuationConfig;
 import com.opensymphony.xwork.ActionContext;
@@ -93,7 +93,7 @@ import java.util.Map;
  *
  * @see Param
  *
- * @ww.tag name="url" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.URLTag"
+ * @ww.tag name="url" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.URLTag"
  * description="This tag is used to create a URL"
  */
 public class URL extends Component {
diff --git a/src/java/org/apache/struts/action2/components/UpDownSelect.java b/src/java/org/apache/struts/action2/components/UpDownSelect.java
index 994a80119..43c57c531 100644
--- a/src/java/org/apache/struts/action2/components/UpDownSelect.java
+++ b/src/java/org/apache/struts/action2/components/UpDownSelect.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.LinkedHashMap;
 import java.util.Map;
@@ -58,7 +58,7 @@ import com.opensymphony.xwork.util.OgnlValueStack;
  * @author tm_jee
  * @version $Date: 2006/03/18 15:50:12 $ $Id: UpDownSelect.java,v 1.7 2006/03/18 15:50:12 rgielen Exp $
  * 
- * @ww.tag name="updownselect" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.UpDownSelectTag"
+ * @ww.tag name="updownselect" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.UpDownSelectTag"
  * description="Render a up down select element"
  */
 public class UpDownSelect extends Select {
diff --git a/src/java/org/apache/struts/action2/components/table/AbstractFilterModel.java b/src/java/org/apache/struts/action2/components/table/AbstractFilterModel.java
index 6b443ccc2..db2b25b13 100644
--- a/src/java/org/apache/struts/action2/components/table/AbstractFilterModel.java
+++ b/src/java/org/apache/struts/action2/components/table/AbstractFilterModel.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.components.table;
+package org.apache.struts.action2.components.table;
 
 import javax.swing.table.AbstractTableModel;
 import javax.swing.table.DefaultTableModel;
diff --git a/src/java/org/apache/struts/action2/components/table/RenderFilterModel.java b/src/java/org/apache/struts/action2/components/table/RenderFilterModel.java
index 921c1eeed..3ff6f006e 100644
--- a/src/java/org/apache/struts/action2/components/table/RenderFilterModel.java
+++ b/src/java/org/apache/struts/action2/components/table/RenderFilterModel.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.components.table;
+package org.apache.struts.action2.components.table;
 
 import javax.swing.table.TableModel;
 
diff --git a/src/java/org/apache/struts/action2/components/table/SortFilterModel.java b/src/java/org/apache/struts/action2/components/table/SortFilterModel.java
index f5d49c5bb..f519ddfac 100644
--- a/src/java/org/apache/struts/action2/components/table/SortFilterModel.java
+++ b/src/java/org/apache/struts/action2/components/table/SortFilterModel.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.components.table;
+package org.apache.struts.action2.components.table;
 
 import javax.swing.*;
 import javax.swing.event.TableModelEvent;
diff --git a/src/java/org/apache/struts/action2/components/table/SortableTableModel.java b/src/java/org/apache/struts/action2/components/table/SortableTableModel.java
index b0aae4096..26b520e7b 100644
--- a/src/java/org/apache/struts/action2/components/table/SortableTableModel.java
+++ b/src/java/org/apache/struts/action2/components/table/SortableTableModel.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.components.table;
+package org.apache.struts.action2.components.table;
 
 import javax.swing.table.TableModel;
 
diff --git a/src/java/org/apache/struts/action2/components/table/WebTable.java b/src/java/org/apache/struts/action2/components/table/WebTable.java
index efa23d634..7038448d8 100644
--- a/src/java/org/apache/struts/action2/components/table/WebTable.java
+++ b/src/java/org/apache/struts/action2/components/table/WebTable.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.components.table;
+package org.apache.struts.action2.components.table;
 
-import com.opensymphony.webwork.components.GenericUIBean;
-import com.opensymphony.webwork.components.table.renderer.CellRenderer;
+import org.apache.struts.action2.components.GenericUIBean;
+import org.apache.struts.action2.components.table.renderer.CellRenderer;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -15,7 +15,7 @@ import java.util.Iterator;
 import java.util.NoSuchElementException;
 
 /**
- * @ww.tag name="table" tld-body-content="JSP" tld-tag-class="com.opensymphony.webwork.views.jsp.ui.table.WebTableTag"
+ * @ww.tag name="table" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.table.WebTableTag"
  * description="Instantiate a JavaBean and place it in the context."
  */
 public class WebTable extends GenericUIBean {
@@ -274,7 +274,7 @@ public class WebTable extends GenericUIBean {
     }
 
     /**
-     * Whether the table should be sortable. Requires that model implements com.opensymphony.webwork.components.table.SortableTableModel if set to true.
+     * Whether the table should be sortable. Requires that model implements org.apache.struts.action2.components.table.SortableTableModel if set to true.
      * @ww.tagattribute required="false" type="Boolean" default="false"
      */
     public void setSortable(boolean sortable) {
diff --git a/src/java/org/apache/struts/action2/components/table/WebTableColumn.java b/src/java/org/apache/struts/action2/components/table/WebTableColumn.java
index 19a7b1676..56dd18b2c 100644
--- a/src/java/org/apache/struts/action2/components/table/WebTableColumn.java
+++ b/src/java/org/apache/struts/action2/components/table/WebTableColumn.java
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.components.table;
+package org.apache.struts.action2.components.table;
 
-import com.opensymphony.webwork.components.table.renderer.CellRenderer;
-import com.opensymphony.webwork.components.table.renderer.DefaultCellRenderer;
+import org.apache.struts.action2.components.table.renderer.CellRenderer;
+import org.apache.struts.action2.components.table.renderer.DefaultCellRenderer;
 
 
 /**
diff --git a/src/java/org/apache/struts/action2/components/table/renderer/AbstractCellRenderer.java b/src/java/org/apache/struts/action2/components/table/renderer/AbstractCellRenderer.java
index 70e106b50..d317b2d75 100644
--- a/src/java/org/apache/struts/action2/components/table/renderer/AbstractCellRenderer.java
+++ b/src/java/org/apache/struts/action2/components/table/renderer/AbstractCellRenderer.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.components.table.renderer;
+package org.apache.struts.action2.components.table.renderer;
 
-import com.opensymphony.webwork.components.table.WebTable;
+import org.apache.struts.action2.components.table.WebTable;
 
 
 /**
diff --git a/src/java/org/apache/struts/action2/components/table/renderer/BooleanCellRenderer.java b/src/java/org/apache/struts/action2/components/table/renderer/BooleanCellRenderer.java
index 661a81670..03b0a344d 100644
--- a/src/java/org/apache/struts/action2/components/table/renderer/BooleanCellRenderer.java
+++ b/src/java/org/apache/struts/action2/components/table/renderer/BooleanCellRenderer.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.components.table.renderer;
+package org.apache.struts.action2.components.table.renderer;
 
-import com.opensymphony.webwork.components.table.WebTable;
+import org.apache.struts.action2.components.table.WebTable;
 
 
 /**
diff --git a/src/java/org/apache/struts/action2/components/table/renderer/CellRenderer.java b/src/java/org/apache/struts/action2/components/table/renderer/CellRenderer.java
index 80d357d6f..4754728e3 100644
--- a/src/java/org/apache/struts/action2/components/table/renderer/CellRenderer.java
+++ b/src/java/org/apache/struts/action2/components/table/renderer/CellRenderer.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.components.table.renderer;
+package org.apache.struts.action2.components.table.renderer;
 
-import com.opensymphony.webwork.components.table.WebTable;
+import org.apache.struts.action2.components.table.WebTable;
 
 /**
  * @author $author$
diff --git a/src/java/org/apache/struts/action2/components/table/renderer/DateCellRenderer.java b/src/java/org/apache/struts/action2/components/table/renderer/DateCellRenderer.java
index 1865f616d..b2b35523e 100644
--- a/src/java/org/apache/struts/action2/components/table/renderer/DateCellRenderer.java
+++ b/src/java/org/apache/struts/action2/components/table/renderer/DateCellRenderer.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.components.table.renderer;
+package org.apache.struts.action2.components.table.renderer;
 
-import com.opensymphony.webwork.components.table.WebTable;
+import org.apache.struts.action2.components.table.WebTable;
 
 import java.text.SimpleDateFormat;
 
diff --git a/src/java/org/apache/struts/action2/components/table/renderer/DefaultCellRenderer.java b/src/java/org/apache/struts/action2/components/table/renderer/DefaultCellRenderer.java
index b684b88a9..dfe0a011a 100644
--- a/src/java/org/apache/struts/action2/components/table/renderer/DefaultCellRenderer.java
+++ b/src/java/org/apache/struts/action2/components/table/renderer/DefaultCellRenderer.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.components.table.renderer;
+package org.apache.struts.action2.components.table.renderer;
 
-import com.opensymphony.webwork.components.table.WebTable;
+import org.apache.struts.action2.components.table.WebTable;
 
 
 /**
diff --git a/src/java/org/apache/struts/action2/components/table/renderer/FixedTextCellRenderer.java b/src/java/org/apache/struts/action2/components/table/renderer/FixedTextCellRenderer.java
index 76fcd95c0..8a42058f6 100644
--- a/src/java/org/apache/struts/action2/components/table/renderer/FixedTextCellRenderer.java
+++ b/src/java/org/apache/struts/action2/components/table/renderer/FixedTextCellRenderer.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.components.table.renderer;
+package org.apache.struts.action2.components.table.renderer;
 
-import com.opensymphony.webwork.components.table.WebTable;
+import org.apache.struts.action2.components.table.WebTable;
 
 
 /**
diff --git a/src/java/org/apache/struts/action2/components/table/renderer/LinkCellRenderer.java b/src/java/org/apache/struts/action2/components/table/renderer/LinkCellRenderer.java
index bfc6c151f..c4c6b8992 100644
--- a/src/java/org/apache/struts/action2/components/table/renderer/LinkCellRenderer.java
+++ b/src/java/org/apache/struts/action2/components/table/renderer/LinkCellRenderer.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.components.table.renderer;
+package org.apache.struts.action2.components.table.renderer;
 
-import com.opensymphony.webwork.components.table.WebTable;
+import org.apache.struts.action2.components.table.WebTable;
 
 
 /**
diff --git a/src/java/org/apache/struts/action2/components/table/renderer/NumericCellRenderer.java b/src/java/org/apache/struts/action2/components/table/renderer/NumericCellRenderer.java
index 462451b3f..410e85967 100644
--- a/src/java/org/apache/struts/action2/components/table/renderer/NumericCellRenderer.java
+++ b/src/java/org/apache/struts/action2/components/table/renderer/NumericCellRenderer.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.components.table.renderer;
+package org.apache.struts.action2.components.table.renderer;
 
-import com.opensymphony.webwork.components.table.WebTable;
+import org.apache.struts.action2.components.table.WebTable;
 
 import java.text.DecimalFormat;
 
diff --git a/src/java/org/apache/struts/action2/components/template/BaseTemplateEngine.java b/src/java/org/apache/struts/action2/components/template/BaseTemplateEngine.java
index 1d62118ba..54fcc65ef 100644
--- a/src/java/org/apache/struts/action2/components/template/BaseTemplateEngine.java
+++ b/src/java/org/apache/struts/action2/components/template/BaseTemplateEngine.java
@@ -2,7 +2,7 @@
  *  Copyright (c) 2002-2006 by OpenSymphony
  *  All rights reserved.
  */
-package com.opensymphony.webwork.components.template;
+package org.apache.struts.action2.components.template;
 
 import com.opensymphony.util.ClassLoaderUtil;
 import org.apache.commons.logging.Log;
diff --git a/src/java/org/apache/struts/action2/components/template/FreemarkerTemplateEngine.java b/src/java/org/apache/struts/action2/components/template/FreemarkerTemplateEngine.java
index 2ea3f3bc1..b60c42ec0 100644
--- a/src/java/org/apache/struts/action2/components/template/FreemarkerTemplateEngine.java
+++ b/src/java/org/apache/struts/action2/components/template/FreemarkerTemplateEngine.java
@@ -2,10 +2,10 @@
  *  Copyright (c) 2002-2006 by OpenSymphony
  *  All rights reserved.
  */
-package com.opensymphony.webwork.components.template;
+package org.apache.struts.action2.components.template;
 
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.views.freemarker.FreemarkerManager;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.views.freemarker.FreemarkerManager;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.util.OgnlValueStack;
diff --git a/src/java/org/apache/struts/action2/components/template/JspTemplateEngine.java b/src/java/org/apache/struts/action2/components/template/JspTemplateEngine.java
index d8a7893d7..98a96074c 100644
--- a/src/java/org/apache/struts/action2/components/template/JspTemplateEngine.java
+++ b/src/java/org/apache/struts/action2/components/template/JspTemplateEngine.java
@@ -2,11 +2,11 @@
  *  Copyright (c) 2002-2006 by OpenSymphony
  *  All rights reserved.
  */
-package com.opensymphony.webwork.components.template;
+package org.apache.struts.action2.components.template;
 
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.components.Include;
-import com.opensymphony.webwork.components.UIBean;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.components.Include;
+import org.apache.struts.action2.components.UIBean;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/src/java/org/apache/struts/action2/components/template/Template.java b/src/java/org/apache/struts/action2/components/template/Template.java
index 0c9cc1ad4..c7eaa559d 100644
--- a/src/java/org/apache/struts/action2/components/template/Template.java
+++ b/src/java/org/apache/struts/action2/components/template/Template.java
@@ -2,7 +2,7 @@
  *  Copyright (c) 2002-2006 by OpenSymphony
  *  All rights reserved.
  */
-package com.opensymphony.webwork.components.template;
+package org.apache.struts.action2.components.template;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/java/org/apache/struts/action2/components/template/TemplateEngine.java b/src/java/org/apache/struts/action2/components/template/TemplateEngine.java
index dba574b02..6c471954c 100644
--- a/src/java/org/apache/struts/action2/components/template/TemplateEngine.java
+++ b/src/java/org/apache/struts/action2/components/template/TemplateEngine.java
@@ -2,7 +2,7 @@
  *  Copyright (c) 2002-2006 by OpenSymphony
  *  All rights reserved.
  */
-package com.opensymphony.webwork.components.template;
+package org.apache.struts.action2.components.template;
 
 import java.util.Map;
 
diff --git a/src/java/org/apache/struts/action2/components/template/TemplateEngineManager.java b/src/java/org/apache/struts/action2/components/template/TemplateEngineManager.java
index dd22bb13b..c7a59eb5e 100644
--- a/src/java/org/apache/struts/action2/components/template/TemplateEngineManager.java
+++ b/src/java/org/apache/struts/action2/components/template/TemplateEngineManager.java
@@ -2,9 +2,9 @@
  *  Copyright (c) 2002-2006 by OpenSymphony
  *  All rights reserved.
  */
-package com.opensymphony.webwork.components.template;
+package org.apache.struts.action2.components.template;
 
-import com.opensymphony.webwork.config.Configuration;
+import org.apache.struts.action2.config.Configuration;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/java/org/apache/struts/action2/components/template/TemplateRenderingContext.java b/src/java/org/apache/struts/action2/components/template/TemplateRenderingContext.java
index 537580365..6e899adab 100644
--- a/src/java/org/apache/struts/action2/components/template/TemplateRenderingContext.java
+++ b/src/java/org/apache/struts/action2/components/template/TemplateRenderingContext.java
@@ -2,9 +2,9 @@
  *  Copyright (c) 2002-2006 by OpenSymphony
  *  All rights reserved.
  */
-package com.opensymphony.webwork.components.template;
+package org.apache.struts.action2.components.template;
 
-import com.opensymphony.webwork.components.UIBean;
+import org.apache.struts.action2.components.UIBean;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import java.io.Writer;
diff --git a/src/java/org/apache/struts/action2/components/template/VelocityTemplateEngine.java b/src/java/org/apache/struts/action2/components/template/VelocityTemplateEngine.java
index d72e410dd..f409a424d 100644
--- a/src/java/org/apache/struts/action2/components/template/VelocityTemplateEngine.java
+++ b/src/java/org/apache/struts/action2/components/template/VelocityTemplateEngine.java
@@ -2,10 +2,10 @@
  *  Copyright (c) 2002-2006 by OpenSymphony
  *  All rights reserved.
  */
-package com.opensymphony.webwork.components.template;
+package org.apache.struts.action2.components.template;
 
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.views.velocity.VelocityManager;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.views.velocity.VelocityManager;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.velocity.app.VelocityEngine;
diff --git a/src/java/org/apache/struts/action2/config/Configuration.java b/src/java/org/apache/struts/action2/config/Configuration.java
index 4675d46d8..ad705bde8 100644
--- a/src/java/org/apache/struts/action2/config/Configuration.java
+++ b/src/java/org/apache/struts/action2/config/Configuration.java
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.config;
+package org.apache.struts.action2.config;
 
 import com.opensymphony.xwork.ObjectFactory;
-import com.opensymphony.webwork.WebWorkConstants;
+import org.apache.struts.action2.WebWorkConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/src/java/org/apache/struts/action2/config/DefaultConfiguration.java b/src/java/org/apache/struts/action2/config/DefaultConfiguration.java
index d8cd746a6..d641066f7 100644
--- a/src/java/org/apache/struts/action2/config/DefaultConfiguration.java
+++ b/src/java/org/apache/struts/action2/config/DefaultConfiguration.java
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.config;
+package org.apache.struts.action2.config;
 
 import com.opensymphony.xwork.util.LocalizedTextUtil;
-import com.opensymphony.webwork.WebWorkConstants;
+import org.apache.struts.action2.WebWorkConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/src/java/org/apache/struts/action2/config/DelegatingConfiguration.java b/src/java/org/apache/struts/action2/config/DelegatingConfiguration.java
index cdf17fcba..64adedbbf 100644
--- a/src/java/org/apache/struts/action2/config/DelegatingConfiguration.java
+++ b/src/java/org/apache/struts/action2/config/DelegatingConfiguration.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.HashSet;
 import java.util.Iterator;
@@ -14,7 +14,7 @@ import java.util.Set;
  * a config method is called (get, set, list, etc..) this class will go through the list of configurations
  * and call the method until successful.
  *
- * @author Rickard Öberg
+ * @author Rickard �berg
  * @author Jason Carreira
  * @author Bill Lynch (docs)
  */
diff --git a/src/java/org/apache/struts/action2/config/PropertiesConfiguration.java b/src/java/org/apache/struts/action2/config/PropertiesConfiguration.java
index e5a58c745..6943b1609 100644
--- a/src/java/org/apache/struts/action2/config/PropertiesConfiguration.java
+++ b/src/java/org/apache/struts/action2/config/PropertiesConfiguration.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.io.IOException;
 import java.net.URL;
@@ -13,7 +13,7 @@ import java.util.Properties;
 /**
  * A class to handle configuration via a properties file.
  *
- * @author Rickard Öberg
+ * @author Rickard �berg
  * @author Jason Carreira
  * @author Bill Lynch (docs)
  */
diff --git a/src/java/org/apache/struts/action2/config/ServletContextSingleton.java b/src/java/org/apache/struts/action2/config/ServletContextSingleton.java
index 404c69cd2..6abc6a2b1 100644
--- a/src/java/org/apache/struts/action2/config/ServletContextSingleton.java
+++ b/src/java/org/apache/struts/action2/config/ServletContextSingleton.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.config;
+package org.apache.struts.action2.config;
 
 import javax.servlet.ServletContext;
 
@@ -10,9 +10,9 @@ import javax.servlet.ServletContext;
  * from the web session object.
  * <p/>
  * This class is created to bet that this singleton can be set by
- * {@link com.opensymphony.webwork.dispatcher.FilterDispatcherCompatWeblogic61}
+ * {@link org.apache.struts.action2.dispatcher.FilterDispatcherCompatWeblogic61}
  * before the servlet context is needed by
- * {@link com.opensymphony.webwork.lifecycle.SessionLifecycleListener}
+ * {@link org.apache.struts.action2.lifecycle.SessionLifecycleListener}
  * which will use this object to get it.
  *
  * @author Scott N. Smith scottnelsonsmith@yahoo.com
diff --git a/src/java/org/apache/struts/action2/config_browser/ActionNamesAction.java b/src/java/org/apache/struts/action2/config_browser/ActionNamesAction.java
index 2f00228ba..b3c0fe3f8 100644
--- a/src/java/org/apache/struts/action2/config_browser/ActionNamesAction.java
+++ b/src/java/org/apache/struts/action2/config_browser/ActionNamesAction.java
@@ -1,9 +1,9 @@
-package com.opensymphony.webwork.config_browser;
+package org.apache.struts.action2.config_browser;
 
 import com.opensymphony.xwork.ActionSupport;
 import com.opensymphony.xwork.config.entities.ActionConfig;
-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 org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/src/java/org/apache/struts/action2/config_browser/ConfigurationHelper.java b/src/java/org/apache/struts/action2/config_browser/ConfigurationHelper.java
index 387f07881..bc95d73e0 100644
--- a/src/java/org/apache/struts/action2/config_browser/ConfigurationHelper.java
+++ b/src/java/org/apache/struts/action2/config_browser/ConfigurationHelper.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.config_browser;
+package org.apache.struts.action2.config_browser;
 
 import com.opensymphony.xwork.config.ConfigurationManager;
 import com.opensymphony.xwork.config.entities.ActionConfig;
diff --git a/src/java/org/apache/struts/action2/config_browser/ListValidatorsAction.java b/src/java/org/apache/struts/action2/config_browser/ListValidatorsAction.java
index d076e2c0b..c5643d625 100644
--- a/src/java/org/apache/struts/action2/config_browser/ListValidatorsAction.java
+++ b/src/java/org/apache/struts/action2/config_browser/ListValidatorsAction.java
@@ -1,9 +1,9 @@
-package com.opensymphony.webwork.config_browser;
+package org.apache.struts.action2.config_browser;
 
 import com.opensymphony.xwork.ActionSupport;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.validator.ActionValidatorManagerFactory;
-import com.opensymphony.webwork.util.ClassLoaderUtils;
+import org.apache.struts.action2.util.ClassLoaderUtils;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/src/java/org/apache/struts/action2/config_browser/ShowConfigAction.java b/src/java/org/apache/struts/action2/config_browser/ShowConfigAction.java
index d9650cb49..e1db37ffc 100644
--- a/src/java/org/apache/struts/action2/config_browser/ShowConfigAction.java
+++ b/src/java/org/apache/struts/action2/config_browser/ShowConfigAction.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.config_browser;
+package org.apache.struts.action2.config_browser;
 
 import com.opensymphony.xwork.ObjectFactory;
 import com.opensymphony.xwork.config.entities.ActionConfig;
diff --git a/src/java/org/apache/struts/action2/config_browser/ShowValidatorAction.java b/src/java/org/apache/struts/action2/config_browser/ShowValidatorAction.java
index 54639a182..bd58643a3 100644
--- a/src/java/org/apache/struts/action2/config_browser/ShowValidatorAction.java
+++ b/src/java/org/apache/struts/action2/config_browser/ShowValidatorAction.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.config_browser;
+package org.apache.struts.action2.config_browser;
 
 import com.opensymphony.xwork.util.OgnlUtil;
 import com.opensymphony.xwork.validator.Validator;
diff --git a/src/java/org/apache/struts/action2/default.properties b/src/java/org/apache/struts/action2/default.properties
index f892f9049..08e954a39 100644
--- a/src/java/org/apache/struts/action2/default.properties
+++ b/src/java/org/apache/struts/action2/default.properties
@@ -5,9 +5,9 @@
 ###
 
 ### Specifies the Configuration used to configure webwork
-### one could extend com.opensymphony.webwork.config.Configuration
+### one could extend org.apache.struts.action2.config.Configuration
 ### to build one's customize way of getting the configurations parameters into webwork
-# webwork.configuration=com.opensymphony.webwork.config.DefaultConfiguration
+# webwork.configuration=org.apache.struts.action2.config.DefaultConfiguration
 
 ### This can be used to set your default locale and encoding scheme
 # webwork.locale=en_US
@@ -48,7 +48,7 @@ webwork.multipart.maxSize=2097152
 # webwork.custom.properties=application,com/webwork/extension/custom
 
 ### How request URLs are mapped to and from actions
-webwork.mapper.class=com.opensymphony.webwork.dispatcher.mapper.DefaultActionMapper
+webwork.mapper.class=org.apache.struts.action2.dispatcher.mapper.DefaultActionMapper
 
 ### Used by the DefaultActionMapper
 ### You may provide a comma separated list, e.g. webwork.action.extension=action,jnlp,do
@@ -109,8 +109,8 @@ webwork.dispatcher.parametersWorkaround = false
 
 ### configure the Freemarker Manager class to be used
 ### Allows user to plug-in customised Freemarker Manager if necessary
-### MUST extends off com.opensymphony.webwork.views.freemarker.FreemarkerManager
-#webwork.freemarker.manager.classname=com.opensymphony.webwork.views.freemarker.FreemarkerManager
+### MUST extends off org.apache.struts.action2.views.freemarker.FreemarkerManager
+#webwork.freemarker.manager.classname=org.apache.struts.action2.views.freemarker.FreemarkerManager
 
 ### See the WebWorkBeanWrapper javadocs for more information
 webwork.freemarker.wrapper.altMap=true
diff --git a/src/java/org/apache/struts/action2/dispatcher/ActionContextCleanUp.java b/src/java/org/apache/struts/action2/dispatcher/ActionContextCleanUp.java
index 6b28c09e3..a3c97368a 100644
--- a/src/java/org/apache/struts/action2/dispatcher/ActionContextCleanUp.java
+++ b/src/java/org/apache/struts/action2/dispatcher/ActionContextCleanUp.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
 
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.interceptor.component.ComponentManager;
diff --git a/src/java/org/apache/struts/action2/dispatcher/ApplicationMap.java b/src/java/org/apache/struts/action2/dispatcher/ApplicationMap.java
index 99324df9c..2fcc501c8 100644
--- a/src/java/org/apache/struts/action2/dispatcher/ApplicationMap.java
+++ b/src/java/org/apache/struts/action2/dispatcher/ApplicationMap.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 javax.servlet.ServletContext;
 import java.io.Serializable;
@@ -15,7 +15,7 @@ import java.util.*;
  * enumerates over all servlet context attributes and init parameters and returns a collection of both.
  * Note, this will occur lazily - only when the entry set is asked for.
  *
- * @author <a href="mailto:rickard@middleware-company.com">Rickard Öberg</a>
+ * @author <a href="mailto:rickard@middleware-company.com">Rickard �berg</a>
  * @author Bill Lynch (docs)
  */
 public class ApplicationMap extends AbstractMap implements Serializable {
diff --git a/src/java/org/apache/struts/action2/dispatcher/ChartResult.java b/src/java/org/apache/struts/action2/dispatcher/ChartResult.java
index 11161412c..f5c5b90b8 100644
--- a/src/java/org/apache/struts/action2/dispatcher/ChartResult.java
+++ b/src/java/org/apache/struts/action2/dispatcher/ChartResult.java
@@ -8,9 +8,9 @@
  * 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.opensymphony.webwork.ServletActionContext;
+import org.apache.struts.action2.ServletActionContext;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.Result;
 import org.jfree.chart.ChartUtilities;
diff --git a/src/java/org/apache/struts/action2/dispatcher/DefaultActionSupport.java b/src/java/org/apache/struts/action2/dispatcher/DefaultActionSupport.java
index 86c6e77e2..09ded04f7 100644
--- a/src/java/org/apache/struts/action2/dispatcher/DefaultActionSupport.java
+++ b/src/java/org/apache/struts/action2/dispatcher/DefaultActionSupport.java
@@ -1,12 +1,12 @@
 /**
  * 
  */
-package com.opensymphony.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
 
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.opensymphony.webwork.ServletActionContext;
+import org.apache.struts.action2.ServletActionContext;
 import com.opensymphony.xwork.ActionSupport;
 
 /**
diff --git a/src/java/org/apache/struts/action2/dispatcher/DispatcherUtils.java b/src/java/org/apache/struts/action2/dispatcher/DispatcherUtils.java
index f54967107..6a1dd8594 100644
--- a/src/java/org/apache/struts/action2/dispatcher/DispatcherUtils.java
+++ b/src/java/org/apache/struts/action2/dispatcher/DispatcherUtils.java
@@ -2,20 +2,20 @@
  * 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.util.FileManager;
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.WebWorkStatics;
-import com.opensymphony.webwork.WebWorkConstants;
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.dispatcher.mapper.ActionMapping;
-import com.opensymphony.webwork.dispatcher.multipart.MultiPartRequest;
-import com.opensymphony.webwork.dispatcher.multipart.MultiPartRequestWrapper;
-import com.opensymphony.webwork.util.AttributeMap;
-import com.opensymphony.webwork.util.ObjectFactoryDestroyable;
-import com.opensymphony.webwork.util.ObjectFactoryInitializable;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.WebWorkStatics;
+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.multipart.MultiPartRequest;
+import org.apache.struts.action2.dispatcher.multipart.MultiPartRequestWrapper;
+import org.apache.struts.action2.util.AttributeMap;
+import org.apache.struts.action2.util.ObjectFactoryDestroyable;
+import org.apache.struts.action2.util.ObjectFactoryInitializable;
 import com.opensymphony.xwork.*;
 import com.opensymphony.xwork.config.ConfigurationException;
 import com.opensymphony.xwork.interceptor.component.ComponentInterceptor;
@@ -45,7 +45,7 @@ import java.util.Map;
  * @author tm_jee
  * @version $Date: 2006/03/20 20:36:40 $ $Id: DispatcherUtils.java,v 1.48 2006/03/20 20:36:40 rainerh Exp $
  *
- * @see com.opensymphony.webwork.dispatcher.FilterDispatcher
+ * @see org.apache.struts.action2.dispatcher.FilterDispatcher
  */
 public class DispatcherUtils {
     private static final Log LOG = LogFactory.getLog(DispatcherUtils.class);
@@ -104,11 +104,11 @@ public class DispatcherUtils {
             if (className.equals("spring")) {
                 // note: this class name needs to be in string form so we don't put hard
                 //       dependencies on spring, since it isn't technically required.
-                className = "com.opensymphony.webwork.spring.WebWorkSpringObjectFactory";
+                className = "org.apache.struts.action2.spring.WebWorkSpringObjectFactory";
             } else if (className.equals("plexus")) {
                 // note: this class name needs to be in string form so we don't put hard
                 //       dependencies on spring, since it isn't technically required.
-                className = "com.opensymphony.webwork.plexus.PlexusObjectFactory";
+                className = "org.apache.struts.action2.plexus.PlexusObjectFactory";
             }
 
             try {
@@ -415,12 +415,12 @@ public class DispatcherUtils {
     /**
      * Wraps and returns the given response or returns the original response object. This is used to transparently
      * handle multipart data as a wrapped class around the given request. Override this method to handle multipart
-     * requests in a special way or to handle other types of requests. Note, {@link com.opensymphony.webwork.dispatcher.multipart.MultiPartRequestWrapper} is
+     * requests in a special way or to handle other types of requests. Note, {@link org.apache.struts.action2.dispatcher.multipart.MultiPartRequestWrapper} is
      * flexible - you should look to that first before overriding this method to handle multipart data.
      *
      * @param request the HttpServletRequest object.
      * @return a wrapped request or original request.
-     * @see com.opensymphony.webwork.dispatcher.multipart.MultiPartRequestWrapper
+     * @see org.apache.struts.action2.dispatcher.multipart.MultiPartRequestWrapper
      */
     public HttpServletRequest wrapRequest(HttpServletRequest request, ServletContext servletContext) throws IOException {
         // don't wrap more than once
diff --git a/src/java/org/apache/struts/action2/dispatcher/FilterDispatcher.java b/src/java/org/apache/struts/action2/dispatcher/FilterDispatcher.java
index e66a3cf67..63dcc5cbe 100644
--- a/src/java/org/apache/struts/action2/dispatcher/FilterDispatcher.java
+++ b/src/java/org/apache/struts/action2/dispatcher/FilterDispatcher.java
@@ -2,16 +2,16 @@
  * Copyright (c) 2002-2003 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.RequestUtils;
-import com.opensymphony.webwork.WebWorkConstants;
-import com.opensymphony.webwork.WebWorkStatics;
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.dispatcher.mapper.ActionMapper;
-import com.opensymphony.webwork.dispatcher.mapper.ActionMapperFactory;
-import com.opensymphony.webwork.dispatcher.mapper.ActionMapping;
+import org.apache.struts.action2.RequestUtils;
+import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.WebWorkStatics;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.dispatcher.mapper.ActionMapper;
+import org.apache.struts.action2.dispatcher.mapper.ActionMapperFactory;
+import org.apache.struts.action2.dispatcher.mapper.ActionMapping;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.interceptor.component.ComponentConfiguration;
 import com.opensymphony.xwork.interceptor.component.ComponentManager;
@@ -71,7 +71,7 @@ import java.text.SimpleDateFormat;
  *
  * <ul>
  *
- * <li>com.opensymphony.webwork.static</li>
+ * <li>org.apache.struts.action2.static</li>
  *
  * <li>template</li>
  *
@@ -79,7 +79,7 @@ import java.text.SimpleDateFormat;
  *
  * <p/> This means that you can simply request /webwork/xhtml/styles.css and the XHTML UI theme's default stylesheet
  * will be returned. Likewise, many of the AJAX UI components require various JavaScript files, which are found in the
- * com.opensymphony.webwork.static package. If you wish to add additional packages to be searched, you can add a comma
+ * org.apache.struts.action2.static package. If you wish to add additional packages to be searched, you can add a comma
  * separated (space, tab and new line will do as well) list in the filter init parameter named "packages". <b>Be
  * careful</b>, however, to expose any packages that may have sensitive information, such as properties file with
  * database access credentials.
@@ -88,10 +88,10 @@ import java.text.SimpleDateFormat;
  *
  * <p/> This filter also kicks off the XWork IoC request scope, provided that you are using XWork's IoC. All you have to
  * do to get started with XWork's IoC is add a components.xml file to WEB-INF/classes and properly set up the {@link
- * com.opensymphony.webwork.lifecycle.LifecycleListener} in web.xml. See the IoC docs for more information. <p/>
+ * org.apache.struts.action2.lifecycle.LifecycleListener} in web.xml. See the IoC docs for more information. <p/>
  *
  * @author Patrick Lightbody
- * @see com.opensymphony.webwork.lifecycle.LifecycleListener
+ * @see org.apache.struts.action2.lifecycle.LifecycleListener
  * @see ActionMapper
  * @see ActionContextCleanUp
  * @since 2.2
@@ -121,7 +121,7 @@ public class FilterDispatcher implements Filter, WebWorkStatics {
     public void init(FilterConfig filterConfig) throws ServletException {
         this.filterConfig = filterConfig;
         String param = filterConfig.getInitParameter("packages");
-        String packages = "com.opensymphony.webwork.static template";
+        String packages = "org.apache.struts.action2.static template";
         if (param != null) {
             packages = param + " " + packages;
         }
diff --git a/src/java/org/apache/struts/action2/dispatcher/FilterDispatcherCompatWeblogic61.java b/src/java/org/apache/struts/action2/dispatcher/FilterDispatcherCompatWeblogic61.java
index f3a9ca33c..9c07c3ce1 100644
--- a/src/java/org/apache/struts/action2/dispatcher/FilterDispatcherCompatWeblogic61.java
+++ b/src/java/org/apache/struts/action2/dispatcher/FilterDispatcherCompatWeblogic61.java
@@ -1,6 +1,6 @@
-package com.opensymphony.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
 
-import com.opensymphony.webwork.config.ServletContextSingleton;
+import org.apache.struts.action2.config.ServletContextSingleton;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -39,7 +39,7 @@ public class FilterDispatcherCompatWeblogic61
 
     /**
      * dummy setter for {@link #filterConfig}; this method
-     * sets up the {@link com.opensymphony.webwork.config.ServletContextSingleton} with
+     * sets up the {@link org.apache.struts.action2.config.ServletContextSingleton} with
      * the servlet context from the filter configuration.
      * <p/>
      * This is needed by Weblogic Server 6.1 because it
diff --git a/src/java/org/apache/struts/action2/dispatcher/HttpHeaderResult.java b/src/java/org/apache/struts/action2/dispatcher/HttpHeaderResult.java
index 30c3b142a..e08117c02 100644
--- a/src/java/org/apache/struts/action2/dispatcher/HttpHeaderResult.java
+++ b/src/java/org/apache/struts/action2/dispatcher/HttpHeaderResult.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
 
-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.Result;
diff --git a/src/java/org/apache/struts/action2/dispatcher/PlainTextResult.java b/src/java/org/apache/struts/action2/dispatcher/PlainTextResult.java
index f6885d07e..dc123d6b1 100644
--- a/src/java/org/apache/struts/action2/dispatcher/PlainTextResult.java
+++ b/src/java/org/apache/struts/action2/dispatcher/PlainTextResult.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.io.InputStreamReader;
 import java.io.PrintWriter;
diff --git a/src/java/org/apache/struts/action2/dispatcher/RequestMap.java b/src/java/org/apache/struts/action2/dispatcher/RequestMap.java
index 71d952343..0e981c8a4 100644
--- a/src/java/org/apache/struts/action2/dispatcher/RequestMap.java
+++ b/src/java/org/apache/struts/action2/dispatcher/RequestMap.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 javax.servlet.http.HttpServletRequest;
 import java.io.Serializable;
diff --git a/src/java/org/apache/struts/action2/dispatcher/ServletActionRedirectResult.java b/src/java/org/apache/struts/action2/dispatcher/ServletActionRedirectResult.java
index 50756d3d4..95054b2c6 100644
--- a/src/java/org/apache/struts/action2/dispatcher/ServletActionRedirectResult.java
+++ b/src/java/org/apache/struts/action2/dispatcher/ServletActionRedirectResult.java
@@ -1,8 +1,8 @@
-package com.opensymphony.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
 
-import com.opensymphony.webwork.dispatcher.mapper.ActionMapper;
-import com.opensymphony.webwork.dispatcher.mapper.ActionMapperFactory;
-import com.opensymphony.webwork.dispatcher.mapper.ActionMapping;
+import org.apache.struts.action2.dispatcher.mapper.ActionMapper;
+import org.apache.struts.action2.dispatcher.mapper.ActionMapperFactory;
+import org.apache.struts.action2.dispatcher.mapper.ActionMapping;
 import com.opensymphony.xwork.ActionInvocation;
 
 /**
diff --git a/src/java/org/apache/struts/action2/dispatcher/ServletDispatcher.java b/src/java/org/apache/struts/action2/dispatcher/ServletDispatcher.java
index a14ba110e..3f454eb3e 100644
--- a/src/java/org/apache/struts/action2/dispatcher/ServletDispatcher.java
+++ b/src/java/org/apache/struts/action2/dispatcher/ServletDispatcher.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.opensymphony.webwork.WebWorkStatics;
-import com.opensymphony.webwork.dispatcher.mapper.ActionMapperFactory;
-import com.opensymphony.webwork.dispatcher.mapper.ActionMapping;
+import org.apache.struts.action2.WebWorkStatics;
+import org.apache.struts.action2.dispatcher.mapper.ActionMapperFactory;
+import org.apache.struts.action2.dispatcher.mapper.ActionMapping;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/src/java/org/apache/struts/action2/dispatcher/ServletDispatcherResult.java b/src/java/org/apache/struts/action2/dispatcher/ServletDispatcherResult.java
index 7deeee052..824c25394 100644
--- a/src/java/org/apache/struts/action2/dispatcher/ServletDispatcherResult.java
+++ b/src/java/org/apache/struts/action2/dispatcher/ServletDispatcherResult.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
 
-import com.opensymphony.webwork.ServletActionContext;
+import org.apache.struts.action2.ServletActionContext;
 import com.opensymphony.xwork.ActionInvocation;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/src/java/org/apache/struts/action2/dispatcher/ServletRedirectResult.java b/src/java/org/apache/struts/action2/dispatcher/ServletRedirectResult.java
index 1e4174e9a..464906816 100644
--- a/src/java/org/apache/struts/action2/dispatcher/ServletRedirectResult.java
+++ b/src/java/org/apache/struts/action2/dispatcher/ServletRedirectResult.java
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
 
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.dispatcher.mapper.ActionMapperFactory;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.dispatcher.mapper.ActionMapperFactory;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionInvocation;
 import org.apache.commons.logging.Log;
diff --git a/src/java/org/apache/struts/action2/dispatcher/SessionMap.java b/src/java/org/apache/struts/action2/dispatcher/SessionMap.java
index b6c6aaa38..c2f7c89f0 100644
--- a/src/java/org/apache/struts/action2/dispatcher/SessionMap.java
+++ b/src/java/org/apache/struts/action2/dispatcher/SessionMap.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 javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
diff --git a/src/java/org/apache/struts/action2/dispatcher/StreamResult.java b/src/java/org/apache/struts/action2/dispatcher/StreamResult.java
index 584f07e22..01c20e129 100644
--- a/src/java/org/apache/struts/action2/dispatcher/StreamResult.java
+++ b/src/java/org/apache/struts/action2/dispatcher/StreamResult.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 com.opensymphony.xwork.ActionInvocation;
 
diff --git a/src/java/org/apache/struts/action2/dispatcher/VelocityResult.java b/src/java/org/apache/struts/action2/dispatcher/VelocityResult.java
index 670afdfc9..3ed3e2907 100644
--- a/src/java/org/apache/struts/action2/dispatcher/VelocityResult.java
+++ b/src/java/org/apache/struts/action2/dispatcher/VelocityResult.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.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.WebWorkConstants;
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.views.JspSupportServlet;
-import com.opensymphony.webwork.views.velocity.VelocityManager;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.views.JspSupportServlet;
+import org.apache.struts.action2.views.velocity.VelocityManager;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.util.OgnlValueStack;
diff --git a/src/java/org/apache/struts/action2/dispatcher/WebWorkRequestWrapper.java b/src/java/org/apache/struts/action2/dispatcher/WebWorkRequestWrapper.java
index d93226adf..97bd44f76 100644
--- a/src/java/org/apache/struts/action2/dispatcher/WebWorkRequestWrapper.java
+++ b/src/java/org/apache/struts/action2/dispatcher/WebWorkRequestWrapper.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
 
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.util.OgnlValueStack;
diff --git a/src/java/org/apache/struts/action2/dispatcher/WebWorkResultSupport.java b/src/java/org/apache/struts/action2/dispatcher/WebWorkResultSupport.java
index 4670cec9a..5c5ca3c2d 100644
--- a/src/java/org/apache/struts/action2/dispatcher/WebWorkResultSupport.java
+++ b/src/java/org/apache/struts/action2/dispatcher/WebWorkResultSupport.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.dispatcher;
+package org.apache.struts.action2.dispatcher;
 
-import com.opensymphony.webwork.WebWorkStatics;
+import org.apache.struts.action2.WebWorkStatics;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.Result;
 import com.opensymphony.xwork.util.TextParseUtil;
diff --git a/src/java/org/apache/struts/action2/dispatcher/mapper/ActionMapper.java b/src/java/org/apache/struts/action2/dispatcher/mapper/ActionMapper.java
index 9d81e3f18..8e6c6af3f 100644
--- a/src/java/org/apache/struts/action2/dispatcher/mapper/ActionMapper.java
+++ b/src/java/org/apache/struts/action2/dispatcher/mapper/ActionMapper.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.dispatcher.mapper;
+package org.apache.struts.action2.dispatcher.mapper;
 
 import javax.servlet.http.HttpServletRequest;
 
diff --git a/src/java/org/apache/struts/action2/dispatcher/mapper/ActionMapperFactory.java b/src/java/org/apache/struts/action2/dispatcher/mapper/ActionMapperFactory.java
index 5f7a70753..d09e9e51f 100644
--- a/src/java/org/apache/struts/action2/dispatcher/mapper/ActionMapperFactory.java
+++ b/src/java/org/apache/struts/action2/dispatcher/mapper/ActionMapperFactory.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.dispatcher.mapper;
+package org.apache.struts.action2.dispatcher.mapper;
 
-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.ObjectFactory;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/src/java/org/apache/struts/action2/dispatcher/mapper/ActionMapping.java b/src/java/org/apache/struts/action2/dispatcher/mapper/ActionMapping.java
index 24da016eb..b788a5efe 100644
--- a/src/java/org/apache/struts/action2/dispatcher/mapper/ActionMapping.java
+++ b/src/java/org/apache/struts/action2/dispatcher/mapper/ActionMapping.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.dispatcher.mapper;
+package org.apache.struts.action2.dispatcher.mapper;
 
 import com.opensymphony.xwork.Result;
 
diff --git a/src/java/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapper.java b/src/java/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapper.java
index 15cb28b0c..89ab274c6 100644
--- a/src/java/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapper.java
+++ b/src/java/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapper.java
@@ -1,10 +1,10 @@
-package com.opensymphony.webwork.dispatcher.mapper;
+package org.apache.struts.action2.dispatcher.mapper;
 
-import com.opensymphony.webwork.RequestUtils;
-import com.opensymphony.webwork.WebWorkConstants;
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.dispatcher.ServletRedirectResult;
-import com.opensymphony.webwork.util.PrefixTrie;
+import org.apache.struts.action2.RequestUtils;
+import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.dispatcher.ServletRedirectResult;
+import org.apache.struts.action2.util.PrefixTrie;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Arrays;
diff --git a/src/java/org/apache/struts/action2/dispatcher/mapper/RestfulActionMapper.java b/src/java/org/apache/struts/action2/dispatcher/mapper/RestfulActionMapper.java
index 8768a2274..9d97d5de2 100644
--- a/src/java/org/apache/struts/action2/dispatcher/mapper/RestfulActionMapper.java
+++ b/src/java/org/apache/struts/action2/dispatcher/mapper/RestfulActionMapper.java
@@ -1,9 +1,9 @@
-package com.opensymphony.webwork.dispatcher.mapper;
+package org.apache.struts.action2.dispatcher.mapper;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.opensymphony.webwork.RequestUtils;
+import org.apache.struts.action2.RequestUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import java.net.URLDecoder;
diff --git a/src/java/org/apache/struts/action2/dispatcher/multipart/CosMultiPartRequest.java b/src/java/org/apache/struts/action2/dispatcher/multipart/CosMultiPartRequest.java
index 52ceefc9c..90e39789f 100644
--- a/src/java/org/apache/struts/action2/dispatcher/multipart/CosMultiPartRequest.java
+++ b/src/java/org/apache/struts/action2/dispatcher/multipart/CosMultiPartRequest.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.dispatcher.multipart;
+package org.apache.struts.action2.dispatcher.multipart;
 
 import com.oreilly.servlet.MultipartRequest;
 
diff --git a/src/java/org/apache/struts/action2/dispatcher/multipart/JakartaMultiPartRequest.java b/src/java/org/apache/struts/action2/dispatcher/multipart/JakartaMultiPartRequest.java
index fd3565053..005b1b54c 100644
--- a/src/java/org/apache/struts/action2/dispatcher/multipart/JakartaMultiPartRequest.java
+++ b/src/java/org/apache/struts/action2/dispatcher/multipart/JakartaMultiPartRequest.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.dispatcher.multipart;
+package org.apache.struts.action2.dispatcher.multipart;
 
 import org.apache.commons.fileupload.*;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
diff --git a/src/java/org/apache/struts/action2/dispatcher/multipart/MultiPartRequest.java b/src/java/org/apache/struts/action2/dispatcher/multipart/MultiPartRequest.java
index bb6163257..4475c36ea 100644
--- a/src/java/org/apache/struts/action2/dispatcher/multipart/MultiPartRequest.java
+++ b/src/java/org/apache/struts/action2/dispatcher/multipart/MultiPartRequest.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.dispatcher.multipart;
+package org.apache.struts.action2.dispatcher.multipart;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/src/java/org/apache/struts/action2/dispatcher/multipart/MultiPartRequestWrapper.java b/src/java/org/apache/struts/action2/dispatcher/multipart/MultiPartRequestWrapper.java
index 77d414869..1ccb5e8d5 100644
--- a/src/java/org/apache/struts/action2/dispatcher/multipart/MultiPartRequestWrapper.java
+++ b/src/java/org/apache/struts/action2/dispatcher/multipart/MultiPartRequestWrapper.java
@@ -2,12 +2,12 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.dispatcher.multipart;
+package org.apache.struts.action2.dispatcher.multipart;
 
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.dispatcher.WebWorkRequestWrapper;
-import com.opensymphony.webwork.WebWorkConstants;
-import com.opensymphony.webwork.util.ClassLoaderUtils;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.dispatcher.WebWorkRequestWrapper;
+import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.util.ClassLoaderUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -21,12 +21,12 @@ import java.util.*;
 /**
  * Parses a multipart request and provides a wrapper around the request. The parsing implementation used
  * depends on the <tt>webwork.multipart.parser</tt> setting. It should be set to a class which
- * extends {@link com.opensymphony.webwork.dispatcher.multipart.MultiPartRequest}. <p>
+ * extends {@link org.apache.struts.action2.dispatcher.multipart.MultiPartRequest}. <p>
  * <p/>
  * Webwork ships with three implementations,
- * {@link com.opensymphony.webwork.dispatcher.multipart.PellMultiPartRequest}, and
- * {@link com.opensymphony.webwork.dispatcher.multipart.CosMultiPartRequest} and
- * {@link com.opensymphony.webwork.dispatcher.multipart.JakartaMultiPartRequest}. The Jakarta implementation
+ * {@link org.apache.struts.action2.dispatcher.multipart.PellMultiPartRequest}, and
+ * {@link org.apache.struts.action2.dispatcher.multipart.CosMultiPartRequest} and
+ * {@link org.apache.struts.action2.dispatcher.multipart.JakartaMultiPartRequest}. The Jakarta implementation
  * is the default. The <tt>webwork.multipart.parser</tt> property should be set to <tt>jakarta</tt> for the
  * Jakarta implementation, <tt>pell</tt> for the Pell implementation and <tt>cos</tt> for the Jason Hunter
  * implementation. <p>
@@ -61,20 +61,20 @@ public class MultiPartRequestWrapper extends WebWorkRequestWrapper {
             // If it's not set, use Jakarta
             if (parser.equals("")) {
                 log.warn("Property webwork.multipart.parser not set." +
-                        " Using com.opensymphony.webwork.dispatcher.multipart.JakartaMultiPartRequest");
-                parser = "com.opensymphony.webwork.dispatcher.multipart.JakartaMultiPartRequest";
+                        " Using org.apache.struts.action2.dispatcher.multipart.JakartaMultiPartRequest");
+                parser = "org.apache.struts.action2.dispatcher.multipart.JakartaMultiPartRequest";
             }
             // legacy support for old style property values
             else if (parser.equals("pell")) {
-                parser = "com.opensymphony.webwork.dispatcher.multipart.PellMultiPartRequest";
+                parser = "org.apache.struts.action2.dispatcher.multipart.PellMultiPartRequest";
             } else if (parser.equals("cos")) {
-                parser = "com.opensymphony.webwork.dispatcher.multipart.CosMultiPartRequest";
+                parser = "org.apache.struts.action2.dispatcher.multipart.CosMultiPartRequest";
             } else if (parser.equals("jakarta")) {
-                parser = "com.opensymphony.webwork.dispatcher.multipart.JakartaMultiPartRequest";
+                parser = "org.apache.struts.action2.dispatcher.multipart.JakartaMultiPartRequest";
             }
 
             try {
-                Class baseClazz = com.opensymphony.webwork.dispatcher.multipart.MultiPartRequest.class;
+                Class baseClazz = org.apache.struts.action2.dispatcher.multipart.MultiPartRequest.class;
 
                 Class clazz = ClassLoaderUtils.loadClass(parser, MultiPartRequestWrapper.class);
 
diff --git a/src/java/org/apache/struts/action2/dispatcher/multipart/PellMultiPartRequest.java b/src/java/org/apache/struts/action2/dispatcher/multipart/PellMultiPartRequest.java
index 707072673..d2d1323fb 100644
--- a/src/java/org/apache/struts/action2/dispatcher/multipart/PellMultiPartRequest.java
+++ b/src/java/org/apache/struts/action2/dispatcher/multipart/PellMultiPartRequest.java
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.dispatcher.multipart;
+package org.apache.struts.action2.dispatcher.multipart;
 
-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 http.utils.multipartrequest.ServletMultipartRequest;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/interceptor/ApplicationAware.java b/src/java/org/apache/struts/action2/interceptor/ApplicationAware.java
index 79c1e47ef..64a9a2cec 100644
--- a/src/java/org/apache/struts/action2/interceptor/ApplicationAware.java
+++ b/src/java/org/apache/struts/action2/interceptor/ApplicationAware.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 java.util.Map;
 
@@ -14,7 +14,7 @@ import java.util.Map;
  * <p/>
  * Typical uses are configuration objects and caches.
  *
- * @author <a href="mailto:rickard@middleware-company.com">Rickard Öberg</a>
+ * @author <a href="mailto:rickard@middleware-company.com">Rickard �berg</a>
  */
 public interface ApplicationAware {
 
diff --git a/src/java/org/apache/struts/action2/interceptor/BackgroundProcess.java b/src/java/org/apache/struts/action2/interceptor/BackgroundProcess.java
index 7b077db3a..f19411d37 100644
--- a/src/java/org/apache/struts/action2/interceptor/BackgroundProcess.java
+++ b/src/java/org/apache/struts/action2/interceptor/BackgroundProcess.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
 
 import com.opensymphony.xwork.ActionInvocation;
 
diff --git a/src/java/org/apache/struts/action2/interceptor/CreateSessionInterceptor.java b/src/java/org/apache/struts/action2/interceptor/CreateSessionInterceptor.java
index 20162dd55..d20217e08 100644
--- a/src/java/org/apache/struts/action2/interceptor/CreateSessionInterceptor.java
+++ b/src/java/org/apache/struts/action2/interceptor/CreateSessionInterceptor.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 org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.opensymphony.webwork.ServletActionContext;
+import org.apache.struts.action2.ServletActionContext;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.interceptor.AroundInterceptor;
 
diff --git a/src/java/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptor.java b/src/java/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptor.java
index 7927ada74..7b96ff8fb 100644
--- a/src/java/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptor.java
+++ b/src/java/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptor.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.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionInvocation;
@@ -188,7 +188,7 @@ public class ExecuteAndWaitInterceptor implements Interceptor {
                             "provide an action-specific or global result named '" + WAIT +
                             "'! This requires FreeMarker support and won't work if you don't have it installed");
                     // no wait result? hmm -- let's try to do dynamically put it in for you!
-                    ResultConfig rc = new ResultConfig(WAIT, "com.opensymphony.webwork.views.freemarker.FreemarkerResult",
+                    ResultConfig rc = new ResultConfig(WAIT, "org.apache.struts.action2.views.freemarker.FreemarkerResult",
                             Collections.singletonMap("location", "com/opensymphony/webwork/interceptor/wait.ftl"));
                     results.put(WAIT, rc);
                 }
diff --git a/src/java/org/apache/struts/action2/interceptor/FileUploadInterceptor.java b/src/java/org/apache/struts/action2/interceptor/FileUploadInterceptor.java
index cf30004fb..95fa7d5a4 100644
--- a/src/java/org/apache/struts/action2/interceptor/FileUploadInterceptor.java
+++ b/src/java/org/apache/struts/action2/interceptor/FileUploadInterceptor.java
@@ -2,10 +2,10 @@
  * 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.dispatcher.multipart.MultiPartRequestWrapper;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.dispatcher.multipart.MultiPartRequestWrapper;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.ActionProxy;
diff --git a/src/java/org/apache/struts/action2/interceptor/NoParameters.java b/src/java/org/apache/struts/action2/interceptor/NoParameters.java
index 44a269086..75459c937 100644
--- a/src/java/org/apache/struts/action2/interceptor/NoParameters.java
+++ b/src/java/org/apache/struts/action2/interceptor/NoParameters.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;
 
 
 /**
diff --git a/src/java/org/apache/struts/action2/interceptor/ParameterAware.java b/src/java/org/apache/struts/action2/interceptor/ParameterAware.java
index 8fd0e1915..4df98cb86 100644
--- a/src/java/org/apache/struts/action2/interceptor/ParameterAware.java
+++ b/src/java/org/apache/struts/action2/interceptor/ParameterAware.java
@@ -8,7 +8,7 @@
  * Distributable under Apache license.
  * See terms of license at opensource.org
  */
-package com.opensymphony.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
 
 import java.util.Map;
 
@@ -23,7 +23,7 @@ import java.util.Map;
  * Note that all parameter values for a given name will be returned, so the type of the objects in
  * the map is <tt>java.lang.String[]</tt>.
  *
- * @author <a href="mailto:rickard@middleware-company.com">Rickard Öberg</a>
+ * @author <a href="mailto:rickard@middleware-company.com">Rickard �berg</a>
  */
 public interface ParameterAware {
 
diff --git a/src/java/org/apache/struts/action2/interceptor/PrincipalAware.java b/src/java/org/apache/struts/action2/interceptor/PrincipalAware.java
index bed454f1e..1b028e325 100644
--- a/src/java/org/apache/struts/action2/interceptor/PrincipalAware.java
+++ b/src/java/org/apache/struts/action2/interceptor/PrincipalAware.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
 
 /**
  * Actions that want access to the Principal information from HttpServletRequest object
diff --git a/src/java/org/apache/struts/action2/interceptor/PrincipalProxy.java b/src/java/org/apache/struts/action2/interceptor/PrincipalProxy.java
index f24687623..6b2dc675d 100644
--- a/src/java/org/apache/struts/action2/interceptor/PrincipalProxy.java
+++ b/src/java/org/apache/struts/action2/interceptor/PrincipalProxy.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
 
 import javax.servlet.http.HttpServletRequest;
 import java.security.Principal;
diff --git a/src/java/org/apache/struts/action2/interceptor/ScopeInterceptor.java b/src/java/org/apache/struts/action2/interceptor/ScopeInterceptor.java
index b62d8cac9..33c848a89 100644
--- a/src/java/org/apache/struts/action2/interceptor/ScopeInterceptor.java
+++ b/src/java/org/apache/struts/action2/interceptor/ScopeInterceptor.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
 
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionInvocation;
@@ -6,8 +6,8 @@ import com.opensymphony.xwork.ActionProxy;
 import com.opensymphony.xwork.interceptor.Interceptor;
 import com.opensymphony.xwork.interceptor.PreResultListener;
 import com.opensymphony.xwork.util.OgnlValueStack;
-import com.opensymphony.webwork.dispatcher.SessionMap;
-import com.opensymphony.webwork.ServletActionContext;
+import org.apache.struts.action2.dispatcher.SessionMap;
+import org.apache.struts.action2.ServletActionContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/src/java/org/apache/struts/action2/interceptor/ServletConfigInterceptor.java b/src/java/org/apache/struts/action2/interceptor/ServletConfigInterceptor.java
index 406f5d449..a6d74d5f3 100644
--- a/src/java/org/apache/struts/action2/interceptor/ServletConfigInterceptor.java
+++ b/src/java/org/apache/struts/action2/interceptor/ServletConfigInterceptor.java
@@ -2,11 +2,11 @@
  * 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.WebWorkStatics;
-import com.opensymphony.webwork.util.ServletContextAware;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.WebWorkStatics;
+import org.apache.struts.action2.util.ServletContextAware;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.interceptor.AroundInterceptor;
diff --git a/src/java/org/apache/struts/action2/interceptor/ServletRequestAware.java b/src/java/org/apache/struts/action2/interceptor/ServletRequestAware.java
index 794446aac..0fcc2fc6b 100644
--- a/src/java/org/apache/struts/action2/interceptor/ServletRequestAware.java
+++ b/src/java/org/apache/struts/action2/interceptor/ServletRequestAware.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;
 
@@ -15,7 +15,7 @@ import javax.servlet.http.HttpServletRequest;
  * Note that using this interface makes the Action tied to a servlet environment, so it should be
  * avoided if possible since things like unit testing will become more difficult.
  *
- * @author <a href="mailto:rickard@middleware-company.com">Rickard Öberg</a>
+ * @author <a href="mailto:rickard@middleware-company.com">Rickard �berg</a>
  */
 public interface ServletRequestAware {
 
diff --git a/src/java/org/apache/struts/action2/interceptor/ServletResponseAware.java b/src/java/org/apache/struts/action2/interceptor/ServletResponseAware.java
index 8f594908a..3ff7c0602 100644
--- a/src/java/org/apache/struts/action2/interceptor/ServletResponseAware.java
+++ b/src/java/org/apache/struts/action2/interceptor/ServletResponseAware.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.HttpServletResponse;
 
@@ -15,7 +15,7 @@ import javax.servlet.http.HttpServletResponse;
  * Note that using this interface makes the Action tied to a servlet environment, so it should be
  * avoided if possible since things like unit testing will become more difficult.
  *
- * @author <a href="mailto:rickard@middleware-company.com">Rickard Öberg</a>
+ * @author <a href="mailto:rickard@middleware-company.com">Rickard �berg</a>
  */
 public interface ServletResponseAware {
 
diff --git a/src/java/org/apache/struts/action2/interceptor/SessionAware.java b/src/java/org/apache/struts/action2/interceptor/SessionAware.java
index c9c35aeb1..2f11975da 100644
--- a/src/java/org/apache/struts/action2/interceptor/SessionAware.java
+++ b/src/java/org/apache/struts/action2/interceptor/SessionAware.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 java.util.Map;
 
@@ -15,7 +15,7 @@ import java.util.Map;
  * Note that using this interface makes the Action tied to a servlet environment, so it should be
  * avoided if possible since things like unit testing will become more difficult.
  *
- * @author <a href="mailto:rickard@middleware-company.com">Rickard Öberg</a>
+ * @author <a href="mailto:rickard@middleware-company.com">Rickard �berg</a>
  */
 public interface SessionAware {
 
diff --git a/src/java/org/apache/struts/action2/interceptor/TokenInterceptor.java b/src/java/org/apache/struts/action2/interceptor/TokenInterceptor.java
index 95cce11e4..0986813be 100644
--- a/src/java/org/apache/struts/action2/interceptor/TokenInterceptor.java
+++ b/src/java/org/apache/struts/action2/interceptor/TokenInterceptor.java
@@ -2,11 +2,11 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.interceptor;
+package org.apache.struts.action2.interceptor;
 
 import java.util.Map;
 
-import com.opensymphony.webwork.util.TokenHelper;
+import org.apache.struts.action2.util.TokenHelper;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.ValidationAware;
diff --git a/src/java/org/apache/struts/action2/interceptor/TokenSessionStoreInterceptor.java b/src/java/org/apache/struts/action2/interceptor/TokenSessionStoreInterceptor.java
index 3a8859307..4e12c8934 100644
--- a/src/java/org/apache/struts/action2/interceptor/TokenSessionStoreInterceptor.java
+++ b/src/java/org/apache/struts/action2/interceptor/TokenSessionStoreInterceptor.java
@@ -2,11 +2,11 @@
  * 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.util.InvocationSessionStore;
-import com.opensymphony.webwork.util.TokenHelper;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.util.InvocationSessionStore;
+import org.apache.struts.action2.util.TokenHelper;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.Result;
diff --git a/src/java/org/apache/struts/action2/interceptor/WebWorkConversionErrorInterceptor.java b/src/java/org/apache/struts/action2/interceptor/WebWorkConversionErrorInterceptor.java
index fe2a403eb..a927db0a3 100644
--- a/src/java/org/apache/struts/action2/interceptor/WebWorkConversionErrorInterceptor.java
+++ b/src/java/org/apache/struts/action2/interceptor/WebWorkConversionErrorInterceptor.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.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.interceptor.ConversionErrorInterceptor;
diff --git a/src/java/org/apache/struts/action2/lifecycle/ApplicationLifecycleListener.java b/src/java/org/apache/struts/action2/lifecycle/ApplicationLifecycleListener.java
index 6c5043c5d..66bf31ca9 100644
--- a/src/java/org/apache/struts/action2/lifecycle/ApplicationLifecycleListener.java
+++ b/src/java/org/apache/struts/action2/lifecycle/ApplicationLifecycleListener.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.lifecycle;
+package org.apache.struts.action2.lifecycle;
 
 import com.opensymphony.xwork.interceptor.component.ComponentConfiguration;
 import com.opensymphony.xwork.interceptor.component.ComponentManager;
diff --git a/src/java/org/apache/struts/action2/lifecycle/LifecycleListener.java b/src/java/org/apache/struts/action2/lifecycle/LifecycleListener.java
index a2bba76bc..3e7e33056 100644
--- a/src/java/org/apache/struts/action2/lifecycle/LifecycleListener.java
+++ b/src/java/org/apache/struts/action2/lifecycle/LifecycleListener.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.lifecycle;
+package org.apache.struts.action2.lifecycle;
 
 import javax.servlet.http.HttpSessionEvent;
 import javax.servlet.http.HttpSessionListener;
@@ -12,7 +12,7 @@ import javax.servlet.http.HttpSessionListener;
  * @author Patrick Lightbody
  * @see ApplicationLifecycleListener
  * @see SessionLifecycleListener
- * @see com.opensymphony.webwork.dispatcher.FilterDispatcher
+ * @see org.apache.struts.action2.dispatcher.FilterDispatcher
  * @since 2.2
  * @deprecated XWork IoC has been deprecated in favor of Spring.
  *             Please refer to the Spring-WebWork integration documentation for more info.
diff --git a/src/java/org/apache/struts/action2/lifecycle/SessionLifecycleListener.java b/src/java/org/apache/struts/action2/lifecycle/SessionLifecycleListener.java
index d4ff55bea..333155d8b 100644
--- a/src/java/org/apache/struts/action2/lifecycle/SessionLifecycleListener.java
+++ b/src/java/org/apache/struts/action2/lifecycle/SessionLifecycleListener.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.lifecycle;
+package org.apache.struts.action2.lifecycle;
 
 import com.opensymphony.xwork.interceptor.component.ComponentConfiguration;
 import com.opensymphony.xwork.interceptor.component.ComponentManager;
diff --git a/src/java/org/apache/struts/action2/lifecycle/SessionLifecycleListenerCompatWeblogic61.java b/src/java/org/apache/struts/action2/lifecycle/SessionLifecycleListenerCompatWeblogic61.java
index 43da97a5f..d8717deef 100644
--- a/src/java/org/apache/struts/action2/lifecycle/SessionLifecycleListenerCompatWeblogic61.java
+++ b/src/java/org/apache/struts/action2/lifecycle/SessionLifecycleListenerCompatWeblogic61.java
@@ -1,6 +1,6 @@
-package com.opensymphony.webwork.lifecycle;
+package org.apache.struts.action2.lifecycle;
 
-import com.opensymphony.webwork.config.ServletContextSingleton;
+import org.apache.struts.action2.config.ServletContextSingleton;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpSession;
diff --git a/src/java/org/apache/struts/action2/pico/PicoActionInvocation.java b/src/java/org/apache/struts/action2/pico/PicoActionInvocation.java
index d048e821e..6d3219f87 100644
--- a/src/java/org/apache/struts/action2/pico/PicoActionInvocation.java
+++ b/src/java/org/apache/struts/action2/pico/PicoActionInvocation.java
@@ -6,7 +6,7 @@
  * the LICENSE.txt file.                                                     *
  *                                                                           *
  *****************************************************************************/
-package com.opensymphony.webwork.pico;
+package org.apache.struts.action2.pico;
 
 import java.util.Map;
 
diff --git a/src/java/org/apache/struts/action2/pico/PicoActionProxyFactory.java b/src/java/org/apache/struts/action2/pico/PicoActionProxyFactory.java
index 55e8b504d..65a97e4f2 100644
--- a/src/java/org/apache/struts/action2/pico/PicoActionProxyFactory.java
+++ b/src/java/org/apache/struts/action2/pico/PicoActionProxyFactory.java
@@ -6,7 +6,7 @@
  * the LICENSE.txt file.                                                     *
  *                                                                           *
  *****************************************************************************/
-package com.opensymphony.webwork.pico;
+package org.apache.struts.action2.pico;
 
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.ActionProxy;
diff --git a/src/java/org/apache/struts/action2/pico/PicoFilterDispatcher.java b/src/java/org/apache/struts/action2/pico/PicoFilterDispatcher.java
index 629641f4f..2266e965a 100644
--- a/src/java/org/apache/struts/action2/pico/PicoFilterDispatcher.java
+++ b/src/java/org/apache/struts/action2/pico/PicoFilterDispatcher.java
@@ -1,6 +1,6 @@
-package com.opensymphony.webwork.pico;
+package org.apache.struts.action2.pico;
 
-import com.opensymphony.webwork.dispatcher.FilterDispatcher;
+import org.apache.struts.action2.dispatcher.FilterDispatcher;
 import com.opensymphony.xwork.ObjectFactory;
 import org.nanocontainer.nanowar.ServletRequestContainerLauncher;
 import org.picocontainer.defaults.ObjectReference;
diff --git a/src/java/org/apache/struts/action2/pico/PicoObjectFactory.java b/src/java/org/apache/struts/action2/pico/PicoObjectFactory.java
index 164b65036..0cd31cfb5 100644
--- a/src/java/org/apache/struts/action2/pico/PicoObjectFactory.java
+++ b/src/java/org/apache/struts/action2/pico/PicoObjectFactory.java
@@ -6,7 +6,7 @@
  * the LICENSE.txt file.                                                     *
  *                                                                           *
  *****************************************************************************/
-package com.opensymphony.webwork.pico;
+package org.apache.struts.action2.pico;
 
 import com.opensymphony.xwork.ObjectFactory;
 import com.opensymphony.xwork.Result;
diff --git a/src/java/org/apache/struts/action2/pico/PicoObjectFactoryFilter.java b/src/java/org/apache/struts/action2/pico/PicoObjectFactoryFilter.java
index 3bf1f97e5..5d49434d1 100644
--- a/src/java/org/apache/struts/action2/pico/PicoObjectFactoryFilter.java
+++ b/src/java/org/apache/struts/action2/pico/PicoObjectFactoryFilter.java
@@ -6,7 +6,7 @@
  * the LICENSE.txt file.                                                     *
  *                                                                           *
  *****************************************************************************/
-package com.opensymphony.webwork.pico;
+package org.apache.struts.action2.pico;
 
 import com.opensymphony.xwork.ObjectFactory;
 import org.picocontainer.defaults.ObjectReference;
diff --git a/src/java/org/apache/struts/action2/pico/PicoServletDispatcher.java b/src/java/org/apache/struts/action2/pico/PicoServletDispatcher.java
index b9b7a16b5..590248b06 100644
--- a/src/java/org/apache/struts/action2/pico/PicoServletDispatcher.java
+++ b/src/java/org/apache/struts/action2/pico/PicoServletDispatcher.java
@@ -6,7 +6,7 @@
  * the LICENSE.txt file.                                                     *
  *                                                                           *
  *****************************************************************************/
-package com.opensymphony.webwork.pico;
+package org.apache.struts.action2.pico;
 
 
 /**
diff --git a/src/java/org/apache/struts/action2/pico/PicoWebWork2ServletDispatcher.java b/src/java/org/apache/struts/action2/pico/PicoWebWork2ServletDispatcher.java
index 8c02b2c87..5e472b72e 100644
--- a/src/java/org/apache/struts/action2/pico/PicoWebWork2ServletDispatcher.java
+++ b/src/java/org/apache/struts/action2/pico/PicoWebWork2ServletDispatcher.java
@@ -6,9 +6,9 @@
  * the LICENSE.txt file.                                                     *
  *                                                                           *
  *****************************************************************************/
-package com.opensymphony.webwork.pico;
+package org.apache.struts.action2.pico;
 
-import com.opensymphony.webwork.dispatcher.ServletDispatcher;
+import org.apache.struts.action2.dispatcher.ServletDispatcher;
 import com.opensymphony.xwork.ActionProxyFactory;
 import org.nanocontainer.nanowar.ServletRequestContainerLauncher;
 
diff --git a/src/java/org/apache/struts/action2/plexus/PlexusFilter.java b/src/java/org/apache/struts/action2/plexus/PlexusFilter.java
index 2cd1e2c17..4e90da9e8 100644
--- a/src/java/org/apache/struts/action2/plexus/PlexusFilter.java
+++ b/src/java/org/apache/struts/action2/plexus/PlexusFilter.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.plexus;
+package org.apache.struts.action2.plexus;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/src/java/org/apache/struts/action2/plexus/PlexusLifecycleListener.java b/src/java/org/apache/struts/action2/plexus/PlexusLifecycleListener.java
index 8c1d42dc9..202628ed4 100644
--- a/src/java/org/apache/struts/action2/plexus/PlexusLifecycleListener.java
+++ b/src/java/org/apache/struts/action2/plexus/PlexusLifecycleListener.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.plexus;
+package org.apache.struts.action2.plexus;
 
 import org.codehaus.plexus.DefaultPlexusContainer;
 import org.codehaus.plexus.PlexusContainer;
diff --git a/src/java/org/apache/struts/action2/plexus/PlexusObjectFactory.java b/src/java/org/apache/struts/action2/plexus/PlexusObjectFactory.java
index 8887a215a..c86b6aa0c 100644
--- a/src/java/org/apache/struts/action2/plexus/PlexusObjectFactory.java
+++ b/src/java/org/apache/struts/action2/plexus/PlexusObjectFactory.java
@@ -1,6 +1,6 @@
-package com.opensymphony.webwork.plexus;
+package org.apache.struts.action2.plexus;
 
-import com.opensymphony.webwork.util.ObjectFactoryInitializable;
+import org.apache.struts.action2.util.ObjectFactoryInitializable;
 import com.opensymphony.xwork.ObjectFactory;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -51,7 +51,7 @@ public class PlexusObjectFactory extends ObjectFactory implements ObjectFactoryI
                     "    <!-- this should be before the webwork filter -->\n" +
                     "    <filter>\n" +
                     "        <filter-name>plexus</filter-name>\n" +
-                    "        <filter-class>com.opensymphony.webwork.plexus.PlexusFilter</filter-class>\n" +
+                    "        <filter-class>org.apache.struts.action2.plexus.PlexusFilter</filter-class>\n" +
                     "    </filter>\n" +
                     "\n" +
                     "...\n" +
@@ -65,7 +65,7 @@ public class PlexusObjectFactory extends ObjectFactory implements ObjectFactoryI
                     "...\n" +
                     "\n" +
                     "    <listener>\n" +
-                    "        <listener-class>com.opensymphony.webwork.plexus.PlexusLifecycleListener</listener-class>\n" +
+                    "        <listener-class>org.apache.struts.action2.plexus.PlexusLifecycleListener</listener-class>\n" +
                     "    </listener>";
             log.fatal(message);
             return;
diff --git a/src/java/org/apache/struts/action2/plexus/PlexusThreadLocal.java b/src/java/org/apache/struts/action2/plexus/PlexusThreadLocal.java
index 7356b6cb2..308391a75 100644
--- a/src/java/org/apache/struts/action2/plexus/PlexusThreadLocal.java
+++ b/src/java/org/apache/struts/action2/plexus/PlexusThreadLocal.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.plexus;
+package org.apache.struts.action2.plexus;
 
 import org.codehaus.plexus.PlexusContainer;
 
diff --git a/src/java/org/apache/struts/action2/plexus/PlexusUtils.java b/src/java/org/apache/struts/action2/plexus/PlexusUtils.java
index 0584c4a90..456cd21b5 100644
--- a/src/java/org/apache/struts/action2/plexus/PlexusUtils.java
+++ b/src/java/org/apache/struts/action2/plexus/PlexusUtils.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.plexus;
+package org.apache.struts.action2.plexus;
 
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.configuration.PlexusConfigurationResourceException;
diff --git a/src/java/org/apache/struts/action2/portlet/PortletActionConstants.java b/src/java/org/apache/struts/action2/portlet/PortletActionConstants.java
index 0a360287b..8aa5b6465 100644
--- a/src/java/org/apache/struts/action2/portlet/PortletActionConstants.java
+++ b/src/java/org/apache/struts/action2/portlet/PortletActionConstants.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;
 
 /**
  * Interface defining some constants used in the WebWork2 portlet implementation
@@ -74,19 +74,19 @@ public interface PortletActionConstants {
 
     /**
      * Key for the portlet namespace stored in the 
-     * {@link com.opensymphony.webwork.portlet.context.PortletActionContext}.
+     * {@link org.apache.struts.action2.portlet.context.PortletActionContext}.
      */
     String PORTLET_NAMESPACE = "webwork.portlet.portletNamespace";
     
     /**
      * Key for the mode-to-namespace map stored in the 
-     * {@link com.opensymphony.webwork.portlet.context.PortletActionContext}.
+     * {@link org.apache.struts.action2.portlet.context.PortletActionContext}.
      */
     String MODE_NAMESPACE_MAP = "webwork.portlet.modeNamespaceMap";
     
     /**
      * Key for the default action name for the portlet, stored in the 
-     * {@link com.opensymphony.webwork.portlet.context.PortletActionContext}.
+     * {@link org.apache.struts.action2.portlet.context.PortletActionContext}.
      */
     String DEFAULT_ACTION_FOR_MODE = "webwork.portlet.defaultActionForMode";
 }
diff --git a/src/java/org/apache/struts/action2/portlet/PortletApplicationMap.java b/src/java/org/apache/struts/action2/portlet/PortletApplicationMap.java
index 6c5aa59db..ad6577741 100644
--- a/src/java/org/apache/struts/action2/portlet/PortletApplicationMap.java
+++ b/src/java/org/apache/struts/action2/portlet/PortletApplicationMap.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.io.Serializable;
 import java.util.AbstractMap;
diff --git a/src/java/org/apache/struts/action2/portlet/PortletRequestMap.java b/src/java/org/apache/struts/action2/portlet/PortletRequestMap.java
index 03b6615ab..e12dd94d9 100644
--- a/src/java/org/apache/struts/action2/portlet/PortletRequestMap.java
+++ b/src/java/org/apache/struts/action2/portlet/PortletRequestMap.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.AbstractMap;
 import java.util.Enumeration;
diff --git a/src/java/org/apache/struts/action2/portlet/PortletSessionMap.java b/src/java/org/apache/struts/action2/portlet/PortletSessionMap.java
index 74cf5f823..e32474910 100644
--- a/src/java/org/apache/struts/action2/portlet/PortletSessionMap.java
+++ b/src/java/org/apache/struts/action2/portlet/PortletSessionMap.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.AbstractMap;
 import java.util.Enumeration;
diff --git a/src/java/org/apache/struts/action2/portlet/context/PortletActionContext.java b/src/java/org/apache/struts/action2/portlet/context/PortletActionContext.java
index 8adab18fa..169a928f2 100644
--- a/src/java/org/apache/struts/action2/portlet/context/PortletActionContext.java
+++ b/src/java/org/apache/struts/action2/portlet/context/PortletActionContext.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.Map;
 
@@ -14,7 +14,7 @@ import javax.portlet.PortletResponse;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 
-import com.opensymphony.webwork.portlet.PortletActionConstants;
+import org.apache.struts.action2.portlet.PortletActionConstants;
 import com.opensymphony.xwork.ActionContext;
 
 
diff --git a/src/java/org/apache/struts/action2/portlet/context/PreparatorServlet.java b/src/java/org/apache/struts/action2/portlet/context/PreparatorServlet.java
index b4560e1ee..458caa45f 100644
--- a/src/java/org/apache/struts/action2/portlet/context/PreparatorServlet.java
+++ b/src/java/org/apache/struts/action2/portlet/context/PreparatorServlet.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.io.IOException;
 
@@ -15,14 +15,14 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.opensymphony.webwork.WebWorkStatics;
+import org.apache.struts.action2.WebWorkStatics;
 import com.opensymphony.xwork.ActionContext;
 
 /**
  * Since a portlet is not dispatched the same way as a servlet, the 
- * {@link com.opensymphony.webwork.ServletActionContext} is not immediately available, as it 
+ * {@link org.apache.struts.action2.ServletActionContext} is not immediately available, as it 
  * depends on objects from the servlet API. However, the WW2 view implementations require access
- * to the objects in the {@link com.opensymphony.webwork.ServletActionContext}, and this servlet
+ * to the objects in the {@link org.apache.struts.action2.ServletActionContext}, and this servlet
  * makes sure that these are available when the portlet actions are executing the render results.
  * 
  * @author Nils-Helge Garli
@@ -32,7 +32,7 @@ public class PreparatorServlet extends HttpServlet implements WebWorkStatics {
     private final static Log LOG = LogFactory.getLog(PreparatorServlet.class);
 
     /**
-     * Prepares the {@link com.opensymphony.webwork.ServletActionContext} with the
+     * Prepares the {@link org.apache.struts.action2.ServletActionContext} with the
      * {@link ServletContext}, {@link HttpServletRequest} and {@link HttpServletResponse}.
      */
     public void service(HttpServletRequest servletRequest,
diff --git a/src/java/org/apache/struts/action2/portlet/context/ServletContextHolderListener.java b/src/java/org/apache/struts/action2/portlet/context/ServletContextHolderListener.java
index 0726400d4..63688cd23 100644
--- a/src/java/org/apache/struts/action2/portlet/context/ServletContextHolderListener.java
+++ b/src/java/org/apache/struts/action2/portlet/context/ServletContextHolderListener.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.ServletContext;
 import javax.servlet.ServletContextEvent;
@@ -10,7 +10,7 @@ import javax.servlet.ServletContextListener;
 
 /**
  * Some of the factory/managers (e.g. the ObjectFactory) need access to 
- * the {@link com.opensymphony.webwork.ServletActionContext} object when initializing.
+ * the {@link org.apache.struts.action2.ServletActionContext} object when initializing.
  * This {@link javax.servlet.ServletContextListener} keeps a reference to the 
  * {@link javax.servlet.ServletContext} and exposes it through a <code>public static</code>
  * method.
diff --git a/src/java/org/apache/struts/action2/portlet/dispatcher/DirectRenderFromEventAction.java b/src/java/org/apache/struts/action2/portlet/dispatcher/DirectRenderFromEventAction.java
index 2fd124c58..c1d2318dd 100644
--- a/src/java/org/apache/struts/action2/portlet/dispatcher/DirectRenderFromEventAction.java
+++ b/src/java/org/apache/struts/action2/portlet/dispatcher/DirectRenderFromEventAction.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 com.opensymphony.xwork.ActionSupport;
 
@@ -15,7 +15,7 @@ import com.opensymphony.xwork.ActionSupport;
  * immediately be executed. The portlet needs to "wait" to the render phase to do the 
  * rendering. 
  * 
- * When the {@link com.opensymphony.webwork.portlet.result.PortletResult} detects such a 
+ * When the {@link org.apache.struts.action2.portlet.result.PortletResult} detects such a 
  * scenario, instead of executing the actual view, it prepares a couple of render parameters
  * specifying this action and the location of the view, which then will be executed in the 
  * following render request.
diff --git a/src/java/org/apache/struts/action2/portlet/dispatcher/Jsr168Dispatcher.java b/src/java/org/apache/struts/action2/portlet/dispatcher/Jsr168Dispatcher.java
index db4e84f41..7f1048b49 100644
--- a/src/java/org/apache/struts/action2/portlet/dispatcher/Jsr168Dispatcher.java
+++ b/src/java/org/apache/struts/action2/portlet/dispatcher/Jsr168Dispatcher.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.io.IOException;
 import java.util.HashMap;
@@ -26,21 +26,21 @@ import org.apache.commons.logging.LogFactory;
 
 import com.opensymphony.util.ClassLoaderUtil;
 import com.opensymphony.util.FileManager;
-import com.opensymphony.webwork.WebWorkStatics;
-import com.opensymphony.webwork.WebWorkConstants;
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.dispatcher.ApplicationMap;
-import com.opensymphony.webwork.dispatcher.RequestMap;
-import com.opensymphony.webwork.dispatcher.SessionMap;
-import com.opensymphony.webwork.dispatcher.mapper.ActionMapping;
-import com.opensymphony.webwork.portlet.PortletActionConstants;
-import com.opensymphony.webwork.portlet.PortletApplicationMap;
-import com.opensymphony.webwork.portlet.PortletRequestMap;
-import com.opensymphony.webwork.portlet.PortletSessionMap;
-import com.opensymphony.webwork.portlet.context.PortletActionContext;
-import com.opensymphony.webwork.portlet.context.ServletContextHolderListener;
-import com.opensymphony.webwork.util.AttributeMap;
-import com.opensymphony.webwork.util.ObjectFactoryInitializable;
+import org.apache.struts.action2.WebWorkStatics;
+import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.dispatcher.ApplicationMap;
+import org.apache.struts.action2.dispatcher.RequestMap;
+import org.apache.struts.action2.dispatcher.SessionMap;
+import org.apache.struts.action2.dispatcher.mapper.ActionMapping;
+import org.apache.struts.action2.portlet.PortletActionConstants;
+import org.apache.struts.action2.portlet.PortletApplicationMap;
+import org.apache.struts.action2.portlet.PortletRequestMap;
+import org.apache.struts.action2.portlet.PortletSessionMap;
+import org.apache.struts.action2.portlet.context.PortletActionContext;
+import org.apache.struts.action2.portlet.context.ServletContextHolderListener;
+import org.apache.struts.action2.util.AttributeMap;
+import org.apache.struts.action2.util.ObjectFactoryInitializable;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionProxy;
 import com.opensymphony.xwork.ActionProxyFactory;
@@ -197,11 +197,11 @@ public class Jsr168Dispatcher extends GenericPortlet implements WebWorkStatics,
             if (className.equals("spring")) {
                 // note: this class name needs to be in string form so we don't put hard
                 //       dependencies on spring, since it isn't technically required.
-                className = "com.opensymphony.webwork.spring.WebWorkSpringObjectFactory";
+                className = "org.apache.struts.action2.spring.WebWorkSpringObjectFactory";
             } else if (className.equals("plexus")) {
                 // note: this class name needs to be in string form so we don't put hard
                 //       dependencies on spring, since it isn't technically required.
-                className = "com.opensymphony.webwork.plexus.PlexusObjectFactory";
+                className = "org.apache.struts.action2.plexus.PlexusObjectFactory";
             }
 
             try {
diff --git a/src/java/org/apache/struts/action2/portlet/result/PortletResult.java b/src/java/org/apache/struts/action2/portlet/result/PortletResult.java
index 98aa4cce0..fdfeb108a 100644
--- a/src/java/org/apache/struts/action2/portlet/result/PortletResult.java
+++ b/src/java/org/apache/struts/action2/portlet/result/PortletResult.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.StringTokenizer;
@@ -22,10 +22,10 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.dispatcher.WebWorkResultSupport;
-import com.opensymphony.webwork.portlet.PortletActionConstants;
-import com.opensymphony.webwork.portlet.context.PortletActionContext;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.dispatcher.WebWorkResultSupport;
+import org.apache.struts.action2.portlet.PortletActionConstants;
+import org.apache.struts.action2.portlet.context.PortletActionContext;
 import com.opensymphony.xwork.ActionInvocation;
 
 /**
diff --git a/src/java/org/apache/struts/action2/portlet/result/PortletVelocityResult.java b/src/java/org/apache/struts/action2/portlet/result/PortletVelocityResult.java
index f64ba14c2..6b6be00c8 100644
--- a/src/java/org/apache/struts/action2/portlet/result/PortletVelocityResult.java
+++ b/src/java/org/apache/struts/action2/portlet/result/PortletVelocityResult.java
@@ -2,16 +2,16 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.portlet.result;
+package org.apache.struts.action2.portlet.result;
 
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.WebWorkConstants;
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.dispatcher.WebWorkResultSupport;
-import com.opensymphony.webwork.portlet.PortletActionConstants;
-import com.opensymphony.webwork.portlet.context.PortletActionContext;
-import com.opensymphony.webwork.views.JspSupportServlet;
-import com.opensymphony.webwork.views.velocity.VelocityManager;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.dispatcher.WebWorkResultSupport;
+import org.apache.struts.action2.portlet.PortletActionConstants;
+import org.apache.struts.action2.portlet.context.PortletActionContext;
+import org.apache.struts.action2.views.JspSupportServlet;
+import org.apache.struts.action2.views.velocity.VelocityManager;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.util.OgnlValueStack;
diff --git a/src/java/org/apache/struts/action2/portlet/util/PortletUrlHelper.java b/src/java/org/apache/struts/action2/portlet/util/PortletUrlHelper.java
index 55df10565..3b2f57a05 100644
--- a/src/java/org/apache/struts/action2/portlet/util/PortletUrlHelper.java
+++ b/src/java/org/apache/struts/action2/portlet/util/PortletUrlHelper.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.portlet.util;
+package org.apache.struts.action2.portlet.util;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
@@ -19,8 +19,8 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.opensymphony.webwork.portlet.PortletActionConstants;
-import com.opensymphony.webwork.portlet.context.PortletActionContext;
+import org.apache.struts.action2.portlet.PortletActionConstants;
+import org.apache.struts.action2.portlet.context.PortletActionContext;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import com.opensymphony.xwork.util.TextParseUtil;
diff --git a/src/java/org/apache/struts/action2/quickstart/Configuration.java b/src/java/org/apache/struts/action2/quickstart/Configuration.java
index fc25738a0..7db813733 100644
--- a/src/java/org/apache/struts/action2/quickstart/Configuration.java
+++ b/src/java/org/apache/struts/action2/quickstart/Configuration.java
@@ -2,7 +2,7 @@
  *  Copyright (c) 2002-2006 by OpenSymphony
  *  All rights reserved.
  */
-package com.opensymphony.webwork.quickstart;
+package org.apache.struts.action2.quickstart;
 
 import com.thoughtworks.xstream.XStream;
 import org.apache.commons.collections.MultiHashMap;
diff --git a/src/java/org/apache/struts/action2/quickstart/JettyServer.java b/src/java/org/apache/struts/action2/quickstart/JettyServer.java
index b06a03101..890187a52 100644
--- a/src/java/org/apache/struts/action2/quickstart/JettyServer.java
+++ b/src/java/org/apache/struts/action2/quickstart/JettyServer.java
@@ -2,7 +2,7 @@
  *  Copyright (c) 2002-2006 by OpenSymphony
  *  All rights reserved.
  */
-package com.opensymphony.webwork.quickstart;
+package org.apache.struts.action2.quickstart;
 
 import org.mortbay.http.SocketListener;
 import org.mortbay.jetty.Server;
diff --git a/src/java/org/apache/struts/action2/quickstart/Mapping.java b/src/java/org/apache/struts/action2/quickstart/Mapping.java
index e92547f07..afda31b3e 100644
--- a/src/java/org/apache/struts/action2/quickstart/Mapping.java
+++ b/src/java/org/apache/struts/action2/quickstart/Mapping.java
@@ -2,7 +2,7 @@
  *  Copyright (c) 2002-2006 by OpenSymphony
  *  All rights reserved.
  */
-package com.opensymphony.webwork.quickstart;
+package org.apache.struts.action2.quickstart;
 
 /**
  * Used for mapping configuration for the QuickStart application.
diff --git a/src/java/org/apache/struts/action2/quickstart/MultiDirClassLoader.java b/src/java/org/apache/struts/action2/quickstart/MultiDirClassLoader.java
index 7998d0f65..fcad9cc42 100644
--- a/src/java/org/apache/struts/action2/quickstart/MultiDirClassLoader.java
+++ b/src/java/org/apache/struts/action2/quickstart/MultiDirClassLoader.java
@@ -2,7 +2,7 @@
  *  Copyright (c) 2002-2006 by OpenSymphony
  *  All rights reserved.
  */
-package com.opensymphony.webwork.quickstart;
+package org.apache.struts.action2.quickstart;
 
 import java.net.URLClassLoader;
 import java.net.URL;
diff --git a/src/java/org/apache/struts/action2/quickstart/MultiDirResource.java b/src/java/org/apache/struts/action2/quickstart/MultiDirResource.java
index 545d54b2a..7837f7f28 100644
--- a/src/java/org/apache/struts/action2/quickstart/MultiDirResource.java
+++ b/src/java/org/apache/struts/action2/quickstart/MultiDirResource.java
@@ -2,7 +2,7 @@
  *  Copyright (c) 2002-2006 by OpenSymphony
  *  All rights reserved.
  */
-package com.opensymphony.webwork.quickstart;
+package org.apache.struts.action2.quickstart;
 
 import org.mortbay.util.Resource;
 
diff --git a/src/java/org/apache/struts/action2/quickstart/MultiWebApplicationContext.java b/src/java/org/apache/struts/action2/quickstart/MultiWebApplicationContext.java
index caf56ff63..added0f23 100644
--- a/src/java/org/apache/struts/action2/quickstart/MultiWebApplicationContext.java
+++ b/src/java/org/apache/struts/action2/quickstart/MultiWebApplicationContext.java
@@ -2,7 +2,7 @@
  *  Copyright (c) 2002-2006 by OpenSymphony
  *  All rights reserved.
  */
-package com.opensymphony.webwork.quickstart;
+package org.apache.struts.action2.quickstart;
 
 import org.mortbay.jetty.servlet.WebApplicationContext;
 import org.mortbay.util.Resource;
diff --git a/src/java/org/apache/struts/action2/quickstart/QuickStart.java b/src/java/org/apache/struts/action2/quickstart/QuickStart.java
index 29d0a3855..e3154bf54 100644
--- a/src/java/org/apache/struts/action2/quickstart/QuickStart.java
+++ b/src/java/org/apache/struts/action2/quickstart/QuickStart.java
@@ -2,9 +2,9 @@
  *  Copyright (c) 2002-2006 by OpenSymphony
  *  All rights reserved.
  */
-package com.opensymphony.webwork.quickstart;
+package org.apache.struts.action2.quickstart;
 
-import com.opensymphony.webwork.util.classloader.CompilingClassLoader;
+import org.apache.struts.action2.util.classloader.CompilingClassLoader;
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.io.xml.DomDriver;
 
@@ -134,7 +134,7 @@ public class QuickStart {
         URLClassLoader url = new MyURLClassLoader(parent);
         Thread.currentThread().setContextClassLoader(url);
 
-        Class clazz = url.loadClass("com.opensymphony.webwork.quickstart.JettyServer");
+        Class clazz = url.loadClass("org.apache.struts.action2.quickstart.JettyServer");
         Method method = clazz.getDeclaredMethod("startServer",
                 new Class[]{int.class, String.class, List.class, Map.class, String.class});
         method.invoke(null, new Object[]{c.port, c.getContext(), c.getPathPriority(), c.getMappings(), c.getResolver()});
diff --git a/src/java/org/apache/struts/action2/sitegraph/SiteGraph.java b/src/java/org/apache/struts/action2/sitegraph/SiteGraph.java
index a6b88bad0..6b02909d9 100644
--- a/src/java/org/apache/struts/action2/sitegraph/SiteGraph.java
+++ b/src/java/org/apache/struts/action2/sitegraph/SiteGraph.java
@@ -1,9 +1,9 @@
 /*
  * Created on Aug 12, 2004 by mgreer
  */
-package com.opensymphony.webwork.sitegraph;
+package org.apache.struts.action2.sitegraph;
 
-import com.opensymphony.webwork.sitegraph.renderers.DOTRenderer;
+import org.apache.struts.action2.sitegraph.renderers.DOTRenderer;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/src/java/org/apache/struts/action2/sitegraph/XWorkConfigRetriever.java b/src/java/org/apache/struts/action2/sitegraph/XWorkConfigRetriever.java
index c773cc7b9..0e192c7dc 100644
--- a/src/java/org/apache/struts/action2/sitegraph/XWorkConfigRetriever.java
+++ b/src/java/org/apache/struts/action2/sitegraph/XWorkConfigRetriever.java
@@ -1,13 +1,13 @@
 /*
  * Created on Aug 14, 2004 by mgreer
  */
-package com.opensymphony.webwork.sitegraph;
+package org.apache.struts.action2.sitegraph;
 
-import com.opensymphony.webwork.sitegraph.collectors.ArbitraryXMLConfigurationProvider;
-import com.opensymphony.webwork.sitegraph.entities.FreeMarkerView;
-import com.opensymphony.webwork.sitegraph.entities.JspView;
-import com.opensymphony.webwork.sitegraph.entities.VelocityView;
-import com.opensymphony.webwork.sitegraph.entities.View;
+import org.apache.struts.action2.sitegraph.collectors.ArbitraryXMLConfigurationProvider;
+import org.apache.struts.action2.sitegraph.entities.FreeMarkerView;
+import org.apache.struts.action2.sitegraph.entities.JspView;
+import org.apache.struts.action2.sitegraph.entities.VelocityView;
+import org.apache.struts.action2.sitegraph.entities.View;
 import com.opensymphony.xwork.config.ConfigurationManager;
 import com.opensymphony.xwork.config.ConfigurationProvider;
 import com.opensymphony.xwork.config.entities.ActionConfig;
diff --git a/src/java/org/apache/struts/action2/sitegraph/collectors/ArbitraryXMLConfigurationProvider.java b/src/java/org/apache/struts/action2/sitegraph/collectors/ArbitraryXMLConfigurationProvider.java
index 7db0b7869..06980efb8 100644
--- a/src/java/org/apache/struts/action2/sitegraph/collectors/ArbitraryXMLConfigurationProvider.java
+++ b/src/java/org/apache/struts/action2/sitegraph/collectors/ArbitraryXMLConfigurationProvider.java
@@ -1,7 +1,7 @@
 /*
  * Created on Aug 12, 2004 by mgreer
  */
-package com.opensymphony.webwork.sitegraph.collectors;
+package org.apache.struts.action2.sitegraph.collectors;
 
 import com.opensymphony.util.FileManager;
 import com.opensymphony.xwork.config.providers.XmlConfigurationProvider;
diff --git a/src/java/org/apache/struts/action2/sitegraph/entities/FileBasedView.java b/src/java/org/apache/struts/action2/sitegraph/entities/FileBasedView.java
index 05316580a..95220aad3 100644
--- a/src/java/org/apache/struts/action2/sitegraph/entities/FileBasedView.java
+++ b/src/java/org/apache/struts/action2/sitegraph/entities/FileBasedView.java
@@ -1,9 +1,9 @@
-package com.opensymphony.webwork.sitegraph.entities;
+package org.apache.struts.action2.sitegraph.entities;
 
 import com.opensymphony.util.FileUtils;
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.sitegraph.model.Link;
-import com.opensymphony.webwork.WebWorkConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.sitegraph.model.Link;
+import org.apache.struts.action2.WebWorkConstants;
 
 import java.io.File;
 import java.util.Set;
diff --git a/src/java/org/apache/struts/action2/sitegraph/entities/FreeMarkerView.java b/src/java/org/apache/struts/action2/sitegraph/entities/FreeMarkerView.java
index ac1d77ed0..9c157f68b 100644
--- a/src/java/org/apache/struts/action2/sitegraph/entities/FreeMarkerView.java
+++ b/src/java/org/apache/struts/action2/sitegraph/entities/FreeMarkerView.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.sitegraph.entities;
+package org.apache.struts.action2.sitegraph.entities;
 
 import java.io.File;
 import java.util.regex.Pattern;
diff --git a/src/java/org/apache/struts/action2/sitegraph/entities/JspView.java b/src/java/org/apache/struts/action2/sitegraph/entities/JspView.java
index 4e729f6eb..fb45a4aae 100644
--- a/src/java/org/apache/struts/action2/sitegraph/entities/JspView.java
+++ b/src/java/org/apache/struts/action2/sitegraph/entities/JspView.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.sitegraph.entities;
+package org.apache.struts.action2.sitegraph.entities;
 
 import java.io.File;
 import java.util.regex.Pattern;
diff --git a/src/java/org/apache/struts/action2/sitegraph/entities/Target.java b/src/java/org/apache/struts/action2/sitegraph/entities/Target.java
index 2564a55aa..2076b504c 100644
--- a/src/java/org/apache/struts/action2/sitegraph/entities/Target.java
+++ b/src/java/org/apache/struts/action2/sitegraph/entities/Target.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.sitegraph.entities;
+package org.apache.struts.action2.sitegraph.entities;
 
 
 /**
diff --git a/src/java/org/apache/struts/action2/sitegraph/entities/VelocityView.java b/src/java/org/apache/struts/action2/sitegraph/entities/VelocityView.java
index f8741e116..56f6610aa 100644
--- a/src/java/org/apache/struts/action2/sitegraph/entities/VelocityView.java
+++ b/src/java/org/apache/struts/action2/sitegraph/entities/VelocityView.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.sitegraph.entities;
+package org.apache.struts.action2.sitegraph.entities;
 
 import java.io.File;
 import java.util.regex.Pattern;
diff --git a/src/java/org/apache/struts/action2/sitegraph/entities/View.java b/src/java/org/apache/struts/action2/sitegraph/entities/View.java
index e79e337cf..f22608a35 100644
--- a/src/java/org/apache/struts/action2/sitegraph/entities/View.java
+++ b/src/java/org/apache/struts/action2/sitegraph/entities/View.java
@@ -1,7 +1,7 @@
 /*
  * Created on Aug 13, 2004 by mgreer
  */
-package com.opensymphony.webwork.sitegraph.entities;
+package org.apache.struts.action2.sitegraph.entities;
 
 import java.util.Set;
 
diff --git a/src/java/org/apache/struts/action2/sitegraph/model/ActionNode.java b/src/java/org/apache/struts/action2/sitegraph/model/ActionNode.java
index 3c62d1f4d..55e770059 100644
--- a/src/java/org/apache/struts/action2/sitegraph/model/ActionNode.java
+++ b/src/java/org/apache/struts/action2/sitegraph/model/ActionNode.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.sitegraph.model;
+package org.apache.struts.action2.sitegraph.model;
 
 /**
  * User: plightbo
diff --git a/src/java/org/apache/struts/action2/sitegraph/model/Graph.java b/src/java/org/apache/struts/action2/sitegraph/model/Graph.java
index 7df49484d..12f0fcbf8 100644
--- a/src/java/org/apache/struts/action2/sitegraph/model/Graph.java
+++ b/src/java/org/apache/struts/action2/sitegraph/model/Graph.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.sitegraph.model;
+package org.apache.struts.action2.sitegraph.model;
 
 import java.io.IOException;
 import java.util.*;
diff --git a/src/java/org/apache/struts/action2/sitegraph/model/IndentWriter.java b/src/java/org/apache/struts/action2/sitegraph/model/IndentWriter.java
index 8ce347764..23ddce343 100644
--- a/src/java/org/apache/struts/action2/sitegraph/model/IndentWriter.java
+++ b/src/java/org/apache/struts/action2/sitegraph/model/IndentWriter.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.sitegraph.model;
+package org.apache.struts.action2.sitegraph.model;
 
 import java.io.IOException;
 import java.io.Writer;
diff --git a/src/java/org/apache/struts/action2/sitegraph/model/Link.java b/src/java/org/apache/struts/action2/sitegraph/model/Link.java
index 7be4975b8..81d9d5c25 100644
--- a/src/java/org/apache/struts/action2/sitegraph/model/Link.java
+++ b/src/java/org/apache/struts/action2/sitegraph/model/Link.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.sitegraph.model;
+package org.apache.struts.action2.sitegraph.model;
 
 import java.io.IOException;
 
diff --git a/src/java/org/apache/struts/action2/sitegraph/model/Render.java b/src/java/org/apache/struts/action2/sitegraph/model/Render.java
index 5b51bda75..49ffbbf0a 100644
--- a/src/java/org/apache/struts/action2/sitegraph/model/Render.java
+++ b/src/java/org/apache/struts/action2/sitegraph/model/Render.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.sitegraph.model;
+package org.apache.struts.action2.sitegraph.model;
 
 import java.io.IOException;
 
diff --git a/src/java/org/apache/struts/action2/sitegraph/model/SiteGraphNode.java b/src/java/org/apache/struts/action2/sitegraph/model/SiteGraphNode.java
index 407a86e7e..a4a68f462 100644
--- a/src/java/org/apache/struts/action2/sitegraph/model/SiteGraphNode.java
+++ b/src/java/org/apache/struts/action2/sitegraph/model/SiteGraphNode.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.sitegraph.model;
+package org.apache.struts.action2.sitegraph.model;
 
 import java.io.IOException;
 
diff --git a/src/java/org/apache/struts/action2/sitegraph/model/SubGraph.java b/src/java/org/apache/struts/action2/sitegraph/model/SubGraph.java
index aa3e5f00c..a0231fff1 100644
--- a/src/java/org/apache/struts/action2/sitegraph/model/SubGraph.java
+++ b/src/java/org/apache/struts/action2/sitegraph/model/SubGraph.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.sitegraph.model;
+package org.apache.struts.action2.sitegraph.model;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/src/java/org/apache/struts/action2/sitegraph/model/ViewNode.java b/src/java/org/apache/struts/action2/sitegraph/model/ViewNode.java
index 6efcde708..c55563552 100644
--- a/src/java/org/apache/struts/action2/sitegraph/model/ViewNode.java
+++ b/src/java/org/apache/struts/action2/sitegraph/model/ViewNode.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.sitegraph.model;
+package org.apache.struts.action2.sitegraph.model;
 
 /**
  * User: plightbo
diff --git a/src/java/org/apache/struts/action2/sitegraph/renderers/DOTRenderer.java b/src/java/org/apache/struts/action2/sitegraph/renderers/DOTRenderer.java
index 49ae996e5..127586cec 100644
--- a/src/java/org/apache/struts/action2/sitegraph/renderers/DOTRenderer.java
+++ b/src/java/org/apache/struts/action2/sitegraph/renderers/DOTRenderer.java
@@ -1,14 +1,14 @@
 /*
  * Created on Aug 12, 2004 by mgreer
  */
-package com.opensymphony.webwork.sitegraph.renderers;
+package org.apache.struts.action2.sitegraph.renderers;
 
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.sitegraph.XWorkConfigRetriever;
-import com.opensymphony.webwork.sitegraph.entities.Target;
-import com.opensymphony.webwork.sitegraph.entities.View;
-import com.opensymphony.webwork.sitegraph.model.*;
-import com.opensymphony.webwork.WebWorkConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.sitegraph.XWorkConfigRetriever;
+import org.apache.struts.action2.sitegraph.entities.Target;
+import org.apache.struts.action2.sitegraph.entities.View;
+import org.apache.struts.action2.sitegraph.model.*;
+import org.apache.struts.action2.WebWorkConstants;
 import com.opensymphony.xwork.ActionChainResult;
 import com.opensymphony.xwork.config.entities.ActionConfig;
 import com.opensymphony.xwork.config.entities.ResultConfig;
diff --git a/src/java/org/apache/struts/action2/sitemesh/FreeMarkerPageFilter.java b/src/java/org/apache/struts/action2/sitemesh/FreeMarkerPageFilter.java
index 58d870b82..ecafc6bfc 100644
--- a/src/java/org/apache/struts/action2/sitemesh/FreeMarkerPageFilter.java
+++ b/src/java/org/apache/struts/action2/sitemesh/FreeMarkerPageFilter.java
@@ -3,13 +3,13 @@
  * All rights reserved.
  */
 
-package com.opensymphony.webwork.sitemesh;
+package org.apache.struts.action2.sitemesh;
 
 import com.opensymphony.module.sitemesh.Decorator;
 import com.opensymphony.module.sitemesh.Page;
 import com.opensymphony.module.sitemesh.HTMLPage;
 import com.opensymphony.module.sitemesh.filter.PageFilter;
-import com.opensymphony.webwork.views.freemarker.FreemarkerManager;
+import org.apache.struts.action2.views.freemarker.FreemarkerManager;
 import com.opensymphony.xwork.*;
 import freemarker.template.Configuration;
 import freemarker.template.SimpleHash;
diff --git a/src/java/org/apache/struts/action2/sitemesh/TemplatePageFilter.java b/src/java/org/apache/struts/action2/sitemesh/TemplatePageFilter.java
index 0a581299b..693c1e1bf 100644
--- a/src/java/org/apache/struts/action2/sitemesh/TemplatePageFilter.java
+++ b/src/java/org/apache/struts/action2/sitemesh/TemplatePageFilter.java
@@ -3,15 +3,15 @@
  * All rights reserved.
  */
 
-package com.opensymphony.webwork.sitemesh;
+package org.apache.struts.action2.sitemesh;
 
 import com.opensymphony.module.sitemesh.Decorator;
 import com.opensymphony.module.sitemesh.Page;
 import com.opensymphony.module.sitemesh.filter.PageFilter;
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.dispatcher.DispatcherUtils;
-import com.opensymphony.webwork.WebWorkConstants;
-import com.opensymphony.webwork.config.Configuration;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.dispatcher.DispatcherUtils;
+import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.config.Configuration;
 
 import com.opensymphony.xwork.*;
 import com.opensymphony.xwork.interceptor.PreResultListener;
diff --git a/src/java/org/apache/struts/action2/sitemesh/VelocityPageFilter.java b/src/java/org/apache/struts/action2/sitemesh/VelocityPageFilter.java
index 128ecfb66..199887a46 100644
--- a/src/java/org/apache/struts/action2/sitemesh/VelocityPageFilter.java
+++ b/src/java/org/apache/struts/action2/sitemesh/VelocityPageFilter.java
@@ -1,10 +1,10 @@
-package com.opensymphony.webwork.sitemesh;
+package org.apache.struts.action2.sitemesh;
 
 import com.opensymphony.module.sitemesh.Decorator;
 import com.opensymphony.module.sitemesh.Page;
 import com.opensymphony.module.sitemesh.HTMLPage;
 import com.opensymphony.module.sitemesh.filter.PageFilter;
-import com.opensymphony.webwork.views.velocity.VelocityManager;
+import org.apache.struts.action2.views.velocity.VelocityManager;
 import com.opensymphony.xwork.ActionContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/src/java/org/apache/struts/action2/spring/SessionContextSpringProxyableObjectFactory.java b/src/java/org/apache/struts/action2/spring/SessionContextSpringProxyableObjectFactory.java
index a63c8eb5d..71ff58e4c 100644
--- a/src/java/org/apache/struts/action2/spring/SessionContextSpringProxyableObjectFactory.java
+++ b/src/java/org/apache/struts/action2/spring/SessionContextSpringProxyableObjectFactory.java
@@ -1,9 +1,9 @@
 /*
  * Copyright (c) 2005 Opensymphony. All Rights Reserved.
  */
-package com.opensymphony.webwork.spring;
+package org.apache.struts.action2.spring;
 
-import com.opensymphony.webwork.spring.lifecycle.ApplicationContextSessionListener;
+import org.apache.struts.action2.spring.lifecycle.ApplicationContextSessionListener;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.spring.SpringProxyableObjectFactory;
 import org.apache.commons.logging.Log;
diff --git a/src/java/org/apache/struts/action2/spring/WebWorkSpringObjectFactory.java b/src/java/org/apache/struts/action2/spring/WebWorkSpringObjectFactory.java
index 150a805cf..f36d8180c 100644
--- a/src/java/org/apache/struts/action2/spring/WebWorkSpringObjectFactory.java
+++ b/src/java/org/apache/struts/action2/spring/WebWorkSpringObjectFactory.java
@@ -2,11 +2,11 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.spring;
+package org.apache.struts.action2.spring;
 
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.util.ObjectFactoryInitializable;
-import com.opensymphony.webwork.WebWorkConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.util.ObjectFactoryInitializable;
+import org.apache.struts.action2.WebWorkConstants;
 import com.opensymphony.xwork.spring.SpringObjectFactory;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/src/java/org/apache/struts/action2/spring/interceptor/SessionContextAutowiringInterceptor.java b/src/java/org/apache/struts/action2/spring/interceptor/SessionContextAutowiringInterceptor.java
index 9a6801b96..feef035d8 100644
--- a/src/java/org/apache/struts/action2/spring/interceptor/SessionContextAutowiringInterceptor.java
+++ b/src/java/org/apache/struts/action2/spring/interceptor/SessionContextAutowiringInterceptor.java
@@ -1,11 +1,11 @@
 /*
  * Copyright (c) 2005 ePlus Corporation. All Rights Reserved.
  */
-package com.opensymphony.webwork.spring.interceptor;
+package org.apache.struts.action2.spring.interceptor;
 
 import com.opensymphony.xwork.interceptor.AroundInterceptor;
 import com.opensymphony.xwork.ActionInvocation;
-import com.opensymphony.webwork.spring.lifecycle.ApplicationContextSessionListener;
+import org.apache.struts.action2.spring.lifecycle.ApplicationContextSessionListener;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
diff --git a/src/java/org/apache/struts/action2/spring/lifecycle/ApplicationContextSessionListener.java b/src/java/org/apache/struts/action2/spring/lifecycle/ApplicationContextSessionListener.java
index 3cca3e676..abde8e241 100644
--- a/src/java/org/apache/struts/action2/spring/lifecycle/ApplicationContextSessionListener.java
+++ b/src/java/org/apache/struts/action2/spring/lifecycle/ApplicationContextSessionListener.java
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2005 Opensymphony. All Rights Reserved.
  */
-package com.opensymphony.webwork.spring.lifecycle;
+package org.apache.struts.action2.spring.lifecycle;
 
 import org.springframework.web.context.support.WebApplicationContextUtils;
 import org.springframework.web.context.support.XmlWebApplicationContext;
@@ -48,7 +48,7 @@ public class ApplicationContextSessionListener implements HttpSessionListener, S
     /**
      * Key to map the session-scoped application context into the session attributes.
      */
-    public static final String APP_CONTEXT_SESSION_KEY = "com.opensymphony.webwork.spring.ApplicationContextSessionListener_APP_CONTEXT";
+    public static final String APP_CONTEXT_SESSION_KEY = "org.apache.struts.action2.spring.ApplicationContextSessionListener_APP_CONTEXT";
 
     /**
      * The default session context configuration string:"classpath:session.xml"
diff --git a/src/java/org/apache/struts/action2/spring/lifecycle/SpringExternalReferenceResolverSetupListener.java b/src/java/org/apache/struts/action2/spring/lifecycle/SpringExternalReferenceResolverSetupListener.java
index 730107ba5..06815271a 100644
--- a/src/java/org/apache/struts/action2/spring/lifecycle/SpringExternalReferenceResolverSetupListener.java
+++ b/src/java/org/apache/struts/action2/spring/lifecycle/SpringExternalReferenceResolverSetupListener.java
@@ -1,7 +1,7 @@
 /*
  * Created on Jun 14, 2004
  */
-package com.opensymphony.webwork.spring.lifecycle;
+package org.apache.struts.action2.spring.lifecycle;
 
 import com.opensymphony.xwork.config.Configuration;
 import com.opensymphony.xwork.config.ConfigurationManager;
diff --git a/src/java/org/apache/struts/action2/spring/lifecycle/SpringObjectFactoryListener.java b/src/java/org/apache/struts/action2/spring/lifecycle/SpringObjectFactoryListener.java
index f1a099c67..4f466874c 100644
--- a/src/java/org/apache/struts/action2/spring/lifecycle/SpringObjectFactoryListener.java
+++ b/src/java/org/apache/struts/action2/spring/lifecycle/SpringObjectFactoryListener.java
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2005 Opensymphony. All Rights Reserved.
  */
-package com.opensymphony.webwork.spring.lifecycle;
+package org.apache.struts.action2.spring.lifecycle;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -16,7 +16,7 @@ import javax.servlet.ServletContextListener;
  * called first.
  *
  * @author sms
- * @deprecated Please configure webwork.property to use {@link com.opensymphony.webwork.spring.WebWorkSpringObjectFactory}
+ * @deprecated Please configure webwork.property to use {@link org.apache.struts.action2.spring.WebWorkSpringObjectFactory}
  */
 public class SpringObjectFactoryListener implements ServletContextListener {
     private static final Log log = LogFactory.getLog(SpringObjectFactoryListener.class);
diff --git a/src/java/org/apache/struts/action2/util/AppendIteratorFilter.java b/src/java/org/apache/struts/action2/util/AppendIteratorFilter.java
index ce75bdd0e..6a12e4f8f 100644
--- a/src/java/org/apache/struts/action2/util/AppendIteratorFilter.java
+++ b/src/java/org/apache/struts/action2/util/AppendIteratorFilter.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 com.opensymphony.xwork.Action;
 
@@ -16,8 +16,8 @@ import java.util.List;
  *
  * @author Rickard Öberg (rickard@middleware-company.com)
  * @version $Revision: 1.7 $
- * @see com.opensymphony.webwork.components.AppendIterator
- * @see com.opensymphony.webwork.views.jsp.iterator.AppendIteratorTag
+ * @see org.apache.struts.action2.components.AppendIterator
+ * @see org.apache.struts.action2.views.jsp.iterator.AppendIteratorTag
  */
 public class AppendIteratorFilter extends IteratorFilterSupport implements Iterator, Action {
 
diff --git a/src/java/org/apache/struts/action2/util/AttributeMap.java b/src/java/org/apache/struts/action2/util/AttributeMap.java
index 8185b3468..a61c64fa6 100644
--- a/src/java/org/apache/struts/action2/util/AttributeMap.java
+++ b/src/java/org/apache/struts/action2/util/AttributeMap.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.util;
+package org.apache.struts.action2.util;
 
-import com.opensymphony.webwork.ServletActionContext;
+import org.apache.struts.action2.ServletActionContext;
 
 import javax.servlet.jsp.PageContext;
 import java.util.Collection;
diff --git a/src/java/org/apache/struts/action2/util/ClassLoaderUtils.java b/src/java/org/apache/struts/action2/util/ClassLoaderUtils.java
index 5b5816448..cf25092fd 100644
--- a/src/java/org/apache/struts/action2/util/ClassLoaderUtils.java
+++ b/src/java/org/apache/struts/action2/util/ClassLoaderUtils.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.io.IOException;
 import java.io.InputStream;
diff --git a/src/java/org/apache/struts/action2/util/ContainUtil.java b/src/java/org/apache/struts/action2/util/ContainUtil.java
index 405505324..bb20d5c7c 100644
--- a/src/java/org/apache/struts/action2/util/ContainUtil.java
+++ b/src/java/org/apache/struts/action2/util/ContainUtil.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.lang.reflect.Array;
 import java.util.Collection;
diff --git a/src/java/org/apache/struts/action2/util/Counter.java b/src/java/org/apache/struts/action2/util/Counter.java
index 431227535..748747d5c 100644
--- a/src/java/org/apache/struts/action2/util/Counter.java
+++ b/src/java/org/apache/struts/action2/util/Counter.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.io.Serializable;
 
@@ -12,7 +12,7 @@ import java.io.Serializable;
  * <p/>
  * Since it is an Iterator it can be used by the iterator tag
  *
- * @author Rickard Öberg (rickard@middleware-company.com)
+ * @author Rickard �berg (rickard@middleware-company.com)
  * @version $Revision: 1.4 $
  * @see <related>
  */
diff --git a/src/java/org/apache/struts/action2/util/DateFormatter.java b/src/java/org/apache/struts/action2/util/DateFormatter.java
index f49abc945..7df54811e 100644
--- a/src/java/org/apache/struts/action2/util/DateFormatter.java
+++ b/src/java/org/apache/struts/action2/util/DateFormatter.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.text.DateFormat;
 import java.text.ParseException;
@@ -13,7 +13,7 @@ import java.util.Date;
 /**
  * A bean that can be used to format dates
  *
- * @author Rickard Öberg (rickard@middleware-company.com)
+ * @author Rickard �berg (rickard@middleware-company.com)
  * @version $Revision: 1.6 $
  */
 public class DateFormatter {
diff --git a/src/java/org/apache/struts/action2/util/FastByteArrayOutputStream.java b/src/java/org/apache/struts/action2/util/FastByteArrayOutputStream.java
index 1361c205a..18156a68b 100644
--- a/src/java/org/apache/struts/action2/util/FastByteArrayOutputStream.java
+++ b/src/java/org/apache/struts/action2/util/FastByteArrayOutputStream.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.io.IOException;
 import java.io.OutputStream;
@@ -17,7 +17,7 @@ import java.util.LinkedList;
  * does not copy buffers when it's expanded. There's also no copying of the internal buffer
  * if it's contents is extracted with the writeTo(stream) method.
  *
- * @author Rickard Öberg
+ * @author Rickard �berg
  * @version $Revision: 1.11 $
  */
 public class FastByteArrayOutputStream extends OutputStream {
diff --git a/src/java/org/apache/struts/action2/util/InvocationSessionStore.java b/src/java/org/apache/struts/action2/util/InvocationSessionStore.java
index 5263b344f..1b2b1c599 100644
--- a/src/java/org/apache/struts/action2/util/InvocationSessionStore.java
+++ b/src/java/org/apache/struts/action2/util/InvocationSessionStore.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 com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionInvocation;
@@ -21,7 +21,7 @@ import java.util.Map;
  */
 public class InvocationSessionStore {
 
-    private static final String INVOCATION_MAP_KEY = "com.opensymphony.webwork.util.InvocationSessionStore.invocationMap";
+    private static final String INVOCATION_MAP_KEY = "org.apache.struts.action2.util.InvocationSessionStore.invocationMap";
 
 
     private InvocationSessionStore() {
diff --git a/src/java/org/apache/struts/action2/util/IteratorFilterSupport.java b/src/java/org/apache/struts/action2/util/IteratorFilterSupport.java
index d85bf042e..3e8170e50 100644
--- a/src/java/org/apache/struts/action2/util/IteratorFilterSupport.java
+++ b/src/java/org/apache/struts/action2/util/IteratorFilterSupport.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.Enumeration;
 import java.util.Iterator;
@@ -11,7 +11,7 @@ import java.util.Iterator;
 /**
  * A base class for iterator filters
  *
- * @author Rickard Öberg (rickard@middleware-company.com)
+ * @author Rickard �berg (rickard@middleware-company.com)
  * @version $Revision: 1.5 $
  */
 public abstract class IteratorFilterSupport {
diff --git a/src/java/org/apache/struts/action2/util/IteratorGenerator.java b/src/java/org/apache/struts/action2/util/IteratorGenerator.java
index 9e8b01a76..cc93c57a1 100644
--- a/src/java/org/apache/struts/action2/util/IteratorGenerator.java
+++ b/src/java/org/apache/struts/action2/util/IteratorGenerator.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 com.opensymphony.xwork.Action;
 
diff --git a/src/java/org/apache/struts/action2/util/ListEntry.java b/src/java/org/apache/struts/action2/util/ListEntry.java
index e5bbe3864..8020f80b2 100644
--- a/src/java/org/apache/struts/action2/util/ListEntry.java
+++ b/src/java/org/apache/struts/action2/util/ListEntry.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;
 
 /**
  * Entry in a list.
diff --git a/src/java/org/apache/struts/action2/util/MakeIterator.java b/src/java/org/apache/struts/action2/util/MakeIterator.java
index 470d2ffa0..ee255dbf1 100644
--- a/src/java/org/apache/struts/action2/util/MakeIterator.java
+++ b/src/java/org/apache/struts/action2/util/MakeIterator.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.lang.reflect.Array;
 import java.util.*;
diff --git a/src/java/org/apache/struts/action2/util/MergeIteratorFilter.java b/src/java/org/apache/struts/action2/util/MergeIteratorFilter.java
index 2f78e4c59..f2c520864 100644
--- a/src/java/org/apache/struts/action2/util/MergeIteratorFilter.java
+++ b/src/java/org/apache/struts/action2/util/MergeIteratorFilter.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 com.opensymphony.xwork.Action;
 
@@ -17,8 +17,8 @@ import java.util.List;
  *
  * @author Rickard Öberg (rickard@middleware-company.com)
  * @version $Revision: 1.7 $
- * @see com.opensymphony.webwork.views.jsp.iterator.MergeIteratorTag
- * @see com.opensymphony.webwork.components.MergeIterator
+ * @see org.apache.struts.action2.views.jsp.iterator.MergeIteratorTag
+ * @see org.apache.struts.action2.components.MergeIterator
  */
 public class MergeIteratorFilter extends IteratorFilterSupport implements Iterator, Action {
 
diff --git a/src/java/org/apache/struts/action2/util/ObjectFactoryDestroyable.java b/src/java/org/apache/struts/action2/util/ObjectFactoryDestroyable.java
index 8f13a88fc..1dd7dc01c 100644
--- a/src/java/org/apache/struts/action2/util/ObjectFactoryDestroyable.java
+++ b/src/java/org/apache/struts/action2/util/ObjectFactoryDestroyable.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.util;
+package org.apache.struts.action2.util;
 
 /**
  * An interface to be implemented by any ObjectFactory implementation 
@@ -12,8 +12,8 @@ package com.opensymphony.webwork.util;
  * @author tm_jee
  * @version $Date: 2006/03/16 14:44:01 $ $Id: ObjectFactoryDestroyable.java,v 1.1 2006/03/16 14:44:01 tmjee Exp $
  * 
- * @see com.opensymphony.webwork.dispatcher.FilterDispatcher
- * @see com.opensymphony.webwork.dispatcher.DispatcherUtils
+ * @see org.apache.struts.action2.dispatcher.FilterDispatcher
+ * @see org.apache.struts.action2.dispatcher.DispatcherUtils
  */
 public interface ObjectFactoryDestroyable {
 	void destroy();
diff --git a/src/java/org/apache/struts/action2/util/ObjectFactoryInitializable.java b/src/java/org/apache/struts/action2/util/ObjectFactoryInitializable.java
index c5e7d119d..0806a012c 100644
--- a/src/java/org/apache/struts/action2/util/ObjectFactoryInitializable.java
+++ b/src/java/org/apache/struts/action2/util/ObjectFactoryInitializable.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.util;
+package org.apache.struts.action2.util;
 
 import javax.servlet.ServletContext;
 
diff --git a/src/java/org/apache/struts/action2/util/ObjectFactoryLifecycle.java b/src/java/org/apache/struts/action2/util/ObjectFactoryLifecycle.java
index a4f8a0d12..8b8d53ac4 100644
--- a/src/java/org/apache/struts/action2/util/ObjectFactoryLifecycle.java
+++ b/src/java/org/apache/struts/action2/util/ObjectFactoryLifecycle.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.util;
+package org.apache.struts.action2.util;
 
 /**
  * An interface indicating the lifecycle of an ObjectFactory implementation.
@@ -12,8 +12,8 @@ package com.opensymphony.webwork.util;
  * 
  * @see ObjectFactoryLifecycle
  * @see com.opensymphony.xwork.ObjectFactory
- * @see com.opensymphony.webwork.util.ObjectFactoryInitializable
- * @see com.opensymphony.webwork.util.ObjectFactoryDestroyable
+ * @see org.apache.struts.action2.util.ObjectFactoryInitializable
+ * @see org.apache.struts.action2.util.ObjectFactoryDestroyable
  */
 public interface ObjectFactoryLifecycle extends ObjectFactoryInitializable, ObjectFactoryDestroyable {
 	
diff --git a/src/java/org/apache/struts/action2/util/PrefixTrie.java b/src/java/org/apache/struts/action2/util/PrefixTrie.java
index 59558ecc8..556b17990 100644
--- a/src/java/org/apache/struts/action2/util/PrefixTrie.java
+++ b/src/java/org/apache/struts/action2/util/PrefixTrie.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.util;
+package org.apache.struts.action2.util;
 
 /**
  * Quickly matches a prefix to an object.
diff --git a/src/java/org/apache/struts/action2/util/ResolverSetupServletContextListener.java b/src/java/org/apache/struts/action2/util/ResolverSetupServletContextListener.java
index 22d8c33b5..33c3bbeaf 100644
--- a/src/java/org/apache/struts/action2/util/ResolverSetupServletContextListener.java
+++ b/src/java/org/apache/struts/action2/util/ResolverSetupServletContextListener.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 com.opensymphony.xwork.config.Configuration;
 import com.opensymphony.xwork.config.ConfigurationManager;
diff --git a/src/java/org/apache/struts/action2/util/ServletContextAware.java b/src/java/org/apache/struts/action2/util/ServletContextAware.java
index e69639a38..d5548642b 100644
--- a/src/java/org/apache/struts/action2/util/ServletContextAware.java
+++ b/src/java/org/apache/struts/action2/util/ServletContextAware.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 javax.servlet.ServletContext;
 
diff --git a/src/java/org/apache/struts/action2/util/SortIteratorFilter.java b/src/java/org/apache/struts/action2/util/SortIteratorFilter.java
index 6cfe32e02..4e2c75bb4 100644
--- a/src/java/org/apache/struts/action2/util/SortIteratorFilter.java
+++ b/src/java/org/apache/struts/action2/util/SortIteratorFilter.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 com.opensymphony.xwork.Action;
 import org.apache.commons.logging.LogFactory;
@@ -17,7 +17,7 @@ import java.util.*;
  * @author Rickard �berg (rickard@middleware-company.com)
  * @author tm_jee ( tm_jee(at)yahoo.co.uk )
  * @version $Revision: 1.9 $
- * @see com.opensymphony.webwork.views.jsp.iterator.SortIteratorTag
+ * @see org.apache.struts.action2.views.jsp.iterator.SortIteratorTag
  */
 public class SortIteratorFilter extends IteratorFilterSupport implements Iterator, Action {
 
diff --git a/src/java/org/apache/struts/action2/util/Sorter.java b/src/java/org/apache/struts/action2/util/Sorter.java
index 8d5c04fcd..315a450e2 100644
--- a/src/java/org/apache/struts/action2/util/Sorter.java
+++ b/src/java/org/apache/struts/action2/util/Sorter.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 com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -12,9 +12,9 @@ import java.util.Comparator;
 /**
  * Sorters. Utility sorters for use with the "sort" tag.
  *
- * @author Rickard Öberg (rickard@middleware-company.com)
+ * @author Rickard �berg (rickard@middleware-company.com)
  * @version $Revision: 1.9 $
- * @see com.opensymphony.webwork.views.jsp.iterator.SortIteratorTag
+ * @see org.apache.struts.action2.views.jsp.iterator.SortIteratorTag
  * @see SortIteratorFilter
  */
 public class Sorter {
diff --git a/src/java/org/apache/struts/action2/util/SubsetIteratorFilter.java b/src/java/org/apache/struts/action2/util/SubsetIteratorFilter.java
index db0bdd705..c61dd007a 100644
--- a/src/java/org/apache/struts/action2/util/SubsetIteratorFilter.java
+++ b/src/java/org/apache/struts/action2/util/SubsetIteratorFilter.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 com.opensymphony.xwork.Action;
 
diff --git a/src/java/org/apache/struts/action2/util/TabbedPane.java b/src/java/org/apache/struts/action2/util/TabbedPane.java
index 5fcc51a3d..0b1e34d0d 100644
--- a/src/java/org/apache/struts/action2/util/TabbedPane.java
+++ b/src/java/org/apache/struts/action2/util/TabbedPane.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.Vector;
 
@@ -11,7 +11,7 @@ import java.util.Vector;
  * A bean that helps implement a tabbed pane
  *
  * @author Onyeje Bose (digi9ten@yahoo.com)
- * @author Rickard Öberg (rickard@middleware-company.com)
+ * @author Rickard �berg (rickard@middleware-company.com)
  * @version $Revision: 1.4 $
  */
 public class TabbedPane {
diff --git a/src/java/org/apache/struts/action2/util/Timer.java b/src/java/org/apache/struts/action2/util/Timer.java
index 99df2b358..4ec2fd135 100644
--- a/src/java/org/apache/struts/action2/util/Timer.java
+++ b/src/java/org/apache/struts/action2/util/Timer.java
@@ -2,13 +2,13 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.util;
+package org.apache.struts.action2.util;
 
 
 /**
  * A bean that can be used to time execution of pages
  *
- * @author Rickard Öberg (rickard@middleware-company.com)
+ * @author Rickard �berg (rickard@middleware-company.com)
  * @version $Revision: 1.4 $
  */
 public class Timer {
diff --git a/src/java/org/apache/struts/action2/util/TokenHelper.java b/src/java/org/apache/struts/action2/util/TokenHelper.java
index fa4a15734..774cbb81e 100644
--- a/src/java/org/apache/struts/action2/util/TokenHelper.java
+++ b/src/java/org/apache/struts/action2/util/TokenHelper.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.util;
+package org.apache.struts.action2.util;
 
 import com.opensymphony.util.GUID;
 import com.opensymphony.xwork.ActionContext;
diff --git a/src/java/org/apache/struts/action2/util/URLBean.java b/src/java/org/apache/struts/action2/util/URLBean.java
index a065d5741..de0acbef5 100644
--- a/src/java/org/apache/struts/action2/util/URLBean.java
+++ b/src/java/org/apache/struts/action2/util/URLBean.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.util;
+package org.apache.struts.action2.util;
 
-import com.opensymphony.webwork.views.util.UrlHelper;
+import org.apache.struts.action2.views.util.UrlHelper;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/src/java/org/apache/struts/action2/util/VelocityWebWorkUtil.java b/src/java/org/apache/struts/action2/util/VelocityWebWorkUtil.java
index 346c02d0f..3c5aa82f0 100644
--- a/src/java/org/apache/struts/action2/util/VelocityWebWorkUtil.java
+++ b/src/java/org/apache/struts/action2/util/VelocityWebWorkUtil.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.util;
+package org.apache.struts.action2.util;
 
-import com.opensymphony.webwork.views.velocity.VelocityManager;
+import org.apache.struts.action2.views.velocity.VelocityManager;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import org.apache.velocity.context.Context;
 import org.apache.velocity.exception.MethodInvocationException;
diff --git a/src/java/org/apache/struts/action2/util/WebWorkTypeConverter.java b/src/java/org/apache/struts/action2/util/WebWorkTypeConverter.java
index 775863998..90219c377 100644
--- a/src/java/org/apache/struts/action2/util/WebWorkTypeConverter.java
+++ b/src/java/org/apache/struts/action2/util/WebWorkTypeConverter.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 ognl.DefaultTypeConverter;
 
diff --git a/src/java/org/apache/struts/action2/util/WebWorkUtil.java b/src/java/org/apache/struts/action2/util/WebWorkUtil.java
index 7604ff5e6..f6c0fc341 100644
--- a/src/java/org/apache/struts/action2/util/WebWorkUtil.java
+++ b/src/java/org/apache/struts/action2/util/WebWorkUtil.java
@@ -2,11 +2,11 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.util;
+package org.apache.struts.action2.util;
 
 import com.opensymphony.util.TextUtils;
-import com.opensymphony.webwork.views.jsp.ui.OgnlTool;
-import com.opensymphony.webwork.views.util.UrlHelper;
+import org.apache.struts.action2.views.jsp.ui.OgnlTool;
+import org.apache.struts.action2.views.util.UrlHelper;
 import com.opensymphony.xwork.ObjectFactory;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import org.apache.commons.logging.Log;
diff --git a/src/java/org/apache/struts/action2/util/classloader/CompilingClassLoader.java b/src/java/org/apache/struts/action2/util/classloader/CompilingClassLoader.java
index 7925f9ea4..3d77098a6 100644
--- a/src/java/org/apache/struts/action2/util/classloader/CompilingClassLoader.java
+++ b/src/java/org/apache/struts/action2/util/classloader/CompilingClassLoader.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.webwork.util.classloader;
+package org.apache.struts.action2.util.classloader;
 
-import com.opensymphony.webwork.util.classloader.compilers.JavaCompiler;
-import com.opensymphony.webwork.util.classloader.compilers.eclipse.EclipseJavaCompiler;
-import com.opensymphony.webwork.util.classloader.listeners.CompilingListener;
-import com.opensymphony.webwork.util.classloader.monitor.FilesystemAlterationMonitor;
-import com.opensymphony.webwork.util.classloader.stores.MemoryResourceStore;
-import com.opensymphony.webwork.util.classloader.stores.TransactionalResourceStore;
+import org.apache.struts.action2.util.classloader.compilers.JavaCompiler;
+import org.apache.struts.action2.util.classloader.compilers.eclipse.EclipseJavaCompiler;
+import org.apache.struts.action2.util.classloader.listeners.CompilingListener;
+import org.apache.struts.action2.util.classloader.monitor.FilesystemAlterationMonitor;
+import org.apache.struts.action2.util.classloader.stores.MemoryResourceStore;
+import org.apache.struts.action2.util.classloader.stores.TransactionalResourceStore;
 import com.uwyn.rife.continuations.ClassByteAware;
 
 import java.io.File;
diff --git a/src/java/org/apache/struts/action2/util/classloader/ReloadingClassLoader.java b/src/java/org/apache/struts/action2/util/classloader/ReloadingClassLoader.java
index 7badedd6f..4ece380d9 100644
--- a/src/java/org/apache/struts/action2/util/classloader/ReloadingClassLoader.java
+++ b/src/java/org/apache/struts/action2/util/classloader/ReloadingClassLoader.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.webwork.util.classloader;
+package org.apache.struts.action2.util.classloader;
 
-import com.opensymphony.webwork.util.classloader.listeners.ReloadingListener;
-import com.opensymphony.webwork.util.classloader.listeners.CompilingListener;
-import com.opensymphony.webwork.util.classloader.monitor.FilesystemAlterationMonitor;
-import com.opensymphony.webwork.util.classloader.readers.FileResourceReader;
-import com.opensymphony.webwork.util.classloader.readers.ResourceReader;
-import com.opensymphony.webwork.util.classloader.stores.MemoryResourceStore;
-import com.opensymphony.webwork.util.classloader.stores.ResourceStore;
-import com.opensymphony.webwork.util.classloader.stores.ResourceStoreClassLoader;
+import org.apache.struts.action2.util.classloader.listeners.ReloadingListener;
+import org.apache.struts.action2.util.classloader.listeners.CompilingListener;
+import org.apache.struts.action2.util.classloader.monitor.FilesystemAlterationMonitor;
+import org.apache.struts.action2.util.classloader.readers.FileResourceReader;
+import org.apache.struts.action2.util.classloader.readers.ResourceReader;
+import org.apache.struts.action2.util.classloader.stores.MemoryResourceStore;
+import org.apache.struts.action2.util.classloader.stores.ResourceStore;
+import org.apache.struts.action2.util.classloader.stores.ResourceStoreClassLoader;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/src/java/org/apache/struts/action2/util/classloader/ReloadingClassLoaderListener.java b/src/java/org/apache/struts/action2/util/classloader/ReloadingClassLoaderListener.java
index a46a243ef..5315dc62d 100644
--- a/src/java/org/apache/struts/action2/util/classloader/ReloadingClassLoaderListener.java
+++ b/src/java/org/apache/struts/action2/util/classloader/ReloadingClassLoaderListener.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.webwork.util.classloader;
+package org.apache.struts.action2.util.classloader;
 
 
 /**
diff --git a/src/java/org/apache/struts/action2/util/classloader/compilers/JavaCompiler.java b/src/java/org/apache/struts/action2/util/classloader/compilers/JavaCompiler.java
index 7d2f9109a..8c9a35f40 100644
--- a/src/java/org/apache/struts/action2/util/classloader/compilers/JavaCompiler.java
+++ b/src/java/org/apache/struts/action2/util/classloader/compilers/JavaCompiler.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.webwork.util.classloader.compilers;
+package org.apache.struts.action2.util.classloader.compilers;
 
-import com.opensymphony.webwork.util.classloader.problems.CompilationProblemHandler;
-import com.opensymphony.webwork.util.classloader.readers.ResourceReader;
-import com.opensymphony.webwork.util.classloader.stores.ResourceStore;
+import org.apache.struts.action2.util.classloader.problems.CompilationProblemHandler;
+import org.apache.struts.action2.util.classloader.readers.ResourceReader;
+import org.apache.struts.action2.util.classloader.stores.ResourceStore;
 
 
 /**
diff --git a/src/java/org/apache/struts/action2/util/classloader/compilers/JavaCompilerFactory.java b/src/java/org/apache/struts/action2/util/classloader/compilers/JavaCompilerFactory.java
index a10b9e394..a37863a13 100644
--- a/src/java/org/apache/struts/action2/util/classloader/compilers/JavaCompilerFactory.java
+++ b/src/java/org/apache/struts/action2/util/classloader/compilers/JavaCompilerFactory.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.webwork.util.classloader.compilers;
+package org.apache.struts.action2.util.classloader.compilers;
 
 public interface JavaCompilerFactory {
 
diff --git a/src/java/org/apache/struts/action2/util/classloader/compilers/JavaCompilerSettings.java b/src/java/org/apache/struts/action2/util/classloader/compilers/JavaCompilerSettings.java
index 3ea01fbc7..47344503a 100644
--- a/src/java/org/apache/struts/action2/util/classloader/compilers/JavaCompilerSettings.java
+++ b/src/java/org/apache/struts/action2/util/classloader/compilers/JavaCompilerSettings.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.webwork.util.classloader.compilers;
+package org.apache.struts.action2.util.classloader.compilers;
 
 
 public interface JavaCompilerSettings {
diff --git a/src/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseCompilationProblem.java b/src/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseCompilationProblem.java
index 525853ccc..12ee7673f 100644
--- a/src/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseCompilationProblem.java
+++ b/src/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseCompilationProblem.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.webwork.util.classloader.compilers.eclipse;
+package org.apache.struts.action2.util.classloader.compilers.eclipse;
 
-import com.opensymphony.webwork.util.classloader.problems.CompilationProblem;
+import org.apache.struts.action2.util.classloader.problems.CompilationProblem;
 import org.eclipse.jdt.core.compiler.IProblem;
 
 public class EclipseCompilationProblem implements CompilationProblem {
diff --git a/src/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseJavaCompiler.java b/src/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseJavaCompiler.java
index 1f5142750..d03d4f770 100644
--- a/src/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseJavaCompiler.java
+++ b/src/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseJavaCompiler.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.webwork.util.classloader.compilers.eclipse;
+package org.apache.struts.action2.util.classloader.compilers.eclipse;
 
-import com.opensymphony.webwork.util.classloader.compilers.JavaCompiler;
-import com.opensymphony.webwork.util.classloader.problems.CompilationProblemHandler;
-import com.opensymphony.webwork.util.classloader.readers.ResourceReader;
-import com.opensymphony.webwork.util.classloader.stores.ResourceStore;
+import org.apache.struts.action2.util.classloader.compilers.JavaCompiler;
+import org.apache.struts.action2.util.classloader.problems.CompilationProblemHandler;
+import org.apache.struts.action2.util.classloader.readers.ResourceReader;
+import org.apache.struts.action2.util.classloader.stores.ResourceStore;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/src/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseJavaCompilerSettings.java b/src/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseJavaCompilerSettings.java
index 5f4ff5f1b..23081f13b 100644
--- a/src/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseJavaCompilerSettings.java
+++ b/src/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseJavaCompilerSettings.java
@@ -1,6 +1,6 @@
-package com.opensymphony.webwork.util.classloader.compilers.eclipse;
+package org.apache.struts.action2.util.classloader.compilers.eclipse;
 
-import com.opensymphony.webwork.util.classloader.compilers.JavaCompilerSettings;
+import org.apache.struts.action2.util.classloader.compilers.JavaCompilerSettings;
 import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
 
 import java.util.HashMap;
diff --git a/src/java/org/apache/struts/action2/util/classloader/listeners/CompilingListener.java b/src/java/org/apache/struts/action2/util/classloader/listeners/CompilingListener.java
index a13981d28..69f00c1ff 100644
--- a/src/java/org/apache/struts/action2/util/classloader/listeners/CompilingListener.java
+++ b/src/java/org/apache/struts/action2/util/classloader/listeners/CompilingListener.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.webwork.util.classloader.listeners;
+package org.apache.struts.action2.util.classloader.listeners;
 
-import com.opensymphony.webwork.util.classloader.ReloadingClassLoader;
-import com.opensymphony.webwork.util.classloader.compilers.JavaCompiler;
-import com.opensymphony.webwork.util.classloader.monitor.FilesystemAlterationListener;
-import com.opensymphony.webwork.util.classloader.problems.CompilationProblem;
-import com.opensymphony.webwork.util.classloader.problems.DefaultCompilationProblemHandler;
-import com.opensymphony.webwork.util.classloader.problems.ConsoleCompilationProblemHandler;
-import com.opensymphony.webwork.util.classloader.readers.ResourceReader;
-import com.opensymphony.webwork.util.classloader.stores.TransactionalResourceStore;
+import org.apache.struts.action2.util.classloader.ReloadingClassLoader;
+import org.apache.struts.action2.util.classloader.compilers.JavaCompiler;
+import org.apache.struts.action2.util.classloader.monitor.FilesystemAlterationListener;
+import org.apache.struts.action2.util.classloader.problems.CompilationProblem;
+import org.apache.struts.action2.util.classloader.problems.DefaultCompilationProblemHandler;
+import org.apache.struts.action2.util.classloader.problems.ConsoleCompilationProblemHandler;
+import org.apache.struts.action2.util.classloader.readers.ResourceReader;
+import org.apache.struts.action2.util.classloader.stores.TransactionalResourceStore;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/src/java/org/apache/struts/action2/util/classloader/listeners/ReloadingListener.java b/src/java/org/apache/struts/action2/util/classloader/listeners/ReloadingListener.java
index 488d9cef3..a3eff26e0 100644
--- a/src/java/org/apache/struts/action2/util/classloader/listeners/ReloadingListener.java
+++ b/src/java/org/apache/struts/action2/util/classloader/listeners/ReloadingListener.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.webwork.util.classloader.listeners;
+package org.apache.struts.action2.util.classloader.listeners;
 
-import com.opensymphony.webwork.util.classloader.monitor.FilesystemAlterationListener;
-import com.opensymphony.webwork.util.classloader.stores.ResourceStore;
+import org.apache.struts.action2.util.classloader.monitor.FilesystemAlterationListener;
+import org.apache.struts.action2.util.classloader.stores.ResourceStore;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -58,7 +58,7 @@ public class ReloadingListener implements FilesystemAlterationListener {
         if (deleted.size() > 0) {
             for (Iterator it = deleted.iterator(); it.hasNext();) {
                 final File file = (File) it.next();
-                store.remove(com.opensymphony.webwork.util.classloader.ReloadingClassLoader.clazzName(pRepository, file));
+                store.remove(org.apache.struts.action2.util.classloader.ReloadingClassLoader.clazzName(pRepository, file));
             }
             reload = true;
         }
@@ -68,7 +68,7 @@ public class ReloadingListener implements FilesystemAlterationListener {
                 final File file = (File) it.next();
                 try {
                     final byte[] bytes = IOUtils.toByteArray(new FileReader(file));
-                    store.write(com.opensymphony.webwork.util.classloader.ReloadingClassLoader.clazzName(pRepository, file), bytes);
+                    store.write(org.apache.struts.action2.util.classloader.ReloadingClassLoader.clazzName(pRepository, file), bytes);
                 } catch (final Exception e) {
                     log.error("could not load " + file, e);
                 }
@@ -80,7 +80,7 @@ public class ReloadingListener implements FilesystemAlterationListener {
                 final File file = (File) it.next();
                 try {
                     final byte[] bytes = IOUtils.toByteArray(new FileReader(file));
-                    store.write(com.opensymphony.webwork.util.classloader.ReloadingClassLoader.clazzName(pRepository, file), bytes);
+                    store.write(org.apache.struts.action2.util.classloader.ReloadingClassLoader.clazzName(pRepository, file), bytes);
                 } catch (final Exception e) {
                     log.error("could not load " + file, e);
                 }
diff --git a/src/java/org/apache/struts/action2/util/classloader/monitor/FilesystemAlterationListener.java b/src/java/org/apache/struts/action2/util/classloader/monitor/FilesystemAlterationListener.java
index 66c6aa81a..81a46a18a 100644
--- a/src/java/org/apache/struts/action2/util/classloader/monitor/FilesystemAlterationListener.java
+++ b/src/java/org/apache/struts/action2/util/classloader/monitor/FilesystemAlterationListener.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.webwork.util.classloader.monitor;
+package org.apache.struts.action2.util.classloader.monitor;
 
 import java.io.File;
 
diff --git a/src/java/org/apache/struts/action2/util/classloader/monitor/FilesystemAlterationMonitor.java b/src/java/org/apache/struts/action2/util/classloader/monitor/FilesystemAlterationMonitor.java
index a16e323cd..785a584cd 100644
--- a/src/java/org/apache/struts/action2/util/classloader/monitor/FilesystemAlterationMonitor.java
+++ b/src/java/org/apache/struts/action2/util/classloader/monitor/FilesystemAlterationMonitor.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.webwork.util.classloader.monitor;
+package org.apache.struts.action2.util.classloader.monitor;
 
-import com.opensymphony.webwork.util.classloader.utils.ThreadUtils;
+import org.apache.struts.action2.util.classloader.utils.ThreadUtils;
 import org.apache.commons.collections.MultiHashMap;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/src/java/org/apache/struts/action2/util/classloader/problems/CompilationProblem.java b/src/java/org/apache/struts/action2/util/classloader/problems/CompilationProblem.java
index 6077cb97c..5a09b355e 100644
--- a/src/java/org/apache/struts/action2/util/classloader/problems/CompilationProblem.java
+++ b/src/java/org/apache/struts/action2/util/classloader/problems/CompilationProblem.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.webwork.util.classloader.problems;
+package org.apache.struts.action2.util.classloader.problems;
 
 public interface CompilationProblem {
 
diff --git a/src/java/org/apache/struts/action2/util/classloader/problems/CompilationProblemHandler.java b/src/java/org/apache/struts/action2/util/classloader/problems/CompilationProblemHandler.java
index 75128d8b6..97948d009 100644
--- a/src/java/org/apache/struts/action2/util/classloader/problems/CompilationProblemHandler.java
+++ b/src/java/org/apache/struts/action2/util/classloader/problems/CompilationProblemHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.webwork.util.classloader.problems;
+package org.apache.struts.action2.util.classloader.problems;
 
 
 /**
diff --git a/src/java/org/apache/struts/action2/util/classloader/problems/ConsoleCompilationProblemHandler.java b/src/java/org/apache/struts/action2/util/classloader/problems/ConsoleCompilationProblemHandler.java
index 6adf0d6a3..a8d1d9bdb 100644
--- a/src/java/org/apache/struts/action2/util/classloader/problems/ConsoleCompilationProblemHandler.java
+++ b/src/java/org/apache/struts/action2/util/classloader/problems/ConsoleCompilationProblemHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.webwork.util.classloader.problems;
+package org.apache.struts.action2.util.classloader.problems;
 
 /**
  * @author tcurdt
diff --git a/src/java/org/apache/struts/action2/util/classloader/problems/DefaultCompilationProblemHandler.java b/src/java/org/apache/struts/action2/util/classloader/problems/DefaultCompilationProblemHandler.java
index 19a85fcaf..b94556fbd 100644
--- a/src/java/org/apache/struts/action2/util/classloader/problems/DefaultCompilationProblemHandler.java
+++ b/src/java/org/apache/struts/action2/util/classloader/problems/DefaultCompilationProblemHandler.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.util.classloader.problems;
+package org.apache.struts.action2.util.classloader.problems;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/java/org/apache/struts/action2/util/classloader/problems/LogCompilationProblemHandler.java b/src/java/org/apache/struts/action2/util/classloader/problems/LogCompilationProblemHandler.java
index 4616a11a5..d2dc2ad9e 100644
--- a/src/java/org/apache/struts/action2/util/classloader/problems/LogCompilationProblemHandler.java
+++ b/src/java/org/apache/struts/action2/util/classloader/problems/LogCompilationProblemHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.webwork.util.classloader.problems;
+package org.apache.struts.action2.util.classloader.problems;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/src/java/org/apache/struts/action2/util/classloader/readers/FileResourceReader.java b/src/java/org/apache/struts/action2/util/classloader/readers/FileResourceReader.java
index c67587bdd..6aa795a25 100644
--- a/src/java/org/apache/struts/action2/util/classloader/readers/FileResourceReader.java
+++ b/src/java/org/apache/struts/action2/util/classloader/readers/FileResourceReader.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.webwork.util.classloader.readers;
+package org.apache.struts.action2.util.classloader.readers;
 
 import org.apache.commons.io.FileUtils;
 
diff --git a/src/java/org/apache/struts/action2/util/classloader/readers/ResourceReader.java b/src/java/org/apache/struts/action2/util/classloader/readers/ResourceReader.java
index 381cd30ce..3738e2692 100644
--- a/src/java/org/apache/struts/action2/util/classloader/readers/ResourceReader.java
+++ b/src/java/org/apache/struts/action2/util/classloader/readers/ResourceReader.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.webwork.util.classloader.readers;
+package org.apache.struts.action2.util.classloader.readers;
 
 /**
  * @author tcurdt
diff --git a/src/java/org/apache/struts/action2/util/classloader/stores/FileResourceStore.java b/src/java/org/apache/struts/action2/util/classloader/stores/FileResourceStore.java
index bd72cd1f0..8c3a09a3c 100644
--- a/src/java/org/apache/struts/action2/util/classloader/stores/FileResourceStore.java
+++ b/src/java/org/apache/struts/action2/util/classloader/stores/FileResourceStore.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.webwork.util.classloader.stores;
+package org.apache.struts.action2.util.classloader.stores;
 
 import org.apache.commons.io.IOUtils;
 
diff --git a/src/java/org/apache/struts/action2/util/classloader/stores/MemoryResourceStore.java b/src/java/org/apache/struts/action2/util/classloader/stores/MemoryResourceStore.java
index 0deb397bb..b49859218 100644
--- a/src/java/org/apache/struts/action2/util/classloader/stores/MemoryResourceStore.java
+++ b/src/java/org/apache/struts/action2/util/classloader/stores/MemoryResourceStore.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.webwork.util.classloader.stores;
+package org.apache.struts.action2.util.classloader.stores;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/src/java/org/apache/struts/action2/util/classloader/stores/ResourceStore.java b/src/java/org/apache/struts/action2/util/classloader/stores/ResourceStore.java
index da04690f0..341422e72 100644
--- a/src/java/org/apache/struts/action2/util/classloader/stores/ResourceStore.java
+++ b/src/java/org/apache/struts/action2/util/classloader/stores/ResourceStore.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.webwork.util.classloader.stores;
+package org.apache.struts.action2.util.classloader.stores;
 
 /**
  * @author tcurdt
diff --git a/src/java/org/apache/struts/action2/util/classloader/stores/ResourceStoreClassLoader.java b/src/java/org/apache/struts/action2/util/classloader/stores/ResourceStoreClassLoader.java
index 2a3d812bf..2e1d5139e 100644
--- a/src/java/org/apache/struts/action2/util/classloader/stores/ResourceStoreClassLoader.java
+++ b/src/java/org/apache/struts/action2/util/classloader/stores/ResourceStoreClassLoader.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.webwork.util.classloader.stores;
+package org.apache.struts.action2.util.classloader.stores;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/src/java/org/apache/struts/action2/util/classloader/stores/TransactionalResourceStore.java b/src/java/org/apache/struts/action2/util/classloader/stores/TransactionalResourceStore.java
index 5c0b882d9..fca951a84 100644
--- a/src/java/org/apache/struts/action2/util/classloader/stores/TransactionalResourceStore.java
+++ b/src/java/org/apache/struts/action2/util/classloader/stores/TransactionalResourceStore.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.opensymphony.webwork.util.classloader.stores;
+package org.apache.struts.action2.util.classloader.stores;
 
 
 /**
diff --git a/src/java/org/apache/struts/action2/util/classloader/utils/ThreadUtils.java b/src/java/org/apache/struts/action2/util/classloader/utils/ThreadUtils.java
index 5e95d4483..aebaad495 100644
--- a/src/java/org/apache/struts/action2/util/classloader/utils/ThreadUtils.java
+++ b/src/java/org/apache/struts/action2/util/classloader/utils/ThreadUtils.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.util.classloader.utils;
+package org.apache.struts.action2.util.classloader.utils;
 
 
 public final class ThreadUtils {
diff --git a/src/java/org/apache/struts/action2/validators/DWRValidator.java b/src/java/org/apache/struts/action2/validators/DWRValidator.java
index aebef2586..6b1b0b01c 100644
--- a/src/java/org/apache/struts/action2/validators/DWRValidator.java
+++ b/src/java/org/apache/struts/action2/validators/DWRValidator.java
@@ -1,12 +1,12 @@
 /*
  * Copyright (c) 2005 Opensymphony. All Rights Reserved.
  */
-package com.opensymphony.webwork.validators;
+package org.apache.struts.action2.validators;
 
-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.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.*;
 import com.opensymphony.xwork.config.entities.ActionConfig;
 import org.apache.commons.logging.Log;
@@ -26,7 +26,7 @@ import java.util.Map;
  * <p/>
  * <dwr>
  * <allow>
- * <create creator="new" javascript="validator" class="com.opensymphony.webwork.validators.DWRValidator"/>
+ * <create creator="new" javascript="validator" class="org.apache.struts.action2.validators.DWRValidator"/>
  * <convert converter="bean" match="com.opensymphony.xwork.ValidationAwareSupport"/>
  * </allow>
  * </dwr>
diff --git a/src/java/org/apache/struts/action2/views/JspSupportServlet.java b/src/java/org/apache/struts/action2/views/JspSupportServlet.java
index 96f3385ed..619159bdd 100644
--- a/src/java/org/apache/struts/action2/views/JspSupportServlet.java
+++ b/src/java/org/apache/struts/action2/views/JspSupportServlet.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.views;
+package org.apache.struts.action2.views;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java b/src/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java
index 106b25a28..a43fd1da4 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java
@@ -2,14 +2,14 @@
  * 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.util.FileManager;
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.views.JspSupportServlet;
-import com.opensymphony.webwork.views.freemarker.tags.WebWorkModels;
-import com.opensymphony.webwork.views.util.ContextUtil;
-import com.opensymphony.webwork.WebWorkConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.views.JspSupportServlet;
+import org.apache.struts.action2.views.freemarker.tags.WebWorkModels;
+import org.apache.struts.action2.views.util.ContextUtil;
+import org.apache.struts.action2.WebWorkConstants;
 import com.opensymphony.xwork.ObjectFactory;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import freemarker.cache.FileTemplateLoader;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/FreemarkerResult.java b/src/java/org/apache/struts/action2/views/freemarker/FreemarkerResult.java
index 5e20f9299..2ce5545f7 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/FreemarkerResult.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/FreemarkerResult.java
@@ -5,11 +5,11 @@
 /*
  * Created on 15/04/2004
  */
-package com.opensymphony.webwork.views.freemarker;
+package org.apache.struts.action2.views.freemarker;
 
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.dispatcher.WebWorkResultSupport;
-import com.opensymphony.webwork.views.util.ResourceUtil;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.dispatcher.WebWorkResultSupport;
+import org.apache.struts.action2.views.util.ResourceUtil;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.LocaleProvider;
@@ -28,7 +28,7 @@ import java.util.Locale;
  * <!-- START SNIPPET: description -->
  *
  * Renders a view using the Freemarker template engine.  Alternatively, the
- * {@link com.opensymphony.webwork.dispatcher.ServletDispatcherResult
+ * {@link org.apache.struts.action2.dispatcher.ServletDispatcherResult
  * dispatcher} result type can be used in conjunction Webwork's {@link
  * FreemarkerServlet}.
  * <p>
diff --git a/src/java/org/apache/struts/action2/views/freemarker/FreemarkerServlet.java b/src/java/org/apache/struts/action2/views/freemarker/FreemarkerServlet.java
index 0e4eb915a..9ce1ae832 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/FreemarkerServlet.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/FreemarkerServlet.java
@@ -6,10 +6,10 @@
  * Created on 27/08/2003
  *
  */
-package com.opensymphony.webwork.views.freemarker;
+package org.apache.struts.action2.views.freemarker;
 
-import com.opensymphony.webwork.RequestUtils;
-import com.opensymphony.webwork.ServletActionContext;
+import org.apache.struts.action2.RequestUtils;
+import org.apache.struts.action2.ServletActionContext;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import freemarker.template.*;
 
diff --git a/src/java/org/apache/struts/action2/views/freemarker/PortletFreemarkerResult.java b/src/java/org/apache/struts/action2/views/freemarker/PortletFreemarkerResult.java
index f9fa1e166..a1c579998 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/PortletFreemarkerResult.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/PortletFreemarkerResult.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.freemarker;
+package org.apache.struts.action2.views.freemarker;
 
 import java.io.IOException;
 import java.io.Writer;
@@ -15,11 +15,11 @@ import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.dispatcher.WebWorkResultSupport;
-import com.opensymphony.webwork.portlet.PortletActionConstants;
-import com.opensymphony.webwork.portlet.context.PortletActionContext;
-import com.opensymphony.webwork.views.util.ResourceUtil;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.dispatcher.WebWorkResultSupport;
+import org.apache.struts.action2.portlet.PortletActionConstants;
+import org.apache.struts.action2.portlet.context.PortletActionContext;
+import org.apache.struts.action2.views.util.ResourceUtil;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.util.OgnlValueStack;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/ScopesHashModel.java b/src/java/org/apache/struts/action2/views/freemarker/ScopesHashModel.java
index 8f9382e84..895da6134 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/ScopesHashModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/ScopesHashModel.java
@@ -2,7 +2,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.util.OgnlValueStack;
 import freemarker.template.ObjectWrapper;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/WebWorkBeanWrapper.java b/src/java/org/apache/struts/action2/views/freemarker/WebWorkBeanWrapper.java
index 97bb3cf16..a4586aa9d 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/WebWorkBeanWrapper.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/WebWorkBeanWrapper.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.views.freemarker;
+package org.apache.struts.action2.views.freemarker;
 
 import freemarker.core.CollectionAndSequence;
 import freemarker.ext.beans.BeansWrapper;
@@ -26,7 +26,7 @@ import java.util.Set;
  */
 public class WebWorkBeanWrapper extends BeansWrapper {
     private static final boolean altMapWrapper
-            = "true".equals(com.opensymphony.webwork.config.Configuration.get("webwork.freemarker.wrapper.altMap"));
+            = "true".equals(org.apache.struts.action2.config.Configuration.get("webwork.freemarker.wrapper.altMap"));
 
     public TemplateModel wrap(Object object) throws TemplateModelException {
         if (object instanceof TemplateBooleanModel) {
diff --git a/src/java/org/apache/struts/action2/views/freemarker/WebWorkClassTemplateLoader.java b/src/java/org/apache/struts/action2/views/freemarker/WebWorkClassTemplateLoader.java
index b973ee78e..fa5ce7836 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/WebWorkClassTemplateLoader.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/WebWorkClassTemplateLoader.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.views.freemarker;
+package org.apache.struts.action2.views.freemarker;
 
 import com.opensymphony.util.ClassLoaderUtil;
 import freemarker.cache.URLTemplateLoader;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/ActionErrorModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/ActionErrorModel.java
index 9342fc551..17898757c 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/ActionErrorModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/ActionErrorModel.java
@@ -1,8 +1,8 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.ActionError;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.ActionError;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/ActionMessageModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/ActionMessageModel.java
index cfa138ef1..9bce7c548 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/ActionMessageModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/ActionMessageModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.ActionMessage;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.ActionMessage;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/ActionModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/ActionModel.java
index c0a05949a..9e8cc7486 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/ActionModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/ActionModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.ActionComponent;
-import com.opensymphony.webwork.components.Component;
+import org.apache.struts.action2.components.ActionComponent;
+import org.apache.struts.action2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/AnchorModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/AnchorModel.java
index 6fbbef943..884857ef4 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/AnchorModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/AnchorModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Anchor;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Anchor;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/BeanModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/BeanModel.java
index ce58086f1..f907c551f 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/BeanModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/BeanModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Bean;
-import com.opensymphony.webwork.components.Component;
+import org.apache.struts.action2.components.Bean;
+import org.apache.struts.action2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/CallbackWriter.java b/src/java/org/apache/struts/action2/views/freemarker/tags/CallbackWriter.java
index ec79c188b..6b18124c9 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/CallbackWriter.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/CallbackWriter.java
@@ -1,6 +1,6 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Component;
+import org.apache.struts.action2.components.Component;
 import freemarker.template.TemplateModelException;
 import freemarker.template.TransformControl;
 
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/CheckboxListModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/CheckboxListModel.java
index 1441df73b..8b90aa26d 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/CheckboxListModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/CheckboxListModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.CheckboxList;
-import com.opensymphony.webwork.components.Component;
+import org.apache.struts.action2.components.CheckboxList;
+import org.apache.struts.action2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/CheckboxModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/CheckboxModel.java
index fb59670e7..bded42fc2 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/CheckboxModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/CheckboxModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Checkbox;
-import com.opensymphony.webwork.components.Component;
+import org.apache.struts.action2.components.Checkbox;
+import org.apache.struts.action2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/ComboBoxModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/ComboBoxModel.java
index c23cc70e1..17217dab7 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/ComboBoxModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/ComboBoxModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.ComboBox;
-import com.opensymphony.webwork.components.Component;
+import org.apache.struts.action2.components.ComboBox;
+import org.apache.struts.action2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/ComponentModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/ComponentModel.java
index 50c98c09f..6cc9ba8c0 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/ComponentModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/ComponentModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.GenericUIBean;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.GenericUIBean;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/DateModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/DateModel.java
index fd0b50b12..af32f3aea 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/DateModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/DateModel.java
@@ -1,8 +1,8 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Date;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Date;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/DatePickerModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/DatePickerModel.java
index ecc0f7397..b75888cbf 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/DatePickerModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/DatePickerModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.DatePicker;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.DatePicker;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/DebugModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/DebugModel.java
index e58f9ca79..8407438ed 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/DebugModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/DebugModel.java
@@ -1,11 +1,11 @@
 /*
  * Copyright (c) 2005 Opensymphony. All Rights Reserved.
  */
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Debug;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Debug;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/DivModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/DivModel.java
index 49283fdcd..697d7958b 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/DivModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/DivModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Div;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Div;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/DoubleSelectModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/DoubleSelectModel.java
index 73ae311b2..cecc228dc 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/DoubleSelectModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/DoubleSelectModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.DoubleSelect;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.DoubleSelect;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/FieldErrorModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/FieldErrorModel.java
index 2b0abfc7b..467854fde 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/FieldErrorModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/FieldErrorModel.java
@@ -1,8 +1,8 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.FieldError;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.FieldError;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/FileModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/FileModel.java
index accf0541b..dbbdd16a4 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/FileModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/FileModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.File;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.File;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/FormModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/FormModel.java
index 9e1140962..5cb6f1746 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/FormModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/FormModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Form;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Form;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/HeadModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/HeadModel.java
index 29a7dd965..ba61a3a45 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/HeadModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/HeadModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Head;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Head;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/HiddenModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/HiddenModel.java
index b5d862208..f732f54d9 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/HiddenModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/HiddenModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Hidden;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Hidden;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/I18nModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/I18nModel.java
index c15eb421a..817238a7e 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/I18nModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/I18nModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.I18n;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.I18n;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/IncludeModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/IncludeModel.java
index cf299a636..066fe7490 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/IncludeModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/IncludeModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Include;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Include;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/IteratorModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/IteratorModel.java
index 2dff998fa..d09f0c18f 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/IteratorModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/IteratorModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.IteratorComponent;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.IteratorComponent;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/LabelModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/LabelModel.java
index 0caa1afa6..787a350ff 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/LabelModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/LabelModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Label;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Label;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/OptionTransferSelectModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/OptionTransferSelectModel.java
index d821a666c..f82d0c32e 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/OptionTransferSelectModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/OptionTransferSelectModel.java
@@ -2,13 +2,13 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.OptionTransferSelect;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.OptionTransferSelect;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 /**
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/PanelModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/PanelModel.java
index 6e2c8bca3..df656e0cd 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/PanelModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/PanelModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Panel;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Panel;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/ParamModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/ParamModel.java
index 7c155ecc9..5010f5f17 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/ParamModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/ParamModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Param;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Param;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/PasswordModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/PasswordModel.java
index 8634aa48b..1f6b5090c 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/PasswordModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/PasswordModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Password;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Password;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/PropertyModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/PropertyModel.java
index 0cd7a33ae..40ba1d556 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/PropertyModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/PropertyModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Property;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Property;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/PushModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/PushModel.java
index afa19089a..55205d7a1 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/PushModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/PushModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Push;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Push;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/RadioModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/RadioModel.java
index 8813233c0..01eb1dd03 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/RadioModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/RadioModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Radio;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Radio;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/ResetModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/ResetModel.java
index cfd6e552f..061a9494c 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/ResetModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/ResetModel.java
@@ -2,17 +2,17 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Reset;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Reset;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
- * @see com.opensymphony.webwork.components.Reset
+ * @see org.apache.struts.action2.components.Reset
  */
 public class ResetModel extends TagModel {
     public ResetModel(OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res) {
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/RichTextEditorModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/RichTextEditorModel.java
index 93a7cf542..1bc522226 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/RichTextEditorModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/RichTextEditorModel.java
@@ -2,13 +2,13 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.RichTextEditor;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.RichTextEditor;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 /**
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/SelectModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/SelectModel.java
index 9cdbd5160..d02e9f76e 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/SelectModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/SelectModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Select;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Select;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/SetModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/SetModel.java
index 442689783..c3df7b2b4 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/SetModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/SetModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Set;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Set;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/SubmitModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/SubmitModel.java
index 4f44200de..2322e0a95 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/SubmitModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/SubmitModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Submit;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Submit;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/TabbedPanelModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/TabbedPanelModel.java
index 3d84e8afe..00b53c6fb 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/TabbedPanelModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/TabbedPanelModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.TabbedPanel;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.TabbedPanel;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/TagModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/TagModel.java
index b11b073a8..f669065ec 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/TagModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/TagModel.java
@@ -1,6 +1,6 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Component;
+import org.apache.struts.action2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import freemarker.template.SimpleNumber;
 import freemarker.template.TemplateModelException;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/TextAreaModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/TextAreaModel.java
index e79ca9e60..24f39c10b 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/TextAreaModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/TextAreaModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.TextArea;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.TextArea;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/TextFieldModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/TextFieldModel.java
index 8b96193e7..126eeda89 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/TextFieldModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/TextFieldModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.TextField;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.TextField;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/TextModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/TextModel.java
index 1f879a336..af36886f3 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/TextModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/TextModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Text;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Text;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/TokenModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/TokenModel.java
index 5c8880b5c..79754ef04 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/TokenModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/TokenModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Token;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Token;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/TreeModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/TreeModel.java
index a80769871..ed7877a0e 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/TreeModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/TreeModel.java
@@ -1,10 +1,10 @@
 /*
  * Copyright (c) 2005 Opensymphony. All Rights Reserved.
  */
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Tree;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Tree;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/TreeNodeModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/TreeNodeModel.java
index 18597073c..b25812740 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/TreeNodeModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/TreeNodeModel.java
@@ -1,11 +1,11 @@
 /*
  * Copyright (c) 2005 Opensymphony. All Rights Reserved.
  */
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.TreeNode;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.TreeNode;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/URLModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/URLModel.java
index c0aa93fb5..335e8c835 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/URLModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/URLModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.URL;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.URL;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/UpDownSelectModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/UpDownSelectModel.java
index 127f00e9f..621f61b84 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/UpDownSelectModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/UpDownSelectModel.java
@@ -1,13 +1,13 @@
 /*
  * Copyright (c) 2005 Opensymphony. All Rights Reserved.
  */
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.UpDownSelect;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.UpDownSelect;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 /**
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/WebTableModel.java b/src/java/org/apache/struts/action2/views/freemarker/tags/WebTableModel.java
index cbbeebf30..23a1c380c 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/WebTableModel.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/WebTableModel.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.table.WebTable;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.table.WebTable;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/WebWorkModels.java b/src/java/org/apache/struts/action2/views/freemarker/tags/WebWorkModels.java
index dac75d752..47d011ad0 100644
--- a/src/java/org/apache/struts/action2/views/freemarker/tags/WebWorkModels.java
+++ b/src/java/org/apache/struts/action2/views/freemarker/tags/WebWorkModels.java
@@ -1,4 +1,4 @@
-package com.opensymphony.webwork.views.freemarker.tags;
+package org.apache.struts.action2.views.freemarker.tags;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
diff --git a/src/java/org/apache/struts/action2/views/jasperreports/CompileReport.java b/src/java/org/apache/struts/action2/views/jasperreports/CompileReport.java
index ed0363756..096a227b4 100644
--- a/src/java/org/apache/struts/action2/views/jasperreports/CompileReport.java
+++ b/src/java/org/apache/struts/action2/views/jasperreports/CompileReport.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jasperreports;
+package org.apache.struts.action2.views.jasperreports;
 
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JasperCompileManager;
diff --git a/src/java/org/apache/struts/action2/views/jasperreports/JasperReportConstants.java b/src/java/org/apache/struts/action2/views/jasperreports/JasperReportConstants.java
index d29deb6d4..c84ddf820 100644
--- a/src/java/org/apache/struts/action2/views/jasperreports/JasperReportConstants.java
+++ b/src/java/org/apache/struts/action2/views/jasperreports/JasperReportConstants.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jasperreports;
+package org.apache.struts.action2.views.jasperreports;
 
 
 /**
diff --git a/src/java/org/apache/struts/action2/views/jasperreports/JasperReportsResult.java b/src/java/org/apache/struts/action2/views/jasperreports/JasperReportsResult.java
index f0190e970..3cc72b87d 100644
--- a/src/java/org/apache/struts/action2/views/jasperreports/JasperReportsResult.java
+++ b/src/java/org/apache/struts/action2/views/jasperreports/JasperReportsResult.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2005 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jasperreports;
+package org.apache.struts.action2.views.jasperreports;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -29,8 +29,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import com.opensymphony.util.TextUtils;
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.dispatcher.WebWorkResultSupport;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.dispatcher.WebWorkResultSupport;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
diff --git a/src/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackDataSource.java b/src/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackDataSource.java
index 6a28ffdce..8a46ab73e 100644
--- a/src/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackDataSource.java
+++ b/src/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackDataSource.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jasperreports;
+package org.apache.struts.action2.views.jasperreports;
 
-import com.opensymphony.webwork.util.MakeIterator;
+import org.apache.struts.action2.util.MakeIterator;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JRException;
diff --git a/src/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackShadowMap.java b/src/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackShadowMap.java
index d5c598157..f778f962c 100644
--- a/src/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackShadowMap.java
+++ b/src/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackShadowMap.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jasperreports;
+package org.apache.struts.action2.views.jasperreports;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
diff --git a/src/java/org/apache/struts/action2/views/jsp/ActionTag.java b/src/java/org/apache/struts/action2/views/jsp/ActionTag.java
index b28e36ff3..55fa0d098 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ActionTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ActionTag.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.components.ActionComponent;
-import com.opensymphony.webwork.components.Component;
+import org.apache.struts.action2.components.ActionComponent;
+import org.apache.struts.action2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/BeanTag.java b/src/java/org/apache/struts/action2/views/jsp/BeanTag.java
index de599a786..cea3a0233 100644
--- a/src/java/org/apache/struts/action2/views/jsp/BeanTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/BeanTag.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.components.Bean;
-import com.opensymphony.webwork.components.Component;
+import org.apache.struts.action2.components.Bean;
+import org.apache.struts.action2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/src/java/org/apache/struts/action2/views/jsp/ComponentTagSupport.java b/src/java/org/apache/struts/action2/views/jsp/ComponentTagSupport.java
index c8205b70e..f51096bfb 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ComponentTagSupport.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ComponentTagSupport.java
@@ -1,6 +1,6 @@
-package com.opensymphony.webwork.views.jsp;
+package org.apache.struts.action2.views.jsp;
 
-import com.opensymphony.webwork.components.Component;
+import org.apache.struts.action2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/DateTag.java b/src/java/org/apache/struts/action2/views/jsp/DateTag.java
index 6d4348aa7..411cab45a 100644
--- a/src/java/org/apache/struts/action2/views/jsp/DateTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/DateTag.java
@@ -1,10 +1,10 @@
-package com.opensymphony.webwork.views.jsp;
+package org.apache.struts.action2.views.jsp;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Date;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Date;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 /**
diff --git a/src/java/org/apache/struts/action2/views/jsp/ElseIfTag.java b/src/java/org/apache/struts/action2/views/jsp/ElseIfTag.java
index 9e5201ced..a38c29b43 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ElseIfTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ElseIfTag.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.components.Component;
-import com.opensymphony.webwork.components.ElseIf;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.ElseIf;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/ElseTag.java b/src/java/org/apache/struts/action2/views/jsp/ElseTag.java
index 442415be5..58de7b7fa 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ElseTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ElseTag.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.components.Component;
-import com.opensymphony.webwork.components.Else;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Else;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/I18nTag.java b/src/java/org/apache/struts/action2/views/jsp/I18nTag.java
index 9edc0cff2..18a2b63bb 100644
--- a/src/java/org/apache/struts/action2/views/jsp/I18nTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/I18nTag.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.components.Component;
-import com.opensymphony.webwork.components.I18n;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.I18n;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/IfTag.java b/src/java/org/apache/struts/action2/views/jsp/IfTag.java
index 56e32b8fd..8ab152a68 100644
--- a/src/java/org/apache/struts/action2/views/jsp/IfTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/IfTag.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.components.Component;
-import com.opensymphony.webwork.components.If;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.If;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/IncludeTag.java b/src/java/org/apache/struts/action2/views/jsp/IncludeTag.java
index 1bf9e800f..9bd028439 100644
--- a/src/java/org/apache/struts/action2/views/jsp/IncludeTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/IncludeTag.java
@@ -8,10 +8,10 @@
  * Distributable under Apache license.
  * See terms of license at opensource.org
  */
-package com.opensymphony.webwork.views.jsp;
+package org.apache.struts.action2.views.jsp;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Include;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Include;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/IteratorStatus.java b/src/java/org/apache/struts/action2/views/jsp/IteratorStatus.java
index 99e48ac1c..2d09d0d4e 100644
--- a/src/java/org/apache/struts/action2/views/jsp/IteratorStatus.java
+++ b/src/java/org/apache/struts/action2/views/jsp/IteratorStatus.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;
 
 
 /**
@@ -10,7 +10,7 @@ package com.opensymphony.webwork.views.jsp;
  * one can get information about the status of the iteration, such as
  * the size, current index, and whether any more items are available.
  *
- * @author Rickard Öberg (rickard@dreambean.com)
+ * @author Rickard �berg (rickard@dreambean.com)
  */
 public class IteratorStatus {
     protected StatusState state;
diff --git a/src/java/org/apache/struts/action2/views/jsp/IteratorTag.java b/src/java/org/apache/struts/action2/views/jsp/IteratorTag.java
index 578eb966c..0ee4a5d60 100644
--- a/src/java/org/apache/struts/action2/views/jsp/IteratorTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/IteratorTag.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.components.Component;
-import com.opensymphony.webwork.components.IteratorComponent;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.IteratorComponent;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/ParamTag.java b/src/java/org/apache/struts/action2/views/jsp/ParamTag.java
index e8ee20798..84cc95c36 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ParamTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ParamTag.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.components.Component;
-import com.opensymphony.webwork.components.Param;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Param;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/PropertyTag.java b/src/java/org/apache/struts/action2/views/jsp/PropertyTag.java
index ec61cb8d8..6cf4e13a7 100644
--- a/src/java/org/apache/struts/action2/views/jsp/PropertyTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/PropertyTag.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.components.Component;
-import com.opensymphony.webwork.components.Property;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Property;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/PushTag.java b/src/java/org/apache/struts/action2/views/jsp/PushTag.java
index 6564f2919..331f304a0 100644
--- a/src/java/org/apache/struts/action2/views/jsp/PushTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/PushTag.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.components.Component;
-import com.opensymphony.webwork.components.Push;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Push;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/SetTag.java b/src/java/org/apache/struts/action2/views/jsp/SetTag.java
index d80e794bb..87330551e 100644
--- a/src/java/org/apache/struts/action2/views/jsp/SetTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/SetTag.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.components.Component;
-import com.opensymphony.webwork.components.Set;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Set;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/TagUtils.java b/src/java/org/apache/struts/action2/views/jsp/TagUtils.java
index 717ea9e11..81642389c 100644
--- a/src/java/org/apache/struts/action2/views/jsp/TagUtils.java
+++ b/src/java/org/apache/struts/action2/views/jsp/TagUtils.java
@@ -2,18 +2,18 @@
  * 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.RequestUtils;
-import com.opensymphony.webwork.ServletActionContext;
-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 com.opensymphony.webwork.dispatcher.mapper.ActionMapper;
-import com.opensymphony.webwork.dispatcher.mapper.ActionMapperFactory;
-import com.opensymphony.webwork.dispatcher.mapper.ActionMapping;
-import com.opensymphony.webwork.util.AttributeMap;
+import org.apache.struts.action2.RequestUtils;
+import org.apache.struts.action2.ServletActionContext;
+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 org.apache.struts.action2.dispatcher.mapper.ActionMapper;
+import org.apache.struts.action2.dispatcher.mapper.ActionMapperFactory;
+import org.apache.struts.action2.dispatcher.mapper.ActionMapping;
+import org.apache.struts.action2.util.AttributeMap;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.util.OgnlValueStack;
diff --git a/src/java/org/apache/struts/action2/views/jsp/TextTag.java b/src/java/org/apache/struts/action2/views/jsp/TextTag.java
index 839e375d0..22fadfc09 100644
--- a/src/java/org/apache/struts/action2/views/jsp/TextTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/TextTag.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.components.Component;
-import com.opensymphony.webwork.components.Text;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Text;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/URLTag.java b/src/java/org/apache/struts/action2/views/jsp/URLTag.java
index 32e908248..a15912322 100644
--- a/src/java/org/apache/struts/action2/views/jsp/URLTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/URLTag.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.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.URL;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.URL;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/WebWorkBodyTagSupport.java b/src/java/org/apache/struts/action2/views/jsp/WebWorkBodyTagSupport.java
index 9eff4f807..baf217e05 100644
--- a/src/java/org/apache/struts/action2/views/jsp/WebWorkBodyTagSupport.java
+++ b/src/java/org/apache/struts/action2/views/jsp/WebWorkBodyTagSupport.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.util.FastByteArrayOutputStream;
-import com.opensymphony.webwork.views.util.ContextUtil;
+import org.apache.struts.action2.util.FastByteArrayOutputStream;
+import org.apache.struts.action2.views.util.ContextUtil;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.jsp.tagext.BodyTagSupport;
diff --git a/src/java/org/apache/struts/action2/views/jsp/iterator/AppendIteratorTag.java b/src/java/org/apache/struts/action2/views/jsp/iterator/AppendIteratorTag.java
index 33404ba24..609892675 100644
--- a/src/java/org/apache/struts/action2/views/jsp/iterator/AppendIteratorTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/iterator/AppendIteratorTag.java
@@ -2,11 +2,11 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.iterator;
+package org.apache.struts.action2.views.jsp.iterator;
 
-import com.opensymphony.webwork.components.AppendIterator;
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.views.jsp.ComponentTagSupport;
+import org.apache.struts.action2.components.AppendIterator;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.views.jsp.ComponentTagSupport;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/iterator/IteratorGeneratorTag.java b/src/java/org/apache/struts/action2/views/jsp/iterator/IteratorGeneratorTag.java
index b964f63c4..732f34af1 100644
--- a/src/java/org/apache/struts/action2/views/jsp/iterator/IteratorGeneratorTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/iterator/IteratorGeneratorTag.java
@@ -2,11 +2,11 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.iterator;
+package org.apache.struts.action2.views.jsp.iterator;
 
-import com.opensymphony.webwork.util.IteratorGenerator;
-import com.opensymphony.webwork.util.IteratorGenerator.Converter;
-import com.opensymphony.webwork.views.jsp.WebWorkBodyTagSupport;
+import org.apache.struts.action2.util.IteratorGenerator;
+import org.apache.struts.action2.util.IteratorGenerator.Converter;
+import org.apache.struts.action2.views.jsp.WebWorkBodyTagSupport;
 
 import javax.servlet.jsp.JspException;
 
@@ -105,7 +105,7 @@ import org.apache.commons.logging.LogFactory;
  * this converter, it simply add "converter-" to each entries.
  * <!-- END SNIPPET: example -->
  *
- * @see com.opensymphony.webwork.util.IteratorGenerator
+ * @see org.apache.struts.action2.util.IteratorGenerator
  * @author Rickard �berg (rickard@dreambean.com)
  * @author tm_jee ( tm_jee(at)yahoo.co.uk )
  * @version $Revision: 1.14 $
@@ -153,7 +153,7 @@ public class IteratorGeneratorTag extends WebWorkBodyTagSupport {
     }
 
     /**
-     * @ww.tagattribute required="false" type="com.opensymphony.webwork.util.IteratorGenerator.Converter"
+     * @ww.tagattribute required="false" type="org.apache.struts.action2.util.IteratorGenerator.Converter"
      * description="the converter to convert the String entry parsed from <i>val</i> into an object"
      */
     public void setConverter(String aConverter) {
diff --git a/src/java/org/apache/struts/action2/views/jsp/iterator/MergeIteratorTag.java b/src/java/org/apache/struts/action2/views/jsp/iterator/MergeIteratorTag.java
index 4e38dd687..420182cf6 100644
--- a/src/java/org/apache/struts/action2/views/jsp/iterator/MergeIteratorTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/iterator/MergeIteratorTag.java
@@ -2,11 +2,11 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.iterator;
+package org.apache.struts.action2.views.jsp.iterator;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.MergeIterator;
-import com.opensymphony.webwork.views.jsp.ComponentTagSupport;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.MergeIterator;
+import org.apache.struts.action2.views.jsp.ComponentTagSupport;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
@@ -20,7 +20,7 @@ import javax.servlet.http.HttpServletResponse;
  * @author Rickard �berg (rickard@dreambean.com)
  * @author tm_jee ( tm_jee (at) yahoo.co.uk )
  * @see MergeIterator
- * @see com.opensymphony.webwork.util.MergeIteratorFilter
+ * @see org.apache.struts.action2.util.MergeIteratorFilter
  */
 public class MergeIteratorTag extends ComponentTagSupport {
 
diff --git a/src/java/org/apache/struts/action2/views/jsp/iterator/SortIteratorTag.java b/src/java/org/apache/struts/action2/views/jsp/iterator/SortIteratorTag.java
index 23be267f8..59743c754 100644
--- a/src/java/org/apache/struts/action2/views/jsp/iterator/SortIteratorTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/iterator/SortIteratorTag.java
@@ -2,11 +2,11 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.iterator;
+package org.apache.struts.action2.views.jsp.iterator;
 
-import com.opensymphony.webwork.util.MakeIterator;
-import com.opensymphony.webwork.util.SortIteratorFilter;
-import com.opensymphony.webwork.views.jsp.WebWorkBodyTagSupport;
+import org.apache.struts.action2.util.MakeIterator;
+import org.apache.struts.action2.util.SortIteratorFilter;
+import org.apache.struts.action2.views.jsp.WebWorkBodyTagSupport;
 
 import javax.servlet.jsp.JspException;
 
@@ -63,7 +63,7 @@ import java.util.Comparator;
  * </pre>
  *
  *
- * @see com.opensymphony.webwork.util.SortIteratorFilter
+ * @see org.apache.struts.action2.util.SortIteratorFilter
  * @author Rickard Oberg (rickard@dreambean.com)
  * @author tm_jee (tm_jee(at)yahoo.co.uk)
  *
diff --git a/src/java/org/apache/struts/action2/views/jsp/iterator/SubsetIteratorTag.java b/src/java/org/apache/struts/action2/views/jsp/iterator/SubsetIteratorTag.java
index 4441b3753..53985e7b9 100644
--- a/src/java/org/apache/struts/action2/views/jsp/iterator/SubsetIteratorTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/iterator/SubsetIteratorTag.java
@@ -2,11 +2,11 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.iterator;
+package org.apache.struts.action2.views.jsp.iterator;
 
-import com.opensymphony.webwork.util.SubsetIteratorFilter;
-import com.opensymphony.webwork.util.SubsetIteratorFilter.Decider;
-import com.opensymphony.webwork.views.jsp.WebWorkBodyTagSupport;
+import org.apache.struts.action2.util.SubsetIteratorFilter;
+import org.apache.struts.action2.util.SubsetIteratorFilter.Decider;
+import org.apache.struts.action2.views.jsp.WebWorkBodyTagSupport;
 
 import javax.servlet.jsp.JspException;
 
@@ -19,7 +19,7 @@ import org.apache.commons.logging.LogFactory;
  * <b>NOTE: JSP-TAG</b>
  * 
  * <p>A tag that takes an iterator and outputs a subset of it. It delegates to
- * {@link com.opensymphony.webwork.util.SubsetIteratorFilter} internally to
+ * {@link org.apache.struts.action2.util.SubsetIteratorFilter} internally to
  * perform the subset functionality.</p>
  * <!-- END SNIPPET: javadoc -->
  *
@@ -171,7 +171,7 @@ public class SubsetIteratorTag extends WebWorkBodyTagSupport {
     }
 
     /**
-     * @ww.tagattribute required="false" type="com.opensymphony.webwork.util.SubsetIteratorFilter.Decider"
+     * @ww.tagattribute required="false" type="org.apache.struts.action2.util.SubsetIteratorFilter.Decider"
      * description="Extension to plug-in a decider to determine if that particular entry is to be included in the resulting subset iterator"
      */
     public void setDecider(String decider) {
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/AbstractClosingTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/AbstractClosingTag.java
index 85f44d227..c5b2d53f2 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/AbstractClosingTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/AbstractClosingTag.java
@@ -1,6 +1,6 @@
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.ClosingUIBean;
+import org.apache.struts.action2.components.ClosingUIBean;
 
 /**
  * @author Patrick Lightbody (plightbo at gmail dot com)
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/AbstractDoubleListTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/AbstractDoubleListTag.java
index 377b2c468..3efe53823 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/AbstractDoubleListTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/AbstractDoubleListTag.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.components.DoubleListUIBean;
-import com.opensymphony.webwork.components.DoubleSelect;
+import org.apache.struts.action2.components.DoubleListUIBean;
+import org.apache.struts.action2.components.DoubleSelect;
 
 
 /**
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/AbstractListTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/AbstractListTag.java
index c0870c709..aecdcdf68 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/AbstractListTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/AbstractListTag.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2005 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.ListUIBean;
+import org.apache.struts.action2.components.ListUIBean;
 
 /**
  * @author Matt Ho <a href="mailto:matt@enginegreen.com">&lt;matt@enginegreen.com&gt;</a>
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/AbstractRequiredListTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/AbstractRequiredListTag.java
index 2628d942f..026288403 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/AbstractRequiredListTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/AbstractRequiredListTag.java
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2005 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.ListUIBean;
+import org.apache.struts.action2.components.ListUIBean;
 
 /**
  * 
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/AbstractRichtexteditorResult.java b/src/java/org/apache/struts/action2/views/jsp/ui/AbstractRichtexteditorResult.java
index 9df232b1c..16e7bf6c6 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/AbstractRichtexteditorResult.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/AbstractRichtexteditorResult.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.io.OutputStream;
 import java.io.StringWriter;
@@ -20,10 +20,10 @@ import javax.xml.transform.stream.StreamResult;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-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;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.Result;
 
@@ -39,13 +39,13 @@ import com.opensymphony.xwork.Result;
  * <pre>
  *  &lt;!-- Results necessary when using 'browse server' and 'upload' feature of Richtexteditor --&gt;
  *  &lt;result-type name="richtexteditorGetFolders" 
- *                  class="com.opensymphony.webwork.views.jsp.ui.RichtexteditorGetFoldersResult" /&gt;
+ *                  class="org.apache.struts.action2.views.jsp.ui.RichtexteditorGetFoldersResult" /&gt;
  *  &lt;result-type name="richtexteditorGetFoldersAndFiles" 
- *                  class="com.opensymphony.webwork.views.jsp.ui.RichtexteditorGetFoldersAndFilesResult" /&gt;
+ *                  class="org.apache.struts.action2.views.jsp.ui.RichtexteditorGetFoldersAndFilesResult" /&gt;
  *  &lt;result-type name="richtexteditorCreateFolder" 
- *                  class="com.opensymphony.webwork.views.jsp.ui.RichtexteditorCreateFolderResult" /&gt;
+ *                  class="org.apache.struts.action2.views.jsp.ui.RichtexteditorCreateFolderResult" /&gt;
  *  &lt;result-type name="richtexteditorFileUpload" 
- *                  class="com.opensymphony.webwork.views.jsp.ui.RichtexteditorFileUploadResult" /&gt;
+ *                  class="org.apache.struts.action2.views.jsp.ui.RichtexteditorFileUploadResult" /&gt;
  * </pre>
  * 
  * <!-- END SNIPPET: javadoc -->
@@ -200,7 +200,7 @@ public abstract class AbstractRichtexteditorResult implements Result {
 	 * 
 	 * @param invocation
 	 * @return The server path calculated from AbstractRichtexteditoConnector
-	 * @see com.opensymphony.webwork.components.AbstractRichtexteditorConnector#calculateServerPath(String, String, String)
+	 * @see org.apache.struts.action2.components.AbstractRichtexteditorConnector#calculateServerPath(String, String, String)
 	 */
 	protected String getServerPath(ActionInvocation invocation) {
 		return (String) invocation.getStack().getContext().get("__richtexteditorServerPath");
@@ -213,7 +213,7 @@ public abstract class AbstractRichtexteditorResult implements Result {
 	 * 
 	 * @param invocation
 	 * @return The <code>Folder[]</code> computed from AbstractRichtexteditorConnector
-	 * @see com.opensymphony.webwork.components.AbstractRichtexteditorConnector#getFolders(String, String)
+	 * @see org.apache.struts.action2.components.AbstractRichtexteditorConnector#getFolders(String, String)
 	 */
 	protected Folder[] richtexteditorFolders(ActionInvocation invocation) {
 		return (Folder[]) invocation.getStack().getContext().get("__richtexteditorGetFolders");
@@ -226,7 +226,7 @@ public abstract class AbstractRichtexteditorResult implements Result {
 	 * 
 	 * @param invocation
 	 * @return The <code>FoldersAndFiles</code> computed from AbstractRichtexteditorConnector
-	 * @see com.opensymphony.webwork.components.AbstractRichtexteditorConnector#getFoldersAndFiles(String, String)
+	 * @see org.apache.struts.action2.components.AbstractRichtexteditorConnector#getFoldersAndFiles(String, String)
 	 */
 	protected FoldersAndFiles richtexteditorFoldersAndFiles(ActionInvocation invocation) {
 		return (FoldersAndFiles) invocation.getStack().getContext().get("__richtexteditorGetFoldersAndFiles");
@@ -240,7 +240,7 @@ public abstract class AbstractRichtexteditorResult implements Result {
 	 * 
 	 * @param invocation
 	 * @return The <code>CreateFolderResult</code> computed from AbstractRichtexteditorConnector
-	 * @see com.opensymphony.webwork.components.AbstractRichtexteditorConnector#createFolder(String, String, String)
+	 * @see org.apache.struts.action2.components.AbstractRichtexteditorConnector#createFolder(String, String, String)
 	 */
 	protected CreateFolderResult richtexteditorCreateFolderResult(ActionInvocation invocation) {
 		return (CreateFolderResult) invocation.getStack().getContext().get("__richtexteditorCreateFolder");
@@ -253,7 +253,7 @@ public abstract class AbstractRichtexteditorResult implements Result {
 	 * 
 	 * @param invocation
 	 * @return The <code>FileUploadResult</code> computed from AbstractRichtexteditorConnector
-	 * @see com.opensymphony.webwork.components.AbstractRichtexteditorConnector#fileUpload(String, String, String, String, java.io.File)
+	 * @see org.apache.struts.action2.components.AbstractRichtexteditorConnector#fileUpload(String, String, String, String, java.io.File)
 	 */
 	protected FileUploadResult richtexteditorFileUploadResult(ActionInvocation invocation) {
 		return (FileUploadResult) invocation.getStack().getContext().get("__richtexteditorFileUpload");
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/AbstractUITag.java b/src/java/org/apache/struts/action2/views/jsp/ui/AbstractUITag.java
index 3c643cb3d..22725c6fb 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/AbstractUITag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/AbstractUITag.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.components.UIBean;
-import com.opensymphony.webwork.views.jsp.ComponentTagSupport;
+import org.apache.struts.action2.components.UIBean;
+import org.apache.struts.action2.views.jsp.ComponentTagSupport;
 
 
 /**
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/ActionErrorTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/ActionErrorTag.java
index ca95a0b2b..d9f5f6769 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/ActionErrorTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/ActionErrorTag.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 javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.opensymphony.webwork.components.ActionError;
-import com.opensymphony.webwork.components.Component;
+import org.apache.struts.action2.components.ActionError;
+import org.apache.struts.action2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 /**
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/ActionMessageTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/ActionMessageTag.java
index 5039ed66e..a88d42fe8 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/ActionMessageTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/ActionMessageTag.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 javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.opensymphony.webwork.components.ActionMessage;
-import com.opensymphony.webwork.components.Component;
+import org.apache.struts.action2.components.ActionMessage;
+import org.apache.struts.action2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 /**
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/AnchorTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/AnchorTag.java
index df39becb4..3dac7ef82 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/AnchorTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/AnchorTag.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Anchor;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Anchor;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/CheckboxListTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/CheckboxListTag.java
index 6022e5bc6..c7640e730 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/CheckboxListTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/CheckboxListTag.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.components.CheckboxList;
-import com.opensymphony.webwork.components.Component;
+import org.apache.struts.action2.components.CheckboxList;
+import org.apache.struts.action2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/CheckboxTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/CheckboxTag.java
index 92032b220..21189ea3a 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/CheckboxTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/CheckboxTag.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.components.Checkbox;
-import com.opensymphony.webwork.components.Component;
+import org.apache.struts.action2.components.Checkbox;
+import org.apache.struts.action2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/ComboBoxTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/ComboBoxTag.java
index b010a30f2..944e36cf3 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/ComboBoxTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/ComboBoxTag.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.components.ComboBox;
-import com.opensymphony.webwork.components.Component;
+import org.apache.struts.action2.components.ComboBox;
+import org.apache.struts.action2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/ComponentTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/ComponentTag.java
index 84cbcbf19..37faf9d49 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/ComponentTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/ComponentTag.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.components.Component;
-import com.opensymphony.webwork.components.GenericUIBean;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.GenericUIBean;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/DatePickerTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/DatePickerTag.java
index 30ca1575e..ff434e5fa 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/DatePickerTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/DatePickerTag.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.DatePicker;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.DatePicker;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/DebugTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/DebugTag.java
index dc14a6107..c142bb83d 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/DebugTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/DebugTag.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.components.Component;
-import com.opensymphony.webwork.components.Debug;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Debug;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/DivTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/DivTag.java
index 37b746c72..c9c4a8a07 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/DivTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/DivTag.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Div;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Div;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/DoubleSelectTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/DoubleSelectTag.java
index 34e3d299e..82147daa2 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/DoubleSelectTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/DoubleSelectTag.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.components.Component;
-import com.opensymphony.webwork.components.DoubleSelect;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.DoubleSelect;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/FieldErrorTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/FieldErrorTag.java
index f97e7c671..43668dd20 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/FieldErrorTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/FieldErrorTag.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 javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.FieldError;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.FieldError;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 /**
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/FileTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/FileTag.java
index 9ae5b8c05..fb0b1e406 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/FileTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/FileTag.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.components.Component;
-import com.opensymphony.webwork.components.File;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.File;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/FormTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/FormTag.java
index ae4468d37..290c65b1a 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/FormTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/FormTag.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 javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Form;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Form;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/HeadTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/HeadTag.java
index 116d607ae..cb3c0ad6b 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/HeadTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/HeadTag.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.components.Component;
-import com.opensymphony.webwork.components.Head;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Head;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/HiddenTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/HiddenTag.java
index 87ae37cbd..09bace5b5 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/HiddenTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/HiddenTag.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.components.Component;
-import com.opensymphony.webwork.components.Hidden;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Hidden;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/LabelTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/LabelTag.java
index 903e14c51..32b98e0e5 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/LabelTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/LabelTag.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.components.Component;
-import com.opensymphony.webwork.components.Label;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Label;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/OgnlTool.java b/src/java/org/apache/struts/action2/views/jsp/ui/OgnlTool.java
index af96eb242..2097d4b6f 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/OgnlTool.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/OgnlTool.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 com.opensymphony.xwork.util.OgnlUtil;
 import ognl.Ognl;
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/OptionTransferSelectTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/OptionTransferSelectTag.java
index 9bbc69b5c..dc2c1b261 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/OptionTransferSelectTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/OptionTransferSelectTag.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 javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.OptionTransferSelect;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.OptionTransferSelect;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 /**
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/PanelTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/PanelTag.java
index 68b930979..43d9bcabc 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/PanelTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/PanelTag.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Panel;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Panel;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/PasswordTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/PasswordTag.java
index 5e7bfad8d..af1d6dc83 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/PasswordTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/PasswordTag.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.components.Component;
-import com.opensymphony.webwork.components.Password;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Password;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/RadioTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/RadioTag.java
index 7f5d05f28..10a71eec4 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/RadioTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/RadioTag.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.components.Component;
-import com.opensymphony.webwork.components.Radio;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Radio;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/ResetTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/ResetTag.java
index dd235f682..23caf212a 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/ResetTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/ResetTag.java
@@ -2,17 +2,17 @@
  * 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.components.Component;
-import com.opensymphony.webwork.components.Reset;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Reset;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
- * @see com.opensymphony.webwork.components.Reset
+ * @see org.apache.struts.action2.components.Reset
  */
 public class ResetTag extends AbstractUITag {
     protected String action;
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/RichTextEditorTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/RichTextEditorTag.java
index ab3b0c576..bf0420ad1 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/RichTextEditorTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/RichTextEditorTag.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 javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.RichTextEditor;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.RichTextEditor;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 /**
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorCreateFolderResult.java b/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorCreateFolderResult.java
index 38f262519..88128592d 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorCreateFolderResult.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorCreateFolderResult.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.io.OutputStream;
 
@@ -13,8 +13,8 @@ import org.apache.commons.logging.LogFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.components.AbstractRichtexteditorConnector.CreateFolderResult;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.components.AbstractRichtexteditorConnector.CreateFolderResult;
 import com.opensymphony.xwork.ActionInvocation;
 
 
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResult.java b/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResult.java
index 7b15edcdf..9bf015714 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResult.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResult.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.io.PrintWriter;
 
@@ -11,8 +11,8 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.components.AbstractRichtexteditorConnector.FileUploadResult;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.components.AbstractRichtexteditorConnector.FileUploadResult;
 import com.opensymphony.xwork.ActionInvocation;
 
 /**
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersAndFilesResult.java b/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersAndFilesResult.java
index 243ebdf15..5930881c1 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersAndFilesResult.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersAndFilesResult.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.io.OutputStream;
 
@@ -13,10 +13,10 @@ import org.apache.commons.logging.LogFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.components.AbstractRichtexteditorConnector.File;
-import com.opensymphony.webwork.components.AbstractRichtexteditorConnector.Folder;
-import com.opensymphony.webwork.components.AbstractRichtexteditorConnector.FoldersAndFiles;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.components.AbstractRichtexteditorConnector.File;
+import org.apache.struts.action2.components.AbstractRichtexteditorConnector.Folder;
+import org.apache.struts.action2.components.AbstractRichtexteditorConnector.FoldersAndFiles;
 import com.opensymphony.xwork.ActionInvocation;
 
 /**
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersResult.java b/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersResult.java
index 80f624aab..391c653aa 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersResult.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersResult.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.io.OutputStream;
 
@@ -13,8 +13,8 @@ import org.apache.commons.logging.LogFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.components.AbstractRichtexteditorConnector.Folder;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.components.AbstractRichtexteditorConnector.Folder;
 import com.opensymphony.xwork.ActionInvocation;
 
 /**
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/SelectTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/SelectTag.java
index c0bed957a..62dd0bb5c 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/SelectTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/SelectTag.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.components.Component;
-import com.opensymphony.webwork.components.Select;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Select;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/SubmitTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/SubmitTag.java
index 493f2a4d3..ca1f3f356 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/SubmitTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/SubmitTag.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.components.Component;
-import com.opensymphony.webwork.components.Submit;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Submit;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/TabbedPaneTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/TabbedPaneTag.java
index d3bf89250..0ba9e5968 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/TabbedPaneTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/TabbedPaneTag.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.util.TabbedPane;
+import org.apache.struts.action2.util.TabbedPane;
 
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.JspTagException;
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/TabbedPanelTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/TabbedPanelTag.java
index e7c1c36fe..1ce44cb54 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/TabbedPanelTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/TabbedPanelTag.java
@@ -1,8 +1,8 @@
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Panel;
-import com.opensymphony.webwork.components.TabbedPanel;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Panel;
+import org.apache.struts.action2.components.TabbedPanel;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/TextFieldTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/TextFieldTag.java
index 90bc09571..5e6a5e824 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/TextFieldTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/TextFieldTag.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.components.Component;
-import com.opensymphony.webwork.components.TextField;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.TextField;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/TextareaTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/TextareaTag.java
index 0994f6a15..7a0bde23d 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/TextareaTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/TextareaTag.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.components.Component;
-import com.opensymphony.webwork.components.TextArea;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.TextArea;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/TokenTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/TokenTag.java
index bde56fd06..44eddff61 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/TokenTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/TokenTag.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.components.Component;
-import com.opensymphony.webwork.components.Token;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Token;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/TreeNodeTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/TreeNodeTag.java
index 3fb11404c..6caa34847 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/TreeNodeTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/TreeNodeTag.java
@@ -1,10 +1,10 @@
 /*
  * Copyright (c) 2005 Opensymphony. All Rights Reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.TreeNode;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.TreeNode;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/TreeTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/TreeTag.java
index decd7385b..5775ffd7b 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/TreeTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/TreeTag.java
@@ -1,10 +1,10 @@
 /*
  * Copyright (c) 2005 Opensymphony. All Rights Reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui;
+package org.apache.struts.action2.views.jsp.ui;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Tree;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Tree;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/UpDownSelectTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/UpDownSelectTag.java
index 99c541f01..073cb64e7 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/UpDownSelectTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/UpDownSelectTag.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 javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.UpDownSelect;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.UpDownSelect;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 /**
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/table/WebTableTag.java b/src/java/org/apache/struts/action2/views/jsp/ui/table/WebTableTag.java
index 526c7c499..0548f32fc 100644
--- a/src/java/org/apache/struts/action2/views/jsp/ui/table/WebTableTag.java
+++ b/src/java/org/apache/struts/action2/views/jsp/ui/table/WebTableTag.java
@@ -2,11 +2,11 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.jsp.ui.table;
+package org.apache.struts.action2.views.jsp.ui.table;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.table.WebTable;
-import com.opensymphony.webwork.views.jsp.ui.ComponentTag;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.table.WebTable;
+import org.apache.struts.action2.views.jsp.ui.ComponentTag;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/tiles/TilesResult.java b/src/java/org/apache/struts/action2/views/tiles/TilesResult.java
index 0beac3f5a..5f3f2693b 100644
--- a/src/java/org/apache/struts/action2/views/tiles/TilesResult.java
+++ b/src/java/org/apache/struts/action2/views/tiles/TilesResult.java
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.tiles;
+package org.apache.struts.action2.views.tiles;
 
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.dispatcher.ServletDispatcherResult;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.dispatcher.ServletDispatcherResult;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.LocaleProvider;
 import org.apache.commons.logging.Log;
@@ -52,7 +52,7 @@ import java.util.Locale;
  * Making this result type the default for the current package.
  *
  * <result-types>
- *      <result-type name="tiles" class="com.opensymphony.webwork.views.tiles.TilesResult" default="true" />
+ *      <result-type name="tiles" class="org.apache.struts.action2.views.tiles.TilesResult" default="true" />
  * </result-types>
  * <!-- END SNIPPET: packageconfig -->
  *
diff --git a/src/java/org/apache/struts/action2/views/util/ContextUtil.java b/src/java/org/apache/struts/action2/views/util/ContextUtil.java
index 12dd2c411..738bfb6e8 100644
--- a/src/java/org/apache/struts/action2/views/util/ContextUtil.java
+++ b/src/java/org/apache/struts/action2/views/util/ContextUtil.java
@@ -2,15 +2,15 @@
  * 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.xwork.util.OgnlValueStack;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.ActionContext;
-import com.opensymphony.webwork.views.jsp.ui.OgnlTool;
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.util.WebWorkUtil;
-import com.opensymphony.webwork.WebWorkConstants;
+import org.apache.struts.action2.views.jsp.ui.OgnlTool;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.util.WebWorkUtil;
+import org.apache.struts.action2.WebWorkConstants;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/src/java/org/apache/struts/action2/views/util/ResourceUtil.java b/src/java/org/apache/struts/action2/views/util/ResourceUtil.java
index 24b4383b1..e5bb69964 100644
--- a/src/java/org/apache/struts/action2/views/util/ResourceUtil.java
+++ b/src/java/org/apache/struts/action2/views/util/ResourceUtil.java
@@ -1,8 +1,8 @@
-package com.opensymphony.webwork.views.util;
+package org.apache.struts.action2.views.util;
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.opensymphony.webwork.RequestUtils;
+import org.apache.struts.action2.RequestUtils;
 
 /**
  * User: plightbo
diff --git a/src/java/org/apache/struts/action2/views/util/TextUtil.java b/src/java/org/apache/struts/action2/views/util/TextUtil.java
index ca6e9247a..099bd21c0 100644
--- a/src/java/org/apache/struts/action2/views/util/TextUtil.java
+++ b/src/java/org/apache/struts/action2/views/util/TextUtil.java
@@ -8,7 +8,7 @@
 * Distributable under Apache license.
 * See terms of license at opensource.org
 */
-package com.opensymphony.webwork.views.util;
+package org.apache.struts.action2.views.util;
 
 
 /**
@@ -154,18 +154,18 @@ public class TextUtil {
         addMapping(0xa1, "&iexcl;", strings); //
         addMapping(0xa2, "&cent;", strings); //
         addMapping(0xa3, "&pound;", strings); //
-        addMapping(0xa9, "&copy;", strings); // ©
-        addMapping(0xae, "&reg;", strings); // ®
+        addMapping(0xa9, "&copy;", strings); // �
+        addMapping(0xae, "&reg;", strings); // �
         addMapping(0xbf, "&iquest;", strings); //
 
-        addMapping(0xc0, "&Agrave;", strings); // À
-        addMapping(0xc1, "&Aacute;", strings); // Á
-        addMapping(0xc2, "&Acirc;", strings); // Â
-        addMapping(0xc3, "&Atilde;", strings); // Â
-        addMapping(0xc4, "&Auml;", strings); // Ä
-        addMapping(0xc5, "&Aring;", strings); // Å
-        addMapping(0xc6, "&AElig;", strings); // Æ
-        addMapping(0xc7, "&Ccedil;", strings); // Ç
+        addMapping(0xc0, "&Agrave;", strings); // �
+        addMapping(0xc1, "&Aacute;", strings); // �
+        addMapping(0xc2, "&Acirc;", strings); // �
+        addMapping(0xc3, "&Atilde;", strings); // �
+        addMapping(0xc4, "&Auml;", strings); // �
+        addMapping(0xc5, "&Aring;", strings); // �
+        addMapping(0xc6, "&AElig;", strings); // �
+        addMapping(0xc7, "&Ccedil;", strings); // �
         addMapping(0xc8, "&Egrave;", strings); //
         addMapping(0xc9, "&Eacute;", strings); //
         addMapping(0xca, "&Ecirc;", strings); //
@@ -181,7 +181,7 @@ public class TextUtil {
         addMapping(0xd3, "&Oacute;", strings); //
         addMapping(0xd4, "&Ocirc;", strings); //
         addMapping(0xd5, "&Otilde;", strings); //
-        addMapping(0xd6, "&Ouml;", strings); // Ö
+        addMapping(0xd6, "&Ouml;", strings); // �
         addMapping(0xd7, "&times;", strings); //
         addMapping(0xd8, "&Oslash;", strings); //
         addMapping(0xd9, "&Ugrave;", strings); //
@@ -196,8 +196,8 @@ public class TextUtil {
         addMapping(0xe1, "&aacute;", strings); //
         addMapping(0xe2, "&acirc;", strings); //
         addMapping(0xe3, "&atilde;", strings); //
-        addMapping(0xe4, "&auml;", strings); // ä
-        addMapping(0xe5, "&aring;", strings); // å
+        addMapping(0xe4, "&auml;", strings); // �
+        addMapping(0xe5, "&aring;", strings); // �
         addMapping(0xe6, "&aelig;", strings); //
         addMapping(0xe7, "&ccedil;", strings); //
         addMapping(0xe8, "&egrave;", strings); //
@@ -215,7 +215,7 @@ public class TextUtil {
         addMapping(0xf3, "&oacute;", strings); //
         addMapping(0xf4, "&ocirc;", strings); //
         addMapping(0xf5, "&otilde;", strings); //
-        addMapping(0xf6, "&ouml;", strings); // ö
+        addMapping(0xf6, "&ouml;", strings); // �
         addMapping(0xf7, "&divide;", strings); //
         addMapping(0xf8, "&oslash;", strings); //
         addMapping(0xf9, "&ugrave;", strings); //
diff --git a/src/java/org/apache/struts/action2/views/util/UrlHelper.java b/src/java/org/apache/struts/action2/views/util/UrlHelper.java
index 0c6cdcbf2..d70bce131 100644
--- a/src/java/org/apache/struts/action2/views/util/UrlHelper.java
+++ b/src/java/org/apache/struts/action2/views/util/UrlHelper.java
@@ -1,8 +1,8 @@
-package com.opensymphony.webwork.views.util;
+package org.apache.struts.action2.views.util;
 
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.WebWorkConstants;
-import com.opensymphony.webwork.config.Configuration;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.config.Configuration;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import com.opensymphony.xwork.util.TextParseUtil;
diff --git a/src/java/org/apache/struts/action2/views/velocity/VelocityManager.java b/src/java/org/apache/struts/action2/views/velocity/VelocityManager.java
index 7a3c15570..eb076c361 100644
--- a/src/java/org/apache/struts/action2/views/velocity/VelocityManager.java
+++ b/src/java/org/apache/struts/action2/views/velocity/VelocityManager.java
@@ -2,15 +2,15 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.velocity;
+package org.apache.struts.action2.views.velocity;
 
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.WebWorkConstants;
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.util.VelocityWebWorkUtil;
-import com.opensymphony.webwork.views.jsp.ui.OgnlTool;
-import com.opensymphony.webwork.views.util.ContextUtil;
-import com.opensymphony.webwork.views.velocity.components.*;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.util.VelocityWebWorkUtil;
+import org.apache.struts.action2.views.jsp.ui.OgnlTool;
+import org.apache.struts.action2.views.util.ContextUtil;
+import org.apache.struts.action2.views.velocity.components.*;
 import com.opensymphony.xwork.ObjectFactory;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import org.apache.commons.logging.Log;
@@ -118,7 +118,7 @@ public class VelocityManager {
      * <li><strong>res</strong> - the current HttpServletResponse</li>
      * <li><strong>stack</strong> - the current {@link OgnlValueStack}</li>
      * <li><strong>ognl</strong> - an {@link OgnlTool}</li>
-     * <li><strong>webwork</strong> - an instance of {@link com.opensymphony.webwork.util.WebWorkUtil}</li>
+     * <li><strong>webwork</strong> - an instance of {@link org.apache.struts.action2.util.WebWorkUtil}</li>
      * <li><strong>action</strong> - the current WebWork action</li>
      * </ul>
      *
@@ -403,7 +403,7 @@ public class VelocityManager {
      *  resource.loader = file, class
      *  file.resource.loader.path = real path of webapp
      *  class.resource.loader.description = Velocity Classpath Resource Loader
-     *  class.resource.loader.class = com.opensymphony.webwork.views.velocity.WebWorkResourceLoader
+     *  class.resource.loader.class = org.apache.struts.action2.views.velocity.WebWorkResourceLoader
      * </pre>
      * <p/>
      * this default configuration can be overridden by specifying a webwork.velocity.configfile property in the
@@ -499,7 +499,7 @@ public class VelocityManager {
          * Matt Ho - Mon Mar 17 00:21:46 PST 2003
          */
         p.setProperty("wwclass.resource.loader.description", "Velocity Classpath Resource Loader");
-        p.setProperty("wwclass.resource.loader.class", "com.opensymphony.webwork.views.velocity.WebWorkResourceLoader");
+        p.setProperty("wwclass.resource.loader.class", "org.apache.struts.action2.views.velocity.WebWorkResourceLoader");
         p.setProperty("wwclass.resource.loader.modificationCheckInterval", "2");
         p.setProperty("wwclass.resource.loader.cache", "true");
 
diff --git a/src/java/org/apache/struts/action2/views/velocity/WebWorkResourceLoader.java b/src/java/org/apache/struts/action2/views/velocity/WebWorkResourceLoader.java
index 6d1a2ba6b..55e46b722 100644
--- a/src/java/org/apache/struts/action2/views/velocity/WebWorkResourceLoader.java
+++ b/src/java/org/apache/struts/action2/views/velocity/WebWorkResourceLoader.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.velocity;
+package org.apache.struts.action2.views.velocity;
 
-import com.opensymphony.webwork.util.ClassLoaderUtils;
+import org.apache.struts.action2.util.ClassLoaderUtils;
 import org.apache.velocity.exception.ResourceNotFoundException;
 import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
 
diff --git a/src/java/org/apache/struts/action2/views/velocity/WebWorkVelocityContext.java b/src/java/org/apache/struts/action2/views/velocity/WebWorkVelocityContext.java
index 32cfa0f30..a24f34419 100644
--- a/src/java/org/apache/struts/action2/views/velocity/WebWorkVelocityContext.java
+++ b/src/java/org/apache/struts/action2/views/velocity/WebWorkVelocityContext.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.velocity;
+package org.apache.struts.action2.views.velocity;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 import org.apache.velocity.VelocityContext;
diff --git a/src/java/org/apache/struts/action2/views/velocity/WebWorkVelocityServlet.java b/src/java/org/apache/struts/action2/views/velocity/WebWorkVelocityServlet.java
index 71b64fa5b..6d97f29b9 100644
--- a/src/java/org/apache/struts/action2/views/velocity/WebWorkVelocityServlet.java
+++ b/src/java/org/apache/struts/action2/views/velocity/WebWorkVelocityServlet.java
@@ -2,13 +2,13 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.velocity;
+package org.apache.struts.action2.views.velocity;
 
-import com.opensymphony.webwork.RequestUtils;
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.WebWorkConstants;
-import com.opensymphony.webwork.config.Configuration;
-import com.opensymphony.webwork.views.util.ContextUtil;
+import org.apache.struts.action2.RequestUtils;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.views.util.ContextUtil;
 import com.opensymphony.xwork.ActionContext;
 import org.apache.velocity.Template;
 import org.apache.velocity.context.Context;
@@ -34,7 +34,7 @@ import java.util.Properties;
 /**
  * @author $Author: the_mindstorm $
  * @version $Revision: 1.20 $
- * @deprecated please use {@link com.opensymphony.webwork.dispatcher.VelocityResult} instead of direct access
+ * @deprecated please use {@link org.apache.struts.action2.dispatcher.VelocityResult} instead of direct access
  */
 public class WebWorkVelocityServlet extends VelocityServlet {
     private VelocityManager velocityManager;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/AbstractDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/AbstractDirective.java
index 3ddec092c..cffac7c83 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/AbstractDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/AbstractDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.components.Component;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import org.apache.velocity.context.InternalContextAdapter;
 import org.apache.velocity.exception.MethodInvocationException;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/ActionDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/ActionDirective.java
index d4819f20a..eb7a86809 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/ActionDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/ActionDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.ActionComponent;
-import com.opensymphony.webwork.components.Component;
+import org.apache.struts.action2.components.ActionComponent;
+import org.apache.struts.action2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/ActionErrorDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/ActionErrorDirective.java
index 7ea3a6690..cfb196885 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/ActionErrorDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/ActionErrorDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.ActionError;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.ActionError;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/ActionMessageDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/ActionMessageDirective.java
index b46602cf5..c3ad6547c 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/ActionMessageDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/ActionMessageDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.ActionMessage;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.ActionMessage;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/AnchorDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/AnchorDirective.java
index 38b1f2ae2..8386ee2c6 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/AnchorDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/AnchorDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Anchor;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Anchor;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/BeanDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/BeanDirective.java
index 973dca6c6..c4374779d 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/BeanDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/BeanDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Bean;
-import com.opensymphony.webwork.components.Component;
+import org.apache.struts.action2.components.Bean;
+import org.apache.struts.action2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/CheckBoxDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/CheckBoxDirective.java
index 49bec2013..908db710c 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/CheckBoxDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/CheckBoxDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Checkbox;
-import com.opensymphony.webwork.components.Component;
+import org.apache.struts.action2.components.Checkbox;
+import org.apache.struts.action2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/CheckBoxListDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/CheckBoxListDirective.java
index 1cd6e2b95..bca794867 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/CheckBoxListDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/CheckBoxListDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.CheckboxList;
-import com.opensymphony.webwork.components.Component;
+import org.apache.struts.action2.components.CheckboxList;
+import org.apache.struts.action2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/ComboBoxDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/ComboBoxDirective.java
index 814e41116..303fa09b5 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/ComboBoxDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/ComboBoxDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.ComboBox;
-import com.opensymphony.webwork.components.Component;
+import org.apache.struts.action2.components.ComboBox;
+import org.apache.struts.action2.components.Component;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/ComponentDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/ComponentDirective.java
index 57e28da0a..a4380ed42 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/ComponentDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/ComponentDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.GenericUIBean;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.GenericUIBean;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/DateDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/DateDirective.java
index 3205fb9ce..dae8dafc0 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/DateDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/DateDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Date;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Date;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/DatePickerDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/DatePickerDirective.java
index 64fdceb71..9f9b47f44 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/DatePickerDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/DatePickerDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.DatePicker;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.DatePicker;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/DebugDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/DebugDirective.java
index ba03bdc6f..d364ee189 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/DebugDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/DebugDirective.java
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Debug;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Debug;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/DivDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/DivDirective.java
index a76b8248d..799b38764 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/DivDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/DivDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Div;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Div;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/DoubleSelectDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/DoubleSelectDirective.java
index 50826aa47..78212f0c8 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/DoubleSelectDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/DoubleSelectDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.DoubleSelect;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.DoubleSelect;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/FieldErrorDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/FieldErrorDirective.java
index c09adfb2c..6f8e8d1f9 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/FieldErrorDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/FieldErrorDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.FieldError;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.FieldError;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/FileDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/FileDirective.java
index e85b38a44..1636c5a7e 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/FileDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/FileDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.File;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.File;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/FormDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/FormDirective.java
index 995a90dcc..e0c21258e 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/FormDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/FormDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Form;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Form;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/HeadDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/HeadDirective.java
index f45bc6bb8..48c7187d8 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/HeadDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/HeadDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Head;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Head;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/HiddenDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/HiddenDirective.java
index 2f204cc60..dbe8a774b 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/HiddenDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/HiddenDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Hidden;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Hidden;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/I18nDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/I18nDirective.java
index dd1140c51..f5d061a19 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/I18nDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/I18nDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.I18n;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.I18n;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/IncludeDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/IncludeDirective.java
index e1a822f29..1cdc89eb0 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/IncludeDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/IncludeDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Include;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Include;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/LabelDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/LabelDirective.java
index 2f977265e..2129c1a3c 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/LabelDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/LabelDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Label;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Label;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/OptionTransferSelectDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/OptionTransferSelectDirective.java
index d77aa9a1a..8750a7835 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/OptionTransferSelectDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/OptionTransferSelectDirective.java
@@ -2,13 +2,13 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.OptionTransferSelect;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.OptionTransferSelect;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 /**
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/PanelDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/PanelDirective.java
index a695b8533..3b89c909c 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/PanelDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/PanelDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Panel;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Panel;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/ParamDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/ParamDirective.java
index d9178d0f1..9cee3a2a0 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/ParamDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/ParamDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Param;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Param;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/PasswordDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/PasswordDirective.java
index cba5e7a46..4bfb41a5b 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/PasswordDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/PasswordDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Password;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Password;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/PropertyDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/PropertyDirective.java
index 9cd7f69ee..91a9be484 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/PropertyDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/PropertyDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Property;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Property;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/PushDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/PushDirective.java
index 52e2093e8..1a34a1f6a 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/PushDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/PushDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Push;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Push;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/RadioDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/RadioDirective.java
index 27d1fd507..fbe31fdcf 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/RadioDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/RadioDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Radio;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Radio;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/ResetDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/ResetDirective.java
index 250f1922d..279b90d6a 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/ResetDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/ResetDirective.java
@@ -2,17 +2,17 @@
  * Copyright (c) 2002-2006 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Reset;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Reset;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
- * @see com.opensymphony.webwork.components.Reset
+ * @see org.apache.struts.action2.components.Reset
  */
 public class ResetDirective extends AbstractDirective {
     public String getBeanName() {
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/RichTextEditorDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/RichTextEditorDirective.java
index 449298eb9..db4f80ea2 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/RichTextEditorDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/RichTextEditorDirective.java
@@ -2,13 +2,13 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.RichTextEditor;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.RichTextEditor;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 /**
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/SelectDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/SelectDirective.java
index 3942b636e..08aea08ae 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/SelectDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/SelectDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Select;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Select;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/SetDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/SetDirective.java
index 014eec1d7..6a03dede1 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/SetDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/SetDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Set;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Set;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/SubmitDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/SubmitDirective.java
index 315c99255..658ce5fb2 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/SubmitDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/SubmitDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Submit;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Submit;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/TabbedPanelDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/TabbedPanelDirective.java
index 13322fd87..07dc94ff2 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/TabbedPanelDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/TabbedPanelDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.TabbedPanel;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.TabbedPanel;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/TextAreaDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/TextAreaDirective.java
index 709965c28..812eac012 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/TextAreaDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/TextAreaDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.TextArea;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.TextArea;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/TextDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/TextDirective.java
index f0ff01db3..a8b0408ec 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/TextDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/TextDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Text;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Text;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/TextFieldDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/TextFieldDirective.java
index be614f2e4..6194930cb 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/TextFieldDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/TextFieldDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.TextField;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.TextField;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/TokenDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/TokenDirective.java
index f565dc741..126bb9feb 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/TokenDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/TokenDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Token;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Token;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/TreeDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/TreeDirective.java
index ad9eaeec4..f98db23d0 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/TreeDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/TreeDirective.java
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.Tree;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.Tree;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/TreeNodeDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/TreeNodeDirective.java
index 3e727bf21..218d006b0 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/TreeNodeDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/TreeNodeDirective.java
@@ -2,10 +2,10 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.TreeNode;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.TreeNode;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/URLDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/URLDirective.java
index ac9c1d04d..e62b8d76f 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/URLDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/URLDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.URL;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.URL;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/UpDownSelectDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/UpDownSelectDirective.java
index 948a1f42b..a904e314e 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/UpDownSelectDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/UpDownSelectDirective.java
@@ -2,13 +2,13 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.UpDownSelect;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.UpDownSelect;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 /**
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/WebTableDirective.java b/src/java/org/apache/struts/action2/views/velocity/components/WebTableDirective.java
index 5251785b9..ca2ab5626 100644
--- a/src/java/org/apache/struts/action2/views/velocity/components/WebTableDirective.java
+++ b/src/java/org/apache/struts/action2/views/velocity/components/WebTableDirective.java
@@ -1,7 +1,7 @@
-package com.opensymphony.webwork.views.velocity.components;
+package org.apache.struts.action2.views.velocity.components;
 
-import com.opensymphony.webwork.components.Component;
-import com.opensymphony.webwork.components.table.WebTable;
+import org.apache.struts.action2.components.Component;
+import org.apache.struts.action2.components.table.WebTable;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/java/org/apache/struts/action2/views/xslt/AdapterNode.java b/src/java/org/apache/struts/action2/views/xslt/AdapterNode.java
index a5cea1ba5..7a8372c54 100644
--- a/src/java/org/apache/struts/action2/views/xslt/AdapterNode.java
+++ b/src/java/org/apache/struts/action2/views/xslt/AdapterNode.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.xslt;
+package org.apache.struts.action2.views.xslt;
 
 import org.w3c.dom.Node;
 
diff --git a/src/java/org/apache/struts/action2/views/xslt/ArrayAdapter.java b/src/java/org/apache/struts/action2/views/xslt/ArrayAdapter.java
index 6663d61b4..c73a40210 100644
--- a/src/java/org/apache/struts/action2/views/xslt/ArrayAdapter.java
+++ b/src/java/org/apache/struts/action2/views/xslt/ArrayAdapter.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.xslt;
+package org.apache.struts.action2.views.xslt;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/src/java/org/apache/struts/action2/views/xslt/BeanAdapter.java b/src/java/org/apache/struts/action2/views/xslt/BeanAdapter.java
index b2a5082c7..585940e9a 100644
--- a/src/java/org/apache/struts/action2/views/xslt/BeanAdapter.java
+++ b/src/java/org/apache/struts/action2/views/xslt/BeanAdapter.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.xslt;
+package org.apache.struts.action2.views.xslt;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/src/java/org/apache/struts/action2/views/xslt/CollectionAdapter.java b/src/java/org/apache/struts/action2/views/xslt/CollectionAdapter.java
index cdbaf6127..f03ccc67b 100644
--- a/src/java/org/apache/struts/action2/views/xslt/CollectionAdapter.java
+++ b/src/java/org/apache/struts/action2/views/xslt/CollectionAdapter.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.xslt;
+package org.apache.struts.action2.views.xslt;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/src/java/org/apache/struts/action2/views/xslt/CollectionNodeList.java b/src/java/org/apache/struts/action2/views/xslt/CollectionNodeList.java
index e3f57b4bd..92afd5bd2 100644
--- a/src/java/org/apache/struts/action2/views/xslt/CollectionNodeList.java
+++ b/src/java/org/apache/struts/action2/views/xslt/CollectionNodeList.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.xslt;
+package org.apache.struts.action2.views.xslt;
 
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
diff --git a/src/java/org/apache/struts/action2/views/xslt/DOMAdapter.java b/src/java/org/apache/struts/action2/views/xslt/DOMAdapter.java
index c8b6ce39e..d9871e59f 100644
--- a/src/java/org/apache/struts/action2/views/xslt/DOMAdapter.java
+++ b/src/java/org/apache/struts/action2/views/xslt/DOMAdapter.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.xslt;
+package org.apache.struts.action2.views.xslt;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/src/java/org/apache/struts/action2/views/xslt/DefaultAdapterNode.java b/src/java/org/apache/struts/action2/views/xslt/DefaultAdapterNode.java
index bc4f7e10e..4bf019b7a 100644
--- a/src/java/org/apache/struts/action2/views/xslt/DefaultAdapterNode.java
+++ b/src/java/org/apache/struts/action2/views/xslt/DefaultAdapterNode.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.xslt;
+package org.apache.struts.action2.views.xslt;
 
 import org.apache.commons.logging.LogFactory;
 import org.w3c.dom.*;
diff --git a/src/java/org/apache/struts/action2/views/xslt/DefaultElementAdapter.java b/src/java/org/apache/struts/action2/views/xslt/DefaultElementAdapter.java
index b9fe826f9..37c01a568 100644
--- a/src/java/org/apache/struts/action2/views/xslt/DefaultElementAdapter.java
+++ b/src/java/org/apache/struts/action2/views/xslt/DefaultElementAdapter.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.xslt;
+package org.apache.struts.action2.views.xslt;
 
 import org.w3c.dom.*;
 
diff --git a/src/java/org/apache/struts/action2/views/xslt/DocumentAdapter.java b/src/java/org/apache/struts/action2/views/xslt/DocumentAdapter.java
index 7bfdc803e..f02030a0c 100644
--- a/src/java/org/apache/struts/action2/views/xslt/DocumentAdapter.java
+++ b/src/java/org/apache/struts/action2/views/xslt/DocumentAdapter.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.xslt;
+package org.apache.struts.action2.views.xslt;
 
 import org.w3c.dom.*;
 
diff --git a/src/java/org/apache/struts/action2/views/xslt/ServletURIResolver.java b/src/java/org/apache/struts/action2/views/xslt/ServletURIResolver.java
index ccb779c90..26b57aeeb 100644
--- a/src/java/org/apache/struts/action2/views/xslt/ServletURIResolver.java
+++ b/src/java/org/apache/struts/action2/views/xslt/ServletURIResolver.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.xslt;
+package org.apache.struts.action2.views.xslt;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/src/java/org/apache/struts/action2/views/xslt/SimpleTextNode.java b/src/java/org/apache/struts/action2/views/xslt/SimpleTextNode.java
index 39791d490..5b311a5a4 100644
--- a/src/java/org/apache/struts/action2/views/xslt/SimpleTextNode.java
+++ b/src/java/org/apache/struts/action2/views/xslt/SimpleTextNode.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.xslt;
+package org.apache.struts.action2.views.xslt;
 
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Node;
diff --git a/src/java/org/apache/struts/action2/views/xslt/ToStringAdapter.java b/src/java/org/apache/struts/action2/views/xslt/ToStringAdapter.java
index 60ec00297..825baccbd 100644
--- a/src/java/org/apache/struts/action2/views/xslt/ToStringAdapter.java
+++ b/src/java/org/apache/struts/action2/views/xslt/ToStringAdapter.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.xslt;
+package org.apache.struts.action2.views.xslt;
 
 import org.w3c.dom.*;
 
diff --git a/src/java/org/apache/struts/action2/views/xslt/XSLTResult.java b/src/java/org/apache/struts/action2/views/xslt/XSLTResult.java
index c62eeb190..7820b9a1f 100644
--- a/src/java/org/apache/struts/action2/views/xslt/XSLTResult.java
+++ b/src/java/org/apache/struts/action2/views/xslt/XSLTResult.java
@@ -2,11 +2,11 @@
  * Copyright (c) 2002-2003 by OpenSymphony
  * All rights reserved.
  */
-package com.opensymphony.webwork.views.xslt;
+package org.apache.struts.action2.views.xslt;
 
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.webwork.WebWorkConstants;
-import com.opensymphony.webwork.config.Configuration;
+import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts.action2.WebWorkConstants;
+import org.apache.struts.action2.config.Configuration;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.Result;