Renaming org.apache.struts.action2 to org.apache.struts2

WW-1367


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@418521 13f79535-47bb-0310-9956-ffa450edef68

core/pom.xml

@@ -3,19 +3,19 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.struts.action2</groupId>
-        <artifactId>struts-action2-parent</artifactId>
+        <groupId>org.apache.struts2</groupId>
+        <artifactId>struts2-parent</artifactId>
         <version>2.0-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.struts.action2</groupId>
+    <groupId>org.apache.struts2</groupId>
     <artifactId>struts-core</artifactId>
     <packaging>jar</packaging>
-    <name>Struts Action 2 - Core</name>
+    <name>Struts 2 - Core</name>
     
     <distributionManagement>
         <site>
             <id>apache-site</id>
-            <url>scp://people.apache.org/www/struts.apache.org/struts-action2/struts-core</url>
+            <url>scp://people.apache.org/www/struts.apache.org/struts2/struts-core</url>
         </site>
     </distributionManagement>
     

core/src/main/java/org/apache/struts2/Main.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2;
+package org.apache.struts2;
 
 import java.io.File;
 import java.io.FilenameFilter;
@@ -144,7 +144,7 @@ public class Main {
                 return;
             }
 
-            launch("org.apache.struts.action2.quickstart.QuickStart", programArgs, urls);
+            launch("org.apache.struts2.quickstart.QuickStart", programArgs, urls);
             return;
         }
 
@@ -157,7 +157,7 @@ public class Main {
         }
 
         if ("sitegraph".equals(command)) {
-            launch("org.apache.struts.action2.sitegraph.SiteGraph", programArgs, urls);
+            launch("org.apache.struts2.sitegraph.SiteGraph", programArgs, urls);
         }
     }
 

core/src/main/java/org/apache/struts2/RequestUtils.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2;
+package org.apache.struts2;
 
 import javax.servlet.http.HttpServletRequest;
 

core/src/main/java/org/apache/struts2/ServletActionContext.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2;
+package org.apache.struts2;
 
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.util.OgnlValueStack;

core/src/main/java/org/apache/struts2/StrutsConstants.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2;
+package org.apache.struts2;
 
 /**
  * This class provides a central location for framework constants related to

core/src/main/java/org/apache/struts2/StrutsStatics.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2;
+package org.apache.struts2;
 
 
 /**

core/src/main/java/org/apache/struts2/StrutsTestCase.java

@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2;
+package org.apache.struts2;
 
-import org.apache.struts.action2.config.Configuration;
-import org.apache.struts.action2.dispatcher.DispatcherUtils;
+import org.apache.struts2.config.Configuration;
+import org.apache.struts2.dispatcher.DispatcherUtils;
 import com.opensymphony.xwork.XWorkTestCase;
 import com.opensymphony.xwork.util.LocalizedTextUtil;
 

core/src/main/java/org/apache/struts2/components/AbstractRichtexteditorConnector.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import java.io.Serializable;
 
@@ -25,8 +25,8 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.apache.struts.action2.interceptor.ServletRequestAware;
-import org.apache.struts.action2.interceptor.ServletResponseAware;
+import org.apache.struts2.interceptor.ServletRequestAware;
+import org.apache.struts2.interceptor.ServletResponseAware;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionSupport;
 
@@ -42,7 +42,7 @@ import com.opensymphony.xwork.ActionSupport;
  * <!-- START SNIPPET: example -->
  * 
  *   &lt;package name="richtexteditor-browse" extends="struts-default" namespace="/struts/richtexteditor/editor/filemanager/browser/default/connectors/jsp"&gt;
- *   	&lt;action name="connector" class="org.apache.struts.action2.components.DefaultRichtexteditorConnector" method="browse">
+ *   	&lt;action name="connector" class="org.apache.struts2.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;
@@ -51,7 +51,7 @@ import com.opensymphony.xwork.ActionSupport;
  *   &lt;/package&gt;
  * 
  *   &lt;package name="richtexteditor-upload" extends="struts-default" namespace="/struts/richtexteditor/editor/filemanager/upload"&gt;
- *		&lt;action name="uploader" class="org.apache.struts.action2.components.DefaultRichtexteditorConnector" method="upload"&gt;
+ *		&lt;action name="uploader" class="org.apache.struts2.components.DefaultRichtexteditorConnector" method="upload"&gt;
  *			&lt;result name="richtexteditorFileUpload" /&gt;
  *		&lt;/action&gt;    
  *   &lt;/package&gt;
@@ -59,7 +59,7 @@ import com.opensymphony.xwork.ActionSupport;
  * <!-- END SNIPPET: example -->
  * </pre>
  * 
- * @see org.apache.struts.action2.components.DefaultRichtexteditorConnector
+ * @see org.apache.struts2.components.DefaultRichtexteditorConnector
  */
 public abstract class AbstractRichtexteditorConnector extends ActionSupport implements ServletRequestAware, ServletResponseAware {
 	

core/src/main/java/org/apache/struts2/components/ActionComponent.java

@@ -15,12 +15,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
-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 org.apache.struts2.ServletActionContext;
+import org.apache.struts2.dispatcher.DispatcherUtils;
+import org.apache.struts2.dispatcher.RequestMap;
+import org.apache.struts2.views.jsp.TagUtils;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionProxy;
 import com.opensymphony.xwork.ActionProxyFactory;
@@ -101,7 +101,7 @@ import java.util.Map;
  * <!-- END SNIPPET: example -->
  * </pre>
  *
- * @a2.tag name="action" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ActionTag"
+ * @a2.tag name="action" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ActionTag"
  * description="Execute an action from within a view"
  */
 public class ActionComponent extends Component {
@@ -180,7 +180,7 @@ public class ActionComponent extends Component {
      * and the namespace will be saved into the instance variables proxy and
      * namespace respectively.
      *
-     * @see org.apache.struts.action2.views.jsp.TagUtils#buildNamespace
+     * @see org.apache.struts2.views.jsp.TagUtils#buildNamespace
      */
     private void executeAction() {
         String actualName = findString(name, "name", "Action name is required. Example: updatePerson");

core/src/main/java/org/apache/struts2/components/ActionError.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -43,7 +43,7 @@ import javax.servlet.http.HttpServletResponse;
  * <!-- END SNIPPET: example -->
  * </pre>
  *
- * @a2.tag name="actionerror" tld-body-content="empty" tld-tag-class="org.apache.struts.action2.views.jsp.ui.ActionErrorTag"
+ * @a2.tag name="actionerror" tld-body-content="empty" tld-tag-class="org.apache.struts2.views.jsp.ui.ActionErrorTag"
  * description="Render action errors if they exists"
  */
 public class ActionError extends UIBean {

core/src/main/java/org/apache/struts2/components/ActionMessage.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -41,7 +41,7 @@ import javax.servlet.http.HttpServletResponse;
  * <!-- END SNIPPET: example -->
  * </pre>
  *
- * @a2.tag name="actionmessage" tld-body-content="empty" tld-tag-class="org.apache.struts.action2.views.jsp.ui.ActionMessageTag"
+ * @a2.tag name="actionmessage" tld-body-content="empty" tld-tag-class="org.apache.struts2.views.jsp.ui.ActionMessageTag"
  * description="Render action messages if they exists"
  */
 public class ActionMessage extends UIBean {

core/src/main/java/org/apache/struts2/components/Anchor.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -77,7 +77,7 @@ import javax.servlet.http.HttpServletResponse;
  * <!-- END SNIPPET: example3 -->
  * </pre>
  *
- * @a2.tag name="a" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.AnchorTag"
+ * @a2.tag name="a" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.AnchorTag"
  * description="Render a HTML href element that when clicked calls a URL via remote XMLHttpRequest"
  * 
  */

core/src/main/java/org/apache/struts2/components/AppendIterator.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import java.io.Writer;
 import java.util.ArrayList;
@@ -25,9 +25,9 @@ import java.util.List;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.apache.struts.action2.components.Param.UnnamedParametric;
-import org.apache.struts.action2.util.AppendIteratorFilter;
-import org.apache.struts.action2.util.MakeIterator;
+import org.apache.struts2.components.Param.UnnamedParametric;
+import org.apache.struts2.util.AppendIteratorFilter;
+import org.apache.struts2.util.MakeIterator;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 /**
@@ -106,10 +106,10 @@ import com.opensymphony.xwork.util.OgnlValueStack;
  * <!-- END SNIPPET: example -->
  *
  *
- * @see org.apache.struts.action2.util.AppendIteratorFilter
- * @see org.apache.struts.action2.views.jsp.iterator.AppendIteratorTag
+ * @see org.apache.struts2.util.AppendIteratorFilter
+ * @see org.apache.struts2.views.jsp.iterator.AppendIteratorTag
  *
- * @a2.tag name="append" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.iterator.AppendIteratorTag"
+ * @a2.tag name="append" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.iterator.AppendIteratorTag"
  * description="Append the values of a list of iterators to one iterator"
  */
 public class AppendIterator extends Component implements UnnamedParametric {

core/src/main/java/org/apache/struts2/components/Bean.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.util.ClassLoaderUtil;
 import com.opensymphony.xwork.ObjectFactory;
@@ -50,13 +50,13 @@ import java.io.Writer;
  * <pre>
  * <!-- START SNIPPET: examples -->
  * &lt;-- in freemarker form --&gt;
- * [ww.bean name="org.apache.struts.action2.example.counter.SimpleCounter" id="counter"]
+ * [ww.bean name="org.apache.struts2.example.counter.SimpleCounter" id="counter"]
  *   [a:param name="foo" value="BAR"/]
  *   The value of foo is : [a:property value="foo"/], when inside the bean tag.<br />
  * [/a:bean]
  *
  * &lt;-- in jsp form --&gt;
- * &lt;a:bean name="org.apache.struts.action2.example.counter.SimpleCounter" id="counter"&gt;
+ * &lt;a:bean name="org.apache.struts2.example.counter.SimpleCounter" id="counter"&gt;
  * 	 &lt;a:param name="foo" value="BAR" /&gt;
  *   The value of foot is : &lt;a:property value="foo"/&gt;, when inside the bean tag &lt;br /&gt;
  * &lt;/a:bean&gt;
@@ -86,7 +86,7 @@ import java.io.Writer;
  *
  * @see Param
  *
- * @a2.tag name="bean" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.BeanTag"
+ * @a2.tag name="bean" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.BeanTag"
  * description="Instantiate a JavaBean and place it in the context."
  */
 public class Bean extends Component {

core/src/main/java/org/apache/struts2/components/Checkbox.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -43,7 +43,7 @@ import javax.servlet.http.HttpServletResponse;
  * <!-- END SNIPPET: example -->
  * </pre>
  *
- * @a2.tag name="checkbox" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.CheckboxTag"
+ * @a2.tag name="checkbox" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.CheckboxTag"
  * description="Render a checkbox input field"
   */
 public class Checkbox extends UIBean {

core/src/main/java/org/apache/struts2/components/CheckboxList.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -37,7 +37,7 @@ import javax.servlet.http.HttpServletResponse;
  * <!-- END SNIPPET: example -->
  * </pre>
  *
- * @a2.tag name="checkboxlist" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.CheckboxListTag"
+ * @a2.tag name="checkboxlist" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.CheckboxListTag"
  * description="Render a list of checkboxes"
   */
 public class CheckboxList extends ListUIBean {

core/src/main/java/org/apache/struts2/components/ClosingUIBean.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 import org.apache.commons.logging.Log;

core/src/main/java/org/apache/struts2/components/ComboBox.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import java.lang.reflect.Array;
 import java.util.Arrays;
@@ -28,7 +28,7 @@ import com.opensymphony.xwork.util.OgnlValueStack;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.struts.action2.util.MakeIterator;
+import org.apache.struts2.util.MakeIterator;
 
 /**
  * <!-- START SNIPPET: javadoc -->
@@ -84,7 +84,7 @@ import org.apache.struts.action2.util.MakeIterator;
  * <!-- END SNIPPET: example -->
  * </pre>
  *
- * @a2.tag name="combobox" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.ComboBoxTag"
+ * @a2.tag name="combobox" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.ComboBoxTag"
  * description="Widget that fills a text box from a select"
   */
 public class ComboBox extends TextField {

core/src/main/java/org/apache/struts2/components/Component.java

@@ -15,15 +15,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
-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 org.apache.struts2.util.FastByteArrayOutputStream;
+import org.apache.struts2.views.jsp.TagUtils;
+import org.apache.struts2.views.util.ContextUtil;
+import org.apache.struts2.views.util.UrlHelper;
+import org.apache.struts2.dispatcher.mapper.ActionMapping;
+import org.apache.struts2.dispatcher.mapper.ActionMapper;
+import org.apache.struts2.dispatcher.mapper.ActionMapperFactory;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import com.opensymphony.xwork.util.TextParseUtil;
 import org.apache.commons.logging.Log;
@@ -321,7 +321,7 @@ public class Component {
     }
 
     /**
-     * Renders an action URL by consulting the {@link org.apache.struts.action2.dispatcher.mapper.ActionMapper}.
+     * Renders an action URL by consulting the {@link org.apache.struts2.dispatcher.mapper.ActionMapper}.
      * @param action      the action
      * @param namespace   the namespace
      * @param method      the method

core/src/main/java/org/apache/struts2/components/Date.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.TextProvider;
@@ -132,7 +132,7 @@ import java.util.List;
  * <code>Date</code>
  *
  * @a2.tag name="date" tld-body-content="empty"
- *         tld-tag-class="org.apache.struts.action2.views.jsp.DateTag"
+ *         tld-tag-class="org.apache.struts2.views.jsp.DateTag"
  *         description="Render a formatted date."
  */
 public class Date extends Component {

core/src/main/java/org/apache/struts2/components/DatePicker.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.util.OgnlValueStack;
@@ -97,7 +97,7 @@ import java.util.Locale;
  * <!-- END SNIPPET: expl2 -->
  * </pre>
  *
- * @a2.tag name="datepicker" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.DatePickerTag"
+ * @a2.tag name="datepicker" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.DatePickerTag"
  * description="Render datepicker"
  */
 public class DatePicker extends TextField {

core/src/main/java/org/apache/struts2/components/DefaultRichtexteditorConnector.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import java.io.FileFilter;
 import java.io.FileInputStream;
@@ -33,8 +33,8 @@ import javax.servlet.ServletContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.apache.struts.action2.util.ServletContextAware;
-import org.apache.struts.action2.views.util.UrlHelper;
+import org.apache.struts2.util.ServletContextAware;
+import org.apache.struts2.views.util.UrlHelper;
 
 /**
  * Default AbstractRichtexteditorConnector implementation.

core/src/main/java/org/apache/struts2/components/Div.java

@@ -15,13 +15,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.struts.action2.views.util.UrlHelper;
+import org.apache.struts2.views.util.UrlHelper;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -48,7 +48,7 @@ import javax.servlet.http.HttpServletResponse;
  * <!-- END SNIPPET: example -->
  * </pre>
  *
- * @a2.tag name="div" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.DivTag"
+ * @a2.tag name="div" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.DivTag"
  * description="Render HTML div providing content from remote call via AJAX"
   */
 public class Div extends RemoteCallUIBean {

core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import java.util.Map;
 

core/src/main/java/org/apache/struts2/components/DoubleSelect.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -36,7 +36,7 @@ import javax.servlet.http.HttpServletResponse;
  * <!-- END SNIPPET: example -->
  * </pre>
  *
- * @a2.tag name="doubleselect" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.DoubleSelectTag"
+ * @a2.tag name="doubleselect" tld-body-content="JSP" tld-tag-class="org.apache.struts2.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 {

core/src/main/java/org/apache/struts2/components/Else.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -51,7 +51,7 @@ import java.util.Map;
  * <!-- END SNIPPET: example -->
  * </pre>
  *
- * @a2.tag name="else" bodycontent="JSP" description="Else tag"  tld-tag-class="org.apache.struts.action2.views.jsp.ElseTag"
+ * @a2.tag name="else" bodycontent="JSP" description="Else tag"  tld-tag-class="org.apache.struts2.views.jsp.ElseTag"
  */
 public class Else extends Component {
     public Else(OgnlValueStack stack) {

core/src/main/java/org/apache/struts2/components/ElseIf.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -55,7 +55,7 @@ import java.io.Writer;
  * <!-- END SNIPPET: example -->
  * </pre>
  *
- * @a2.tag name="elseif" tld-body-content="JSP" description="Elseif tag"  tld-tag-class="org.apache.struts.action2.views.jsp.ElseIfTag"
+ * @a2.tag name="elseif" tld-body-content="JSP" description="Elseif tag"  tld-tag-class="org.apache.struts2.views.jsp.ElseIfTag"
  */
 public class ElseIf extends Component {
     public ElseIf(OgnlValueStack stack) {

core/src/main/java/org/apache/struts2/components/FieldError.java

@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
-import org.apache.struts.action2.components.Param.UnnamedParametric;
+import org.apache.struts2.components.Param.UnnamedParametric;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
@@ -75,7 +75,7 @@ import java.util.List;
  * <!-- END SNIPPET: description -->
  * </pre>
  *
- * @a2.tag name="fielderror" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.FieldErrorTag"
+ * @a2.tag name="fielderror" tld-body-content="JSP" tld-tag-class="org.apache.struts2.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 {

core/src/main/java/org/apache/struts2/components/File.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -39,7 +39,7 @@ import org.apache.commons.logging.LogFactory;
  * <!-- END SNIPPET: example -->
  * </pre>
  *
- * @a2.tag name="file" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.FileTag"
+ * @a2.tag name="file" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.FileTag"
  * description="Render a file input field"
  */
 public class File extends UIBean {

core/src/main/java/org/apache/struts2/components/Form.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionInvocation;
@@ -31,12 +31,12 @@ import com.opensymphony.xwork.validator.FieldValidator;
 import com.opensymphony.xwork.validator.ValidationInterceptor;
 import com.opensymphony.xwork.validator.Validator;
 import org.apache.commons.lang.StringUtils;
-import org.apache.struts.action2.dispatcher.DispatcherUtils;
-import org.apache.struts.action2.dispatcher.mapper.ActionMapperFactory;
-import org.apache.struts.action2.dispatcher.mapper.ActionMapping;
-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.struts2.dispatcher.DispatcherUtils;
+import org.apache.struts2.dispatcher.mapper.ActionMapperFactory;
+import org.apache.struts2.dispatcher.mapper.ActionMapping;
+import org.apache.struts2.portlet.context.PortletActionContext;
+import org.apache.struts2.portlet.util.PortletUrlHelper;
+import org.apache.struts2.views.util.UrlHelper;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -81,7 +81,7 @@ import java.util.Set;
  * <!-- END SNIPPET: example -->
  * </pre>
  *
- * @a2.tag name="form" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.FormTag"
+ * @a2.tag name="form" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.FormTag"
  * description="Renders an input form"
  */
 public class Form extends ClosingUIBean {

core/src/main/java/org/apache/struts2/components/FormButton.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 

core/src/main/java/org/apache/struts2/components/GenericUIBean.java

@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
-import org.apache.struts.action2.util.ContainUtil;
+import org.apache.struts2.util.ContainUtil;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -104,7 +104,7 @@ import javax.servlet.http.HttpServletResponse;
  * 
  * <!-- END SNIPPET: note -->
  *
- * @a2.tag name="component" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.ComponentTag"
+ * @a2.tag name="component" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.ComponentTag"
  * description="Render a custom ui widget"
  */
 public class GenericUIBean extends UIBean {

core/src/main/java/org/apache/struts2/components/Head.java

@@ -15,11 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
-import org.apache.struts.action2.config.Configuration;
-import org.apache.struts.action2.StrutsConstants;
+import org.apache.struts2.config.Configuration;
+import org.apache.struts2.StrutsConstants;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -70,7 +70,7 @@ import javax.servlet.http.HttpServletResponse;
  * <!-- END SNIPPET: example3 -->
  * </pre>
  *
- * @a2.tag name="head" tld-body-content="empty" tld-tag-class="org.apache.struts.action2.views.jsp.ui.HeadTag"
+ * @a2.tag name="head" tld-body-content="empty" tld-tag-class="org.apache.struts2.views.jsp.ui.HeadTag"
  * description="Render a chunk of HEAD for your HTML file"
  */
 public class Head extends UIBean {

core/src/main/java/org/apache/struts2/components/Hidden.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -43,7 +43,7 @@ import javax.servlet.http.HttpServletResponse;
  * <!-- END SNIPPET: example -->
  * </pre>
  *
- * @a2.tag name="hidden" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.HiddenTag"
+ * @a2.tag name="hidden" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.HiddenTag"
  * description="Render a hidden input field"
   */
 public class Hidden extends UIBean {

core/src/main/java/org/apache/struts2/components/I18n.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.LocaleProvider;
@@ -73,7 +73,7 @@ import java.util.ResourceBundle;
  * <!-- END SNIPPET: i18nExample -->
  * </pre>
  * 
- * @a2.tag name="i18n" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.I18nTag"
+ * @a2.tag name="i18n" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.I18nTag"
  * description="Get a resource bundle and place it on the value stack"
  */
 public class I18n extends Component {

core/src/main/java/org/apache/struts2/components/If.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -58,7 +58,7 @@ import java.io.Writer;
  * @see Else
  * @see ElseIf
  *
- * @a2.tag name="if" tld-body-content="JSP" description="If tag" tld-tag-class="org.apache.struts.action2.views.jsp.IfTag"
+ * @a2.tag name="if" tld-body-content="JSP" description="If tag" tld-tag-class="org.apache.struts2.views.jsp.IfTag"
  */
 public class If extends Component {
     public static final String ANSWER = "struts.if.answer";

core/src/main/java/org/apache/struts2/components/Include.java

@@ -15,12 +15,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
-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.StrutsConstants;
+import org.apache.struts2.config.Configuration;
+import org.apache.struts2.util.FastByteArrayOutputStream;
+import org.apache.struts2.RequestUtils;
+import org.apache.struts2.StrutsConstants;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import org.apache.commons.logging.Log;
@@ -79,7 +79,7 @@ import java.util.*;
  * <!-- END SNIPPET: exampledescription -->
  * </pre>
  *
- * @a2.tag name="include" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.IncludeTag"
+ * @a2.tag name="include" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.IncludeTag"
  * description="Include a servlet's output (result of servlet or a JSP page)"
  */
 public class Include extends Component {

core/src/main/java/org/apache/struts2/components/IteratorComponent.java

@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
-import org.apache.struts.action2.util.MakeIterator;
-import org.apache.struts.action2.views.jsp.IteratorStatus;
+import org.apache.struts2.util.MakeIterator;
+import org.apache.struts2.views.jsp.IteratorStatus;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import java.io.Writer;
@@ -75,7 +75,7 @@ import java.util.Iterator;
  * <pre>
  * <!-- START SNIPPET: example2code -->
  * 
- * &lt;a:bean name="org.apache.struts.action2.example.IteratorExample" id="it"&gt;
+ * &lt;a:bean name="org.apache.struts2.example.IteratorExample" id="it"&gt;
  *   &lt;a:param name="day" value="'foo'"/&gt;
  *   &lt;a:param name="day" value="'bar'"/&gt;
  * &lt;/a:bean&gt;
@@ -175,7 +175,7 @@ import java.util.Iterator;
  * <!-- END SNIPPET: example5code -->
  * </pre>
  * 
- * @a2.tag name="iterator" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.IteratorTag"
+ * @a2.tag name="iterator" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.IteratorTag"
  * description="Iterate over a iterable value"
  */
 public class IteratorComponent extends Component {

core/src/main/java/org/apache/struts2/components/Label.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -41,7 +41,7 @@ import javax.servlet.http.HttpServletResponse;
  * <!-- END SNIPPET: example -->
  * </pre>
  *
- * @a2.tag name="label" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.LabelTag"
+ * @a2.tag name="label" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.LabelTag"
  * description="Render a label that displays read-only information"
  */
 public class Label extends UIBean {

core/src/main/java/org/apache/struts2/components/ListUIBean.java

@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
-import org.apache.struts.action2.util.ContainUtil;
-import org.apache.struts.action2.util.MakeIterator;
+import org.apache.struts2.util.ContainUtil;
+import org.apache.struts2.util.MakeIterator;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;

core/src/main/java/org/apache/struts2/components/MergeIterator.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import java.io.Writer;
 import java.util.ArrayList;
@@ -25,9 +25,9 @@ import java.util.List;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.apache.struts.action2.components.Param.UnnamedParametric;
-import org.apache.struts.action2.util.MakeIterator;
-import org.apache.struts.action2.util.MergeIteratorFilter;
+import org.apache.struts2.components.Param.UnnamedParametric;
+import org.apache.struts2.util.MakeIterator;
+import org.apache.struts2.util.MergeIteratorFilter;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 /**
@@ -119,10 +119,10 @@ import com.opensymphony.xwork.util.OgnlValueStack;
  * This wil generate "1aA2bB3cC".
  * <!-- START SNIPPET: description -->
  *
- * @see org.apache.struts.action2.util.MergeIteratorFilter
- * @see org.apache.struts.action2.views.jsp.iterator.MergeIteratorTag
+ * @see org.apache.struts2.util.MergeIteratorFilter
+ * @see org.apache.struts2.views.jsp.iterator.MergeIteratorTag
  *
- * @a2.tag name="merge" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.iterator.MergeIteratorTag"
+ * @a2.tag name="merge" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.iterator.MergeIteratorTag"
  * description="Merge the values of a list of iterators into one iterator"
  */
 public class MergeIterator extends Component implements UnnamedParametric {

core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -86,7 +86,7 @@ import com.opensymphony.xwork.util.OgnlValueStack;
  * <!-- END SNIPPET: example -->
  * </pre>
  * 
- * @a2.tag name="optiontransferselect" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.OptionTransferSelectTag"
+ * @a2.tag name="optiontransferselect" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.OptionTransferSelectTag"
  * description="Renders an input form"
  */
 public class OptionTransferSelect extends DoubleListUIBean {

core/src/main/java/org/apache/struts2/components/Panel.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -34,7 +34,7 @@ import java.io.Writer;
  *
  * @see TabbedPanel
  *
- * @a2.tag name="panel" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.PanelTag"
+ * @a2.tag name="panel" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.PanelTag"
  * description="Render a panel for tabbedPanel"
  */
 public class Panel extends Div {

core/src/main/java/org/apache/struts2/components/Param.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -81,7 +81,7 @@ import java.io.Writer;
  * @see Bean
  * @see Text
  *
- * @a2.tag name="param" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ParamTag"
+ * @a2.tag name="param" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ParamTag"
  * description="Parametrize other tags"
  */
 public class Param extends Component {

core/src/main/java/org/apache/struts2/components/Password.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -39,7 +39,7 @@ import javax.servlet.http.HttpServletResponse;
  * <!-- END SNIPPET: example -->
  * </pre>
  *
- * @a2.tag name="password" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.PasswordTag"
+ * @a2.tag name="password" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.PasswordTag"
  * description="Render an HTML input tag of type password"
  */
 public class Password extends TextField {

core/src/main/java/org/apache/struts2/components/Property.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 import com.opensymphony.util.TextUtils;
@@ -80,7 +80,7 @@ import org.apache.commons.logging.LogFactory;
  * <!-- END SNIPPET: i18nExample -->
  * </pre>
  *
- * @a2.tag name="property" tld-body-content="empty" tld-tag-class="org.apache.struts.action2.views.jsp.PropertyTag"
+ * @a2.tag name="property" tld-body-content="empty" tld-tag-class="org.apache.struts2.views.jsp.PropertyTag"
  * description="Print out expression which evaluates against the stack"
  */
 public class Property extends Component {

core/src/main/java/org/apache/struts2/components/Push.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -102,7 +102,7 @@ import java.io.Writer;
  * <!-- END SNIPPET: example4description -->
  * </pre>
  * 
- * @a2.tag name="push" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.PushTag"
+ * @a2.tag name="push" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.PushTag"
  * description="Push value on stack for simplified usage."
  */
 public class Push extends Component {

core/src/main/java/org/apache/struts2/components/Radio.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -43,7 +43,7 @@ import javax.servlet.http.HttpServletResponse;
  * <!-- END SNIPPET: example -->
  * </pre>
  *
- * @a2.tag name="radio" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.RadioTag"
+ * @a2.tag name="radio" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.RadioTag"
  * description="Renders a radio button input field"
  */
 public class Radio extends ListUIBean {

core/src/main/java/org/apache/struts2/components/RemoteCallUIBean.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 

core/src/main/java/org/apache/struts2/components/Reset.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -49,7 +49,7 @@ import javax.servlet.http.HttpServletResponse;
  * <!-- END SNIPPET: example2 -->
  * </pre>
  *
- * @a2.tag name="reset" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.ResetTag"
+ * @a2.tag name="reset" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.ResetTag"
  * description="Render a reset button"
  */
 public class Reset extends FormButton {

core/src/main/java/org/apache/struts2/components/RichTextEditor.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.util.OgnlValueStack;
@@ -59,7 +59,7 @@ import java.util.Locale;
  *   <package name="richtexteditor-browse" extends="struts-default" 
  *   namespace="/struts/richtexteditor/editor/filemanager/browser/default/connectors/jsp">
  *   	<action name="connector" 
- *      class="org.apache.struts.action2.components.DefaultRichtexteditorConnector" 
+ *      class="org.apache.struts2.components.DefaultRichtexteditorConnector" 
  *      method="browse">
  *   		<result name="getFolders" type="richtexteditorGetFolders" />
  *   		<result name="getFoldersAndFiles" type="richtexteditorGetFoldersAndFiles" />
@@ -120,7 +120,7 @@ import java.util.Locale;
  *   <package name="richtexteditor-upload" extends="struts-default" 
  *   namespace="/struts/richtexteditor/editor/filemanager/upload">
  *		<action name="uploader" 
- *       class="org.apache.struts.action2.components.DefaultRichtexteditorConnector" 
+ *       class="org.apache.struts2.components.DefaultRichtexteditorConnector" 
  *       method="upload">
  *			<result name="richtexteditorFileUpload" />
  *		</action>    
@@ -189,7 +189,7 @@ import java.util.Locale;
  * 
  * @see AbstractRichtexteditorConnector
  * 
- * @a2.tag name="richtexteditor" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.RichTextEditorTag"
+ * @a2.tag name="richtexteditor" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.RichTextEditorTag"
  * description="Render a rich text editor element"
  */
 public class RichTextEditor extends UIBean {

core/src/main/java/org/apache/struts2/components/Select.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -70,7 +70,7 @@ import javax.servlet.http.HttpServletResponse;
  * 
  * <!-- END SNIPPET: exnote -->
  *
- * @a2.tag name="select" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.SelectTag"
+ * @a2.tag name="select" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.SelectTag"
  * description="Render a select element"
  */
 public class Select extends ListUIBean {

core/src/main/java/org/apache/struts2/components/Set.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -68,7 +68,7 @@ import java.io.Writer;
  * <!-- END SNIPPET: example -->
  * </pre>
  *
- * @a2.tag name="set" tld-body-content="empty" tld-tag-class="org.apache.struts.action2.views.jsp.SetTag"
+ * @a2.tag name="set" tld-body-content="empty" tld-tag-class="org.apache.struts2.views.jsp.SetTag"
  * description="Assigns a value to a variable in a specified scope"
  */
 public class Set extends Component {

core/src/main/java/org/apache/struts2/components/Submit.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -157,7 +157,7 @@ import javax.servlet.http.HttpServletResponse;
  * <!-- END SNIPPET: ajxExample3 -->
  * </pre>
  *
- * @a2.tag name="submit" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.SubmitTag"
+ * @a2.tag name="submit" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.SubmitTag"
  * description="Render a submit button"
  */
 public class Submit extends FormButton {

core/src/main/java/org/apache/struts2/components/TabbedPanel.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -88,7 +88,7 @@ import java.util.List;
  *
  * @see Panel
  *
- * @a2.tag name="tabbedPanel" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.TabbedPanelTag"
+ * @a2.tag name="tabbedPanel" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.TabbedPanelTag"
  * description="Render a tabbedPanel widget."
  */
 public class TabbedPanel extends ClosingUIBean {

core/src/main/java/org/apache/struts2/components/Text.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import java.io.IOException;
 import java.io.Writer;
@@ -102,7 +102,7 @@ import com.opensymphony.xwork.util.OgnlValueStack;
  * 
  * @see Param
  *
- * @a2.tag name="text" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.TextTag"
+ * @a2.tag name="text" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.TextTag"
  * description="Render a I18n text message."
  */
 public class Text extends Component implements Param.UnnamedParametric {

core/src/main/java/org/apache/struts2/components/TextArea.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -37,7 +37,7 @@ import javax.servlet.http.HttpServletResponse;
  *
  * @see TabbedPanel
  *
- * @a2.tag name="textarea" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.TextareaTag"
+ * @a2.tag name="textarea" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.TextareaTag"
  * description="Render HTML textarea tag."
  */
 public class TextArea extends UIBean {

core/src/main/java/org/apache/struts2/components/TextField.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -39,7 +39,7 @@ import javax.servlet.http.HttpServletResponse;
  * <!-- END SNIPPET: example -->
  * </pre>
  *
- * @a2.tag name="textfield" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.TextFieldTag"
+ * @a2.tag name="textfield" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.TextFieldTag"
  * description="Render an HTML input field of type text"
  */
 public class TextField extends UIBean {

core/src/main/java/org/apache/struts2/components/Token.java

@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
-import org.apache.struts.action2.util.TokenHelper;
+import org.apache.struts2.util.TokenHelper;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import javax.servlet.http.HttpServletRequest;
@@ -41,10 +41,10 @@ import java.util.Map;
  * <!-- END SNIPPET: example -->
  * </pre>
  *
- * @see org.apache.struts.action2.interceptor.TokenInterceptor
- * @see org.apache.struts.action2.interceptor.TokenSessionStoreInterceptor
+ * @see org.apache.struts2.interceptor.TokenInterceptor
+ * @see org.apache.struts2.interceptor.TokenSessionStoreInterceptor
  *
- * @a2.tag name="token" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.TokenTag"
+ * @a2.tag name="token" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.TokenTag"
  * description="Stop double-submission of forms"
  */
 public class Token extends UIBean {
@@ -60,7 +60,7 @@ public class Token extends UIBean {
     }
 
     /**
-     * First looks for the token in the PageContext using the supplied name (or {@link org.apache.struts.action2.util.TokenHelper#DEFAULT_TOKEN_NAME}
+     * First looks for the token in the PageContext using the supplied name (or {@link org.apache.struts2.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.

core/src/main/java/org/apache/struts2/components/Tree.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -60,7 +60,7 @@ import java.io.Writer;
  * </pre>
  * 
  *
- * @a2.tag name="tree" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.TreeTag"
+ * @a2.tag name="tree" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.TreeTag"
  * description="Render a tree widget."
  */
 public class Tree extends ClosingUIBean {

core/src/main/java/org/apache/struts2/components/TreeNode.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
@@ -73,7 +73,7 @@ import javax.servlet.http.HttpServletResponse;
  * </pre>
  *
  *
- * @a2.tag name="treenode" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.TreeNodeTag"
+ * @a2.tag name="treenode" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.TreeNodeTag"
  * description="Render a tree node within a tree widget."
  */
 public class TreeNode extends ClosingUIBean {

core/src/main/java/org/apache/struts2/components/UIBean.java

@@ -15,15 +15,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
-import org.apache.struts.action2.StrutsConstants;
-import org.apache.struts.action2.components.template.Template;
-import org.apache.struts.action2.components.template.TemplateEngine;
-import org.apache.struts.action2.components.template.TemplateEngineManager;
-import org.apache.struts.action2.components.template.TemplateRenderingContext;
-import org.apache.struts.action2.config.Configuration;
-import org.apache.struts.action2.views.util.ContextUtil;
+import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.components.template.Template;
+import org.apache.struts2.components.template.TemplateEngine;
+import org.apache.struts2.components.template.TemplateEngineManager;
+import org.apache.struts2.components.template.TemplateRenderingContext;
+import org.apache.struts2.config.Configuration;
+import org.apache.struts2.views.util.ContextUtil;
 import com.opensymphony.xwork.config.ConfigurationException;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import org.apache.commons.logging.Log;

core/src/main/java/org/apache/struts2/components/URL.java

@@ -15,12 +15,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
-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 org.apache.struts2.portlet.context.PortletActionContext;
+import org.apache.struts2.portlet.util.PortletUrlHelper;
+import org.apache.struts2.views.util.UrlHelper;
+import org.apache.struts2.dispatcher.DispatcherUtils;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import com.opensymphony.xwork.util.XWorkContinuationConfig;
 import com.opensymphony.xwork.ActionContext;
@@ -97,7 +97,7 @@ import java.util.Map;
  *
  * @see Param
  *
- * @a2.tag name="url" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.URLTag"
+ * @a2.tag name="url" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.URLTag"
  * description="This tag is used to create a URL"
  */
 public class URL extends Component {

core/src/main/java/org/apache/struts2/components/UpDownSelect.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components;
+package org.apache.struts2.components;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -69,7 +69,7 @@ import com.opensymphony.xwork.util.OgnlValueStack;
  * 
  * @version $Date$ $Id$
  * 
- * @a2.tag name="updownselect" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.UpDownSelectTag"
+ * @a2.tag name="updownselect" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.UpDownSelectTag"
  * description="Render a up down select element"
  */
 public class UpDownSelect extends Select {

core/src/main/java/org/apache/struts2/components/table/AbstractFilterModel.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components.table;
+package org.apache.struts2.components.table;
 
 import javax.swing.table.AbstractTableModel;
 import javax.swing.table.DefaultTableModel;

core/src/main/java/org/apache/struts2/components/table/RenderFilterModel.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components.table;
+package org.apache.struts2.components.table;
 
 import javax.swing.table.TableModel;
 

core/src/main/java/org/apache/struts2/components/table/SortFilterModel.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components.table;
+package org.apache.struts2.components.table;
 
 import javax.swing.*;
 import javax.swing.event.TableModelEvent;

core/src/main/java/org/apache/struts2/components/table/SortableTableModel.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components.table;
+package org.apache.struts2.components.table;
 
 import javax.swing.table.TableModel;
 

core/src/main/java/org/apache/struts2/components/table/WebTable.java

@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components.table;
+package org.apache.struts2.components.table;
 
-import org.apache.struts.action2.components.GenericUIBean;
-import org.apache.struts.action2.components.table.renderer.CellRenderer;
+import org.apache.struts2.components.GenericUIBean;
+import org.apache.struts2.components.table.renderer.CellRenderer;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -32,7 +32,7 @@ import java.util.Iterator;
 import java.util.NoSuchElementException;
 
 /**
- * @a2.tag name="table" tld-body-content="JSP" tld-tag-class="org.apache.struts.action2.views.jsp.ui.table.WebTableTag"
+ * @a2.tag name="table" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.table.WebTableTag"
  * description="Instantiate a JavaBean and place it in the context."
  */
 public class WebTable extends GenericUIBean {
@@ -291,7 +291,7 @@ public class WebTable extends GenericUIBean {
     }
 
     /**
-     * Whether the table should be sortable. Requires that model implements org.apache.struts.action2.components.table.SortableTableModel if set to true.
+     * Whether the table should be sortable. Requires that model implements org.apache.struts2.components.table.SortableTableModel if set to true.
      * @a2.tagattribute required="false" type="Boolean" default="false"
      */
     public void setSortable(boolean sortable) {

core/src/main/java/org/apache/struts2/components/table/WebTableColumn.java

@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components.table;
+package org.apache.struts2.components.table;
 
-import org.apache.struts.action2.components.table.renderer.CellRenderer;
-import org.apache.struts.action2.components.table.renderer.DefaultCellRenderer;
+import org.apache.struts2.components.table.renderer.CellRenderer;
+import org.apache.struts2.components.table.renderer.DefaultCellRenderer;
 
 
 /**

core/src/main/java/org/apache/struts2/components/table/renderer/AbstractCellRenderer.java

@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components.table.renderer;
+package org.apache.struts2.components.table.renderer;
 
-import org.apache.struts.action2.components.table.WebTable;
+import org.apache.struts2.components.table.WebTable;
 
 
 /**

core/src/main/java/org/apache/struts2/components/table/renderer/BooleanCellRenderer.java

@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components.table.renderer;
+package org.apache.struts2.components.table.renderer;
 
-import org.apache.struts.action2.components.table.WebTable;
+import org.apache.struts2.components.table.WebTable;
 
 
 /**

core/src/main/java/org/apache/struts2/components/table/renderer/CellRenderer.java

@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components.table.renderer;
+package org.apache.struts2.components.table.renderer;
 
-import org.apache.struts.action2.components.table.WebTable;
+import org.apache.struts2.components.table.WebTable;
 
 /**
  */

core/src/main/java/org/apache/struts2/components/table/renderer/DateCellRenderer.java

@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components.table.renderer;
+package org.apache.struts2.components.table.renderer;
 
-import org.apache.struts.action2.components.table.WebTable;
+import org.apache.struts2.components.table.WebTable;
 
 import java.text.SimpleDateFormat;
 

core/src/main/java/org/apache/struts2/components/table/renderer/DefaultCellRenderer.java

@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components.table.renderer;
+package org.apache.struts2.components.table.renderer;
 
-import org.apache.struts.action2.components.table.WebTable;
+import org.apache.struts2.components.table.WebTable;
 
 
 /**

core/src/main/java/org/apache/struts2/components/table/renderer/FixedTextCellRenderer.java

@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components.table.renderer;
+package org.apache.struts2.components.table.renderer;
 
-import org.apache.struts.action2.components.table.WebTable;
+import org.apache.struts2.components.table.WebTable;
 
 
 /**

core/src/main/java/org/apache/struts2/components/table/renderer/LinkCellRenderer.java

@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components.table.renderer;
+package org.apache.struts2.components.table.renderer;
 
-import org.apache.struts.action2.components.table.WebTable;
+import org.apache.struts2.components.table.WebTable;
 
 
 /**

core/src/main/java/org/apache/struts2/components/table/renderer/NumericCellRenderer.java

@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components.table.renderer;
+package org.apache.struts2.components.table.renderer;
 
-import org.apache.struts.action2.components.table.WebTable;
+import org.apache.struts2.components.table.WebTable;
 
 import java.text.DecimalFormat;
 

core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components.template;
+package org.apache.struts2.components.template;
 
 import com.opensymphony.util.ClassLoaderUtil;
 import org.apache.commons.logging.Log;

core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java

@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components.template;
+package org.apache.struts2.components.template;
 
-import org.apache.struts.action2.ServletActionContext;
-import org.apache.struts.action2.views.freemarker.FreemarkerManager;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.views.freemarker.FreemarkerManager;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionInvocation;
 import com.opensymphony.xwork.util.OgnlValueStack;

core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java

@@ -15,11 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components.template;
+package org.apache.struts2.components.template;
 
-import org.apache.struts.action2.ServletActionContext;
-import org.apache.struts.action2.components.Include;
-import org.apache.struts.action2.components.UIBean;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.components.Include;
+import org.apache.struts2.components.UIBean;
 import com.opensymphony.xwork.util.OgnlValueStack;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

core/src/main/java/org/apache/struts2/components/template/Template.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components.template;
+package org.apache.struts2.components.template;
 
 import java.util.ArrayList;
 import java.util.List;

core/src/main/java/org/apache/struts2/components/template/TemplateEngine.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components.template;
+package org.apache.struts2.components.template;
 
 import java.util.Map;
 

core/src/main/java/org/apache/struts2/components/template/TemplateEngineManager.java

@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components.template;
+package org.apache.struts2.components.template;
 
-import org.apache.struts.action2.config.Configuration;
+import org.apache.struts2.config.Configuration;
 
 import java.util.HashMap;
 import java.util.Map;

core/src/main/java/org/apache/struts2/components/template/TemplateRenderingContext.java

@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components.template;
+package org.apache.struts2.components.template;
 
-import org.apache.struts.action2.components.UIBean;
+import org.apache.struts2.components.UIBean;
 import com.opensymphony.xwork.util.OgnlValueStack;
 
 import java.io.Writer;

core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java

@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.components.template;
+package org.apache.struts2.components.template;
 
-import org.apache.struts.action2.ServletActionContext;
-import org.apache.struts.action2.views.velocity.VelocityManager;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.views.velocity.VelocityManager;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.velocity.app.VelocityEngine;

core/src/main/java/org/apache/struts2/config/Configuration.java

@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.config;
+package org.apache.struts2.config;
 
 import com.opensymphony.xwork.ObjectFactory;
-import org.apache.struts.action2.StrutsConstants;
+import org.apache.struts2.StrutsConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

core/src/main/java/org/apache/struts2/config/DefaultConfiguration.java

@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.config;
+package org.apache.struts2.config;
 
 import com.opensymphony.xwork.util.LocalizedTextUtil;
-import org.apache.struts.action2.StrutsConstants;
+import org.apache.struts2.StrutsConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -54,9 +54,9 @@ public class DefaultConfiguration extends Configuration {
         }
 
         try {
-            list.add(new PropertiesConfiguration("org/apache/struts/action2/default"));
+            list.add(new PropertiesConfiguration("org/apache/struts2/default"));
         } catch (Exception e) {
-            log.error("Could not find org/apache/struts/action2/default.properties", e);
+            log.error("Could not find org/apache/struts2/default.properties", e);
         }
 
         Configuration[] configList = new Configuration[list.size()];
@@ -87,7 +87,7 @@ public class DefaultConfiguration extends Configuration {
         // Add addtional list of i18n global resource bundles
         try {
 
-            LocalizedTextUtil.addDefaultResourceBundle("org/apache/struts/action2/struts-messages");
+            LocalizedTextUtil.addDefaultResourceBundle("org/apache/struts2/struts-messages");
             StringTokenizer bundleFiles = new StringTokenizer((String) config.getImpl(StrutsConstants.STRUTS_CUSTOM_I18N_RESOURCES), ", ");
 
             while (bundleFiles.hasMoreTokens()) {

core/src/main/java/org/apache/struts2/config/DelegatingConfiguration.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.config;
+package org.apache.struts2.config;
 
 import java.util.HashSet;
 import java.util.Iterator;

core/src/main/java/org/apache/struts2/config/PropertiesConfiguration.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.config;
+package org.apache.struts2.config;
 
 import java.io.IOException;
 import java.net.URL;

core/src/main/java/org/apache/struts2/config/ServletContextSingleton.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.config;
+package org.apache.struts2.config;
 
 import javax.servlet.ServletContext;
 
@@ -27,9 +27,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 org.apache.struts.action2.dispatcher.FilterDispatcherCompatWeblogic61}
+ * {@link org.apache.struts2.dispatcher.FilterDispatcherCompatWeblogic61}
  * before the servlet context is needed by
- * {@link org.apache.struts.action2.lifecycle.SessionLifecycleListener}
+ * {@link org.apache.struts2.lifecycle.SessionLifecycleListener}
  * which will use this object to get it.
  *
  */

core/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java

@@ -15,12 +15,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.config_browser;
+package org.apache.struts2.config_browser;
 
 import com.opensymphony.xwork.ActionSupport;
 import com.opensymphony.xwork.config.entities.ActionConfig;
-import org.apache.struts.action2.config.Configuration;
-import org.apache.struts.action2.StrutsConstants;
+import org.apache.struts2.config.Configuration;
+import org.apache.struts2.StrutsConstants;
 
 import java.util.Set;
 import java.util.TreeSet;

core/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.config_browser;
+package org.apache.struts2.config_browser;
 
 import com.opensymphony.xwork.XWorkStatic;
 import com.opensymphony.xwork.config.entities.ActionConfig;

core/src/main/java/org/apache/struts2/config_browser/ListValidatorsAction.java

@@ -15,12 +15,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.config_browser;
+package org.apache.struts2.config_browser;
 
 import com.opensymphony.xwork.ActionSupport;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.validator.ActionValidatorManagerFactory;
-import org.apache.struts.action2.util.ClassLoaderUtils;
+import org.apache.struts2.util.ClassLoaderUtils;
 
 import java.util.Collections;
 import java.util.List;

core/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.config_browser;
+package org.apache.struts2.config_browser;
 
 import com.opensymphony.xwork.ObjectFactory;
 import com.opensymphony.xwork.config.entities.ActionConfig;

core/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.config_browser;
+package org.apache.struts2.config_browser;
 
 import com.opensymphony.xwork.util.OgnlUtil;
 import com.opensymphony.xwork.validator.Validator;

core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.dispatcher;
+package org.apache.struts2.dispatcher;
 
 import com.opensymphony.xwork.ActionContext;
 

core/src/main/java/org/apache/struts2/dispatcher/ApplicationMap.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.struts.action2.dispatcher;
+package org.apache.struts2.dispatcher;
 
 import javax.servlet.ServletContext;
 import java.io.Serializable;