diff --git a/core/pom.xml b/core/pom.xml index 05eb1657d..1bc6ad18b 100644 --- a/core/pom.xml +++ b/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"> 4.0.0 - org.apache.struts.action2 - struts-action2-parent + org.apache.struts2 + struts2-parent 2.0-SNAPSHOT - org.apache.struts.action2 + org.apache.struts2 struts-core jar - Struts Action 2 - Core + Struts 2 - Core apache-site - scp://people.apache.org/www/struts.apache.org/struts-action2/struts-core + scp://people.apache.org/www/struts.apache.org/struts2/struts-core diff --git a/core/src/main/java/org/apache/struts/action2/Main.java b/core/src/main/java/org/apache/struts2/Main.java similarity index 97% rename from core/src/main/java/org/apache/struts/action2/Main.java rename to core/src/main/java/org/apache/struts2/Main.java index f79efe9d3..61418a93e 100644 --- a/core/src/main/java/org/apache/struts/action2/Main.java +++ b/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); } } diff --git a/core/src/main/java/org/apache/struts/action2/RequestUtils.java b/core/src/main/java/org/apache/struts2/RequestUtils.java similarity index 97% rename from core/src/main/java/org/apache/struts/action2/RequestUtils.java rename to core/src/main/java/org/apache/struts2/RequestUtils.java index b39b67ffe..70a959130 100644 --- a/core/src/main/java/org/apache/struts/action2/RequestUtils.java +++ b/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; diff --git a/core/src/main/java/org/apache/struts/action2/ServletActionContext.java b/core/src/main/java/org/apache/struts2/ServletActionContext.java similarity index 99% rename from core/src/main/java/org/apache/struts/action2/ServletActionContext.java rename to core/src/main/java/org/apache/struts2/ServletActionContext.java index 5f94ed877..ef5a687f2 100644 --- a/core/src/main/java/org/apache/struts/action2/ServletActionContext.java +++ b/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; diff --git a/core/src/main/java/org/apache/struts/action2/StrutsConstants.java b/core/src/main/java/org/apache/struts2/StrutsConstants.java similarity index 99% rename from core/src/main/java/org/apache/struts/action2/StrutsConstants.java rename to core/src/main/java/org/apache/struts2/StrutsConstants.java index 3e3631dfa..993e84056 100644 --- a/core/src/main/java/org/apache/struts/action2/StrutsConstants.java +++ b/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 diff --git a/core/src/main/java/org/apache/struts/action2/StrutsStatics.java b/core/src/main/java/org/apache/struts2/StrutsStatics.java similarity index 98% rename from core/src/main/java/org/apache/struts/action2/StrutsStatics.java rename to core/src/main/java/org/apache/struts2/StrutsStatics.java index 78eccdfee..969c42756 100644 --- a/core/src/main/java/org/apache/struts/action2/StrutsStatics.java +++ b/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; /** diff --git a/core/src/main/java/org/apache/struts/action2/StrutsTestCase.java b/core/src/main/java/org/apache/struts2/StrutsTestCase.java similarity index 88% rename from core/src/main/java/org/apache/struts/action2/StrutsTestCase.java rename to core/src/main/java/org/apache/struts2/StrutsTestCase.java index 2c32b5c79..d7ae778d2 100644 --- a/core/src/main/java/org/apache/struts/action2/StrutsTestCase.java +++ b/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; diff --git a/core/src/main/java/org/apache/struts/action2/components/AbstractRichtexteditorConnector.java b/core/src/main/java/org/apache/struts2/components/AbstractRichtexteditorConnector.java similarity index 97% rename from core/src/main/java/org/apache/struts/action2/components/AbstractRichtexteditorConnector.java rename to core/src/main/java/org/apache/struts2/components/AbstractRichtexteditorConnector.java index 181368b7b..a9329850b 100644 --- a/core/src/main/java/org/apache/struts/action2/components/AbstractRichtexteditorConnector.java +++ b/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; * * * <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" method="browse"> + * <action name="connector" class="org.apache.struts2.components.DefaultRichtexteditorConnector" method="browse"> * <result name="getFolders" type="richtexteditorGetFolders" /> * <result name="getFoldersAndFiles" type="richtexteditorGetFoldersAndFiles" /> * <result name="createFolder" type="richtexteditorCreateFolder" /> @@ -51,7 +51,7 @@ import com.opensymphony.xwork.ActionSupport; * </package> * * <package name="richtexteditor-upload" extends="struts-default" namespace="/struts/richtexteditor/editor/filemanager/upload"> - * <action name="uploader" class="org.apache.struts.action2.components.DefaultRichtexteditorConnector" method="upload"> + * <action name="uploader" class="org.apache.struts2.components.DefaultRichtexteditorConnector" method="upload"> * <result name="richtexteditorFileUpload" /> * </action> * </package> @@ -59,7 +59,7 @@ import com.opensymphony.xwork.ActionSupport; * * * - * @see org.apache.struts.action2.components.DefaultRichtexteditorConnector + * @see org.apache.struts2.components.DefaultRichtexteditorConnector */ public abstract class AbstractRichtexteditorConnector extends ActionSupport implements ServletRequestAware, ServletResponseAware { diff --git a/core/src/main/java/org/apache/struts/action2/components/ActionComponent.java b/core/src/main/java/org/apache/struts2/components/ActionComponent.java similarity index 96% rename from core/src/main/java/org/apache/struts/action2/components/ActionComponent.java rename to core/src/main/java/org/apache/struts2/components/ActionComponent.java index faf0f057f..9d82b68e2 100644 --- a/core/src/main/java/org/apache/struts/action2/components/ActionComponent.java +++ b/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; * * * - * @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"); diff --git a/core/src/main/java/org/apache/struts/action2/components/ActionError.java b/core/src/main/java/org/apache/struts2/components/ActionError.java similarity index 93% rename from core/src/main/java/org/apache/struts/action2/components/ActionError.java rename to core/src/main/java/org/apache/struts2/components/ActionError.java index c10099cee..25adf5126 100644 --- a/core/src/main/java/org/apache/struts/action2/components/ActionError.java +++ b/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; * * * - * @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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/ActionMessage.java b/core/src/main/java/org/apache/struts2/components/ActionMessage.java similarity index 93% rename from core/src/main/java/org/apache/struts/action2/components/ActionMessage.java rename to core/src/main/java/org/apache/struts2/components/ActionMessage.java index 8d0b0d3b4..018f8b5e5 100644 --- a/core/src/main/java/org/apache/struts/action2/components/ActionMessage.java +++ b/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; * * * - * @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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/Anchor.java b/core/src/main/java/org/apache/struts2/components/Anchor.java similarity index 97% rename from core/src/main/java/org/apache/struts/action2/components/Anchor.java rename to core/src/main/java/org/apache/struts2/components/Anchor.java index 0c4a2157e..68293b38f 100644 --- a/core/src/main/java/org/apache/struts/action2/components/Anchor.java +++ b/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; * * * - * @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" * */ diff --git a/core/src/main/java/org/apache/struts/action2/components/AppendIterator.java b/core/src/main/java/org/apache/struts2/components/AppendIterator.java similarity index 92% rename from core/src/main/java/org/apache/struts/action2/components/AppendIterator.java rename to core/src/main/java/org/apache/struts2/components/AppendIterator.java index 2c46e6040..8d43978c2 100644 --- a/core/src/main/java/org/apache/struts/action2/components/AppendIterator.java +++ b/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; * * * - * @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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/Bean.java b/core/src/main/java/org/apache/struts2/components/Bean.java similarity index 94% rename from core/src/main/java/org/apache/struts/action2/components/Bean.java rename to core/src/main/java/org/apache/struts2/components/Bean.java index 5f552c89d..e58d64863 100644 --- a/core/src/main/java/org/apache/struts/action2/components/Bean.java +++ b/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; * 
  * 
  * <-- in freemarker form -->
- * [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.

  * [/a:bean]
  *
  * <-- in jsp form -->
- * <a:bean name="org.apache.struts.action2.example.counter.SimpleCounter" id="counter">
+ * <a:bean name="org.apache.struts2.example.counter.SimpleCounter" id="counter">
  * 	 <a:param name="foo" value="BAR" />
  *   The value of foot is : <a:property value="foo"/>, when inside the bean tag <br />
  * </a:bean>
@@ -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 {
diff --git a/core/src/main/java/org/apache/struts/action2/components/Checkbox.java b/core/src/main/java/org/apache/struts2/components/Checkbox.java
similarity index 96%
rename from core/src/main/java/org/apache/struts/action2/components/Checkbox.java
rename to core/src/main/java/org/apache/struts2/components/Checkbox.java
index fb7a2afee..42cc65e3c 100644
--- a/core/src/main/java/org/apache/struts/action2/components/Checkbox.java
+++ b/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;
  * 
  *
* - * @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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/CheckboxList.java b/core/src/main/java/org/apache/struts2/components/CheckboxList.java similarity index 93% rename from core/src/main/java/org/apache/struts/action2/components/CheckboxList.java rename to core/src/main/java/org/apache/struts2/components/CheckboxList.java index 32c23ff35..331b1af40 100644 --- a/core/src/main/java/org/apache/struts/action2/components/CheckboxList.java +++ b/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; * * * - * @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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/ClosingUIBean.java b/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java similarity index 97% rename from core/src/main/java/org/apache/struts/action2/components/ClosingUIBean.java rename to core/src/main/java/org/apache/struts2/components/ClosingUIBean.java index ba29ff4cd..33803f470 100644 --- a/core/src/main/java/org/apache/struts/action2/components/ClosingUIBean.java +++ b/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; diff --git a/core/src/main/java/org/apache/struts/action2/components/ComboBox.java b/core/src/main/java/org/apache/struts2/components/ComboBox.java similarity index 97% rename from core/src/main/java/org/apache/struts/action2/components/ComboBox.java rename to core/src/main/java/org/apache/struts2/components/ComboBox.java index 8f35f89d9..c922b6537 100644 --- a/core/src/main/java/org/apache/struts/action2/components/ComboBox.java +++ b/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; /** * @@ -84,7 +84,7 @@ import org.apache.struts.action2.util.MakeIterator; * * * - * @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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/Component.java b/core/src/main/java/org/apache/struts2/components/Component.java similarity index 96% rename from core/src/main/java/org/apache/struts/action2/components/Component.java rename to core/src/main/java/org/apache/struts2/components/Component.java index 212200ac3..8c69c24f2 100644 --- a/core/src/main/java/org/apache/struts/action2/components/Component.java +++ b/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 diff --git a/core/src/main/java/org/apache/struts/action2/components/Date.java b/core/src/main/java/org/apache/struts2/components/Date.java similarity index 99% rename from core/src/main/java/org/apache/struts/action2/components/Date.java rename to core/src/main/java/org/apache/struts2/components/Date.java index ef990bdb1..9ef292d32 100644 --- a/core/src/main/java/org/apache/struts/action2/components/Date.java +++ b/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; * Date * * @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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/DatePicker.java b/core/src/main/java/org/apache/struts2/components/DatePicker.java similarity index 98% rename from core/src/main/java/org/apache/struts/action2/components/DatePicker.java rename to core/src/main/java/org/apache/struts2/components/DatePicker.java index 8fb35ff93..5d9358ddf 100644 --- a/core/src/main/java/org/apache/struts/action2/components/DatePicker.java +++ b/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; * * * - * @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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/DefaultRichtexteditorConnector.java b/core/src/main/java/org/apache/struts2/components/DefaultRichtexteditorConnector.java similarity index 97% rename from core/src/main/java/org/apache/struts/action2/components/DefaultRichtexteditorConnector.java rename to core/src/main/java/org/apache/struts2/components/DefaultRichtexteditorConnector.java index 25da48535..40922f766 100644 --- a/core/src/main/java/org/apache/struts/action2/components/DefaultRichtexteditorConnector.java +++ b/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. diff --git a/core/src/main/java/org/apache/struts/action2/components/Div.java b/core/src/main/java/org/apache/struts2/components/Div.java similarity index 97% rename from core/src/main/java/org/apache/struts/action2/components/Div.java rename to core/src/main/java/org/apache/struts2/components/Div.java index c6da600d9..8c8f22bc8 100644 --- a/core/src/main/java/org/apache/struts/action2/components/Div.java +++ b/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; * * * - * @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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/DoubleListUIBean.java b/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java similarity index 99% rename from core/src/main/java/org/apache/struts/action2/components/DoubleListUIBean.java rename to core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java index 5c4d435ce..2f9686e30 100644 --- a/core/src/main/java/org/apache/struts/action2/components/DoubleListUIBean.java +++ b/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; diff --git a/core/src/main/java/org/apache/struts/action2/components/DoubleSelect.java b/core/src/main/java/org/apache/struts2/components/DoubleSelect.java similarity index 95% rename from core/src/main/java/org/apache/struts/action2/components/DoubleSelect.java rename to core/src/main/java/org/apache/struts2/components/DoubleSelect.java index 403a0cb58..0b2bfe5a3 100644 --- a/core/src/main/java/org/apache/struts/action2/components/DoubleSelect.java +++ b/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; * * * - * @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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/Else.java b/core/src/main/java/org/apache/struts2/components/Else.java similarity index 94% rename from core/src/main/java/org/apache/struts/action2/components/Else.java rename to core/src/main/java/org/apache/struts2/components/Else.java index 57c2a75e8..9d3bde3c2 100644 --- a/core/src/main/java/org/apache/struts/action2/components/Else.java +++ b/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; * * * - * @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) { diff --git a/core/src/main/java/org/apache/struts/action2/components/ElseIf.java b/core/src/main/java/org/apache/struts2/components/ElseIf.java similarity index 95% rename from core/src/main/java/org/apache/struts/action2/components/ElseIf.java rename to core/src/main/java/org/apache/struts2/components/ElseIf.java index efbcf2be9..c0e5672f7 100644 --- a/core/src/main/java/org/apache/struts/action2/components/ElseIf.java +++ b/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; * * * - * @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) { diff --git a/core/src/main/java/org/apache/struts/action2/components/FieldError.java b/core/src/main/java/org/apache/struts2/components/FieldError.java similarity index 94% rename from core/src/main/java/org/apache/struts/action2/components/FieldError.java rename to core/src/main/java/org/apache/struts2/components/FieldError.java index 40bf83fde..199399c7a 100644 --- a/core/src/main/java/org/apache/struts/action2/components/FieldError.java +++ b/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; * * * - * @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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/File.java b/core/src/main/java/org/apache/struts2/components/File.java similarity index 97% rename from core/src/main/java/org/apache/struts/action2/components/File.java rename to core/src/main/java/org/apache/struts2/components/File.java index 19e740c44..f7945ecdb 100644 --- a/core/src/main/java/org/apache/struts/action2/components/File.java +++ b/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; * * * - * @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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/Form.java b/core/src/main/java/org/apache/struts2/components/Form.java similarity index 97% rename from core/src/main/java/org/apache/struts/action2/components/Form.java rename to core/src/main/java/org/apache/struts2/components/Form.java index b1022c452..3f7b15125 100644 --- a/core/src/main/java/org/apache/struts/action2/components/Form.java +++ b/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; * * * - * @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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/FormButton.java b/core/src/main/java/org/apache/struts2/components/FormButton.java similarity index 98% rename from core/src/main/java/org/apache/struts/action2/components/FormButton.java rename to core/src/main/java/org/apache/struts2/components/FormButton.java index d9a0a85f3..bf263a3c2 100644 --- a/core/src/main/java/org/apache/struts/action2/components/FormButton.java +++ b/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; diff --git a/core/src/main/java/org/apache/struts/action2/components/GenericUIBean.java b/core/src/main/java/org/apache/struts2/components/GenericUIBean.java similarity index 96% rename from core/src/main/java/org/apache/struts/action2/components/GenericUIBean.java rename to core/src/main/java/org/apache/struts2/components/GenericUIBean.java index db1c60e5b..6e668b231 100644 --- a/core/src/main/java/org/apache/struts/action2/components/GenericUIBean.java +++ b/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; * * * - * @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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/Head.java b/core/src/main/java/org/apache/struts2/components/Head.java similarity index 95% rename from core/src/main/java/org/apache/struts/action2/components/Head.java rename to core/src/main/java/org/apache/struts2/components/Head.java index 949480eac..19fe862e2 100644 --- a/core/src/main/java/org/apache/struts/action2/components/Head.java +++ b/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; * * * - * @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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/Hidden.java b/core/src/main/java/org/apache/struts2/components/Hidden.java similarity index 95% rename from core/src/main/java/org/apache/struts/action2/components/Hidden.java rename to core/src/main/java/org/apache/struts2/components/Hidden.java index 8d673b636..435f631ad 100644 --- a/core/src/main/java/org/apache/struts/action2/components/Hidden.java +++ b/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; * * * - * @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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/I18n.java b/core/src/main/java/org/apache/struts2/components/I18n.java similarity index 97% rename from core/src/main/java/org/apache/struts/action2/components/I18n.java rename to core/src/main/java/org/apache/struts2/components/I18n.java index 535a08a77..d9d45307c 100644 --- a/core/src/main/java/org/apache/struts/action2/components/I18n.java +++ b/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; * * * - * @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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/If.java b/core/src/main/java/org/apache/struts2/components/If.java similarity index 95% rename from core/src/main/java/org/apache/struts/action2/components/If.java rename to core/src/main/java/org/apache/struts2/components/If.java index 1deea85ae..65a2412a7 100644 --- a/core/src/main/java/org/apache/struts/action2/components/If.java +++ b/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"; diff --git a/core/src/main/java/org/apache/struts/action2/components/Include.java b/core/src/main/java/org/apache/struts2/components/Include.java similarity index 97% rename from core/src/main/java/org/apache/struts/action2/components/Include.java rename to core/src/main/java/org/apache/struts2/components/Include.java index 3a5b6fb31..4539f9223 100644 --- a/core/src/main/java/org/apache/struts/action2/components/Include.java +++ b/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.*; * * * - * @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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/IteratorComponent.java b/core/src/main/java/org/apache/struts2/components/IteratorComponent.java similarity index 97% rename from core/src/main/java/org/apache/struts/action2/components/IteratorComponent.java rename to core/src/main/java/org/apache/struts2/components/IteratorComponent.java index 84716e257..c8bda9978 100644 --- a/core/src/main/java/org/apache/struts/action2/components/IteratorComponent.java +++ b/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; * 
  * 
  * 
- * <a:bean name="org.apache.struts.action2.example.IteratorExample" id="it">
+ * <a:bean name="org.apache.struts2.example.IteratorExample" id="it">
  *   <a:param name="day" value="'foo'"/>
  *   <a:param name="day" value="'bar'"/>
  * </a:bean>
@@ -175,7 +175,7 @@ import java.util.Iterator;
  * 
  *
* - * @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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/Label.java b/core/src/main/java/org/apache/struts2/components/Label.java similarity index 96% rename from core/src/main/java/org/apache/struts/action2/components/Label.java rename to core/src/main/java/org/apache/struts2/components/Label.java index 0746bf01e..a4d13bae4 100644 --- a/core/src/main/java/org/apache/struts/action2/components/Label.java +++ b/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; * * * - * @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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/ListUIBean.java b/core/src/main/java/org/apache/struts2/components/ListUIBean.java similarity index 97% rename from core/src/main/java/org/apache/struts/action2/components/ListUIBean.java rename to core/src/main/java/org/apache/struts2/components/ListUIBean.java index f120eac40..e69d3aa8b 100644 --- a/core/src/main/java/org/apache/struts/action2/components/ListUIBean.java +++ b/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; diff --git a/core/src/main/java/org/apache/struts/action2/components/MergeIterator.java b/core/src/main/java/org/apache/struts2/components/MergeIterator.java similarity index 92% rename from core/src/main/java/org/apache/struts/action2/components/MergeIterator.java rename to core/src/main/java/org/apache/struts2/components/MergeIterator.java index 48c5de293..b36e69072 100644 --- a/core/src/main/java/org/apache/struts/action2/components/MergeIterator.java +++ b/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". * * - * @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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/OptionTransferSelect.java b/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java similarity index 99% rename from core/src/main/java/org/apache/struts/action2/components/OptionTransferSelect.java rename to core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java index 58a7730fb..a47320e48 100644 --- a/core/src/main/java/org/apache/struts/action2/components/OptionTransferSelect.java +++ b/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; * * * - * @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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/Panel.java b/core/src/main/java/org/apache/struts2/components/Panel.java similarity index 97% rename from core/src/main/java/org/apache/struts/action2/components/Panel.java rename to core/src/main/java/org/apache/struts2/components/Panel.java index 6d8ec9225..71805fb03 100644 --- a/core/src/main/java/org/apache/struts/action2/components/Panel.java +++ b/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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/Param.java b/core/src/main/java/org/apache/struts2/components/Param.java similarity index 98% rename from core/src/main/java/org/apache/struts/action2/components/Param.java rename to core/src/main/java/org/apache/struts2/components/Param.java index 716f379cb..c8ccd4564 100644 --- a/core/src/main/java/org/apache/struts/action2/components/Param.java +++ b/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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/Password.java b/core/src/main/java/org/apache/struts2/components/Password.java similarity index 96% rename from core/src/main/java/org/apache/struts/action2/components/Password.java rename to core/src/main/java/org/apache/struts2/components/Password.java index 581dd761a..ba6b3d879 100644 --- a/core/src/main/java/org/apache/struts/action2/components/Password.java +++ b/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; * * * - * @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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/Property.java b/core/src/main/java/org/apache/struts2/components/Property.java similarity index 97% rename from core/src/main/java/org/apache/struts/action2/components/Property.java rename to core/src/main/java/org/apache/struts2/components/Property.java index c038cf6c0..e2229bdb9 100644 --- a/core/src/main/java/org/apache/struts/action2/components/Property.java +++ b/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; * * * - * @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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/Push.java b/core/src/main/java/org/apache/struts2/components/Push.java similarity index 98% rename from core/src/main/java/org/apache/struts/action2/components/Push.java rename to core/src/main/java/org/apache/struts2/components/Push.java index cc55cf0ec..da9f9d3cd 100644 --- a/core/src/main/java/org/apache/struts/action2/components/Push.java +++ b/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; * * * - * @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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/Radio.java b/core/src/main/java/org/apache/struts2/components/Radio.java similarity index 95% rename from core/src/main/java/org/apache/struts/action2/components/Radio.java rename to core/src/main/java/org/apache/struts2/components/Radio.java index 7fa51750f..cb3d07736 100644 --- a/core/src/main/java/org/apache/struts/action2/components/Radio.java +++ b/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; * * * - * @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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/RemoteCallUIBean.java b/core/src/main/java/org/apache/struts2/components/RemoteCallUIBean.java similarity index 98% rename from core/src/main/java/org/apache/struts/action2/components/RemoteCallUIBean.java rename to core/src/main/java/org/apache/struts2/components/RemoteCallUIBean.java index b8fd1edbd..0ac0ddec0 100644 --- a/core/src/main/java/org/apache/struts/action2/components/RemoteCallUIBean.java +++ b/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; diff --git a/core/src/main/java/org/apache/struts/action2/components/Reset.java b/core/src/main/java/org/apache/struts2/components/Reset.java similarity index 96% rename from core/src/main/java/org/apache/struts/action2/components/Reset.java rename to core/src/main/java/org/apache/struts2/components/Reset.java index 3021d56ce..c61a6ca06 100644 --- a/core/src/main/java/org/apache/struts/action2/components/Reset.java +++ b/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; * * * - * @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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/RichTextEditor.java b/core/src/main/java/org/apache/struts2/components/RichTextEditor.java similarity index 99% rename from core/src/main/java/org/apache/struts/action2/components/RichTextEditor.java rename to core/src/main/java/org/apache/struts2/components/RichTextEditor.java index f9bab52d0..27f348e69 100644 --- a/core/src/main/java/org/apache/struts/action2/components/RichTextEditor.java +++ b/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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/Select.java b/core/src/main/java/org/apache/struts2/components/Select.java similarity index 98% rename from core/src/main/java/org/apache/struts/action2/components/Select.java rename to core/src/main/java/org/apache/struts2/components/Select.java index e9ae00158..c4d557270 100644 --- a/core/src/main/java/org/apache/struts/action2/components/Select.java +++ b/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; * * * - * @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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/Set.java b/core/src/main/java/org/apache/struts2/components/Set.java similarity index 98% rename from core/src/main/java/org/apache/struts/action2/components/Set.java rename to core/src/main/java/org/apache/struts2/components/Set.java index 16af7f06d..70bf2f16d 100644 --- a/core/src/main/java/org/apache/struts/action2/components/Set.java +++ b/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; * * * - * @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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/Submit.java b/core/src/main/java/org/apache/struts2/components/Submit.java similarity index 99% rename from core/src/main/java/org/apache/struts/action2/components/Submit.java rename to core/src/main/java/org/apache/struts2/components/Submit.java index 082d5e514..e39644c1b 100644 --- a/core/src/main/java/org/apache/struts/action2/components/Submit.java +++ b/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; * * * - * @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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/TabbedPanel.java b/core/src/main/java/org/apache/struts2/components/TabbedPanel.java similarity index 98% rename from core/src/main/java/org/apache/struts/action2/components/TabbedPanel.java rename to core/src/main/java/org/apache/struts2/components/TabbedPanel.java index 596c27801..eaac1b043 100644 --- a/core/src/main/java/org/apache/struts/action2/components/TabbedPanel.java +++ b/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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/Text.java b/core/src/main/java/org/apache/struts2/components/Text.java similarity index 98% rename from core/src/main/java/org/apache/struts/action2/components/Text.java rename to core/src/main/java/org/apache/struts2/components/Text.java index 419c5b77c..5450357f9 100644 --- a/core/src/main/java/org/apache/struts/action2/components/Text.java +++ b/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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/TextArea.java b/core/src/main/java/org/apache/struts2/components/TextArea.java similarity index 96% rename from core/src/main/java/org/apache/struts/action2/components/TextArea.java rename to core/src/main/java/org/apache/struts2/components/TextArea.java index 8428ae8a6..b83dbe3f8 100644 --- a/core/src/main/java/org/apache/struts/action2/components/TextArea.java +++ b/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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/TextField.java b/core/src/main/java/org/apache/struts2/components/TextField.java similarity index 96% rename from core/src/main/java/org/apache/struts/action2/components/TextField.java rename to core/src/main/java/org/apache/struts2/components/TextField.java index bac1a38fb..1fc3a0c9c 100644 --- a/core/src/main/java/org/apache/struts/action2/components/TextField.java +++ b/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; * * * - * @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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/Token.java b/core/src/main/java/org/apache/struts2/components/Token.java similarity index 90% rename from core/src/main/java/org/apache/struts/action2/components/Token.java rename to core/src/main/java/org/apache/struts2/components/Token.java index 1d0cbd0a0..13bfc23e2 100644 --- a/core/src/main/java/org/apache/struts/action2/components/Token.java +++ b/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; * * * - * @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. diff --git a/core/src/main/java/org/apache/struts/action2/components/Tree.java b/core/src/main/java/org/apache/struts2/components/Tree.java similarity index 99% rename from core/src/main/java/org/apache/struts/action2/components/Tree.java rename to core/src/main/java/org/apache/struts2/components/Tree.java index b6614ec47..f63af1dce 100644 --- a/core/src/main/java/org/apache/struts/action2/components/Tree.java +++ b/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; * * * - * @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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/TreeNode.java b/core/src/main/java/org/apache/struts2/components/TreeNode.java similarity index 96% rename from core/src/main/java/org/apache/struts/action2/components/TreeNode.java rename to core/src/main/java/org/apache/struts2/components/TreeNode.java index 65f5805f8..a50b541b1 100644 --- a/core/src/main/java/org/apache/struts/action2/components/TreeNode.java +++ b/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; * * * - * @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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/UIBean.java b/core/src/main/java/org/apache/struts2/components/UIBean.java similarity index 98% rename from core/src/main/java/org/apache/struts/action2/components/UIBean.java rename to core/src/main/java/org/apache/struts2/components/UIBean.java index ee425d138..7cecf0ea3 100644 --- a/core/src/main/java/org/apache/struts/action2/components/UIBean.java +++ b/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; diff --git a/core/src/main/java/org/apache/struts/action2/components/URL.java b/core/src/main/java/org/apache/struts2/components/URL.java similarity index 97% rename from core/src/main/java/org/apache/struts/action2/components/URL.java rename to core/src/main/java/org/apache/struts2/components/URL.java index b3b7df1af..de3d04609 100644 --- a/core/src/main/java/org/apache/struts/action2/components/URL.java +++ b/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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/UpDownSelect.java b/core/src/main/java/org/apache/struts2/components/UpDownSelect.java similarity index 98% rename from core/src/main/java/org/apache/struts/action2/components/UpDownSelect.java rename to core/src/main/java/org/apache/struts2/components/UpDownSelect.java index e0dfd39a0..fd2b9e018 100644 --- a/core/src/main/java/org/apache/struts/action2/components/UpDownSelect.java +++ b/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 { diff --git a/core/src/main/java/org/apache/struts/action2/components/table/AbstractFilterModel.java b/core/src/main/java/org/apache/struts2/components/table/AbstractFilterModel.java similarity index 98% rename from core/src/main/java/org/apache/struts/action2/components/table/AbstractFilterModel.java rename to core/src/main/java/org/apache/struts2/components/table/AbstractFilterModel.java index c0fef10a9..5c097827e 100644 --- a/core/src/main/java/org/apache/struts/action2/components/table/AbstractFilterModel.java +++ b/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; diff --git a/core/src/main/java/org/apache/struts/action2/components/table/RenderFilterModel.java b/core/src/main/java/org/apache/struts2/components/table/RenderFilterModel.java similarity index 95% rename from core/src/main/java/org/apache/struts/action2/components/table/RenderFilterModel.java rename to core/src/main/java/org/apache/struts2/components/table/RenderFilterModel.java index f84e7e710..c9b5469b6 100644 --- a/core/src/main/java/org/apache/struts/action2/components/table/RenderFilterModel.java +++ b/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; diff --git a/core/src/main/java/org/apache/struts/action2/components/table/SortFilterModel.java b/core/src/main/java/org/apache/struts2/components/table/SortFilterModel.java similarity index 99% rename from core/src/main/java/org/apache/struts/action2/components/table/SortFilterModel.java rename to core/src/main/java/org/apache/struts2/components/table/SortFilterModel.java index 219dc0ba5..be82b2f0b 100644 --- a/core/src/main/java/org/apache/struts/action2/components/table/SortFilterModel.java +++ b/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; diff --git a/core/src/main/java/org/apache/struts/action2/components/table/SortableTableModel.java b/core/src/main/java/org/apache/struts2/components/table/SortableTableModel.java similarity index 95% rename from core/src/main/java/org/apache/struts/action2/components/table/SortableTableModel.java rename to core/src/main/java/org/apache/struts2/components/table/SortableTableModel.java index 916e4e258..fbbdf7d6d 100644 --- a/core/src/main/java/org/apache/struts/action2/components/table/SortableTableModel.java +++ b/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; diff --git a/core/src/main/java/org/apache/struts/action2/components/table/WebTable.java b/core/src/main/java/org/apache/struts2/components/table/WebTable.java similarity index 97% rename from core/src/main/java/org/apache/struts/action2/components/table/WebTable.java rename to core/src/main/java/org/apache/struts2/components/table/WebTable.java index 0b928480e..93f2f327f 100644 --- a/core/src/main/java/org/apache/struts/action2/components/table/WebTable.java +++ b/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) { diff --git a/core/src/main/java/org/apache/struts/action2/components/table/WebTableColumn.java b/core/src/main/java/org/apache/struts2/components/table/WebTableColumn.java similarity index 89% rename from core/src/main/java/org/apache/struts/action2/components/table/WebTableColumn.java rename to core/src/main/java/org/apache/struts2/components/table/WebTableColumn.java index 944fa73e4..04069599c 100644 --- a/core/src/main/java/org/apache/struts/action2/components/table/WebTableColumn.java +++ b/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; /** diff --git a/core/src/main/java/org/apache/struts/action2/components/table/renderer/AbstractCellRenderer.java b/core/src/main/java/org/apache/struts2/components/table/renderer/AbstractCellRenderer.java similarity index 94% rename from core/src/main/java/org/apache/struts/action2/components/table/renderer/AbstractCellRenderer.java rename to core/src/main/java/org/apache/struts2/components/table/renderer/AbstractCellRenderer.java index 767681e28..4e901e695 100644 --- a/core/src/main/java/org/apache/struts/action2/components/table/renderer/AbstractCellRenderer.java +++ b/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; /** diff --git a/core/src/main/java/org/apache/struts/action2/components/table/renderer/BooleanCellRenderer.java b/core/src/main/java/org/apache/struts2/components/table/renderer/BooleanCellRenderer.java similarity index 92% rename from core/src/main/java/org/apache/struts/action2/components/table/renderer/BooleanCellRenderer.java rename to core/src/main/java/org/apache/struts2/components/table/renderer/BooleanCellRenderer.java index ad80b3422..44e228fb3 100644 --- a/core/src/main/java/org/apache/struts/action2/components/table/renderer/BooleanCellRenderer.java +++ b/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; /** diff --git a/core/src/main/java/org/apache/struts/action2/components/table/renderer/CellRenderer.java b/core/src/main/java/org/apache/struts2/components/table/renderer/CellRenderer.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/components/table/renderer/CellRenderer.java rename to core/src/main/java/org/apache/struts2/components/table/renderer/CellRenderer.java index 573410214..40ccd103a 100644 --- a/core/src/main/java/org/apache/struts/action2/components/table/renderer/CellRenderer.java +++ b/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; /** */ diff --git a/core/src/main/java/org/apache/struts/action2/components/table/renderer/DateCellRenderer.java b/core/src/main/java/org/apache/struts2/components/table/renderer/DateCellRenderer.java similarity index 92% rename from core/src/main/java/org/apache/struts/action2/components/table/renderer/DateCellRenderer.java rename to core/src/main/java/org/apache/struts2/components/table/renderer/DateCellRenderer.java index fcb969c3b..ab80655bb 100644 --- a/core/src/main/java/org/apache/struts/action2/components/table/renderer/DateCellRenderer.java +++ b/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; diff --git a/core/src/main/java/org/apache/struts/action2/components/table/renderer/DefaultCellRenderer.java b/core/src/main/java/org/apache/struts2/components/table/renderer/DefaultCellRenderer.java similarity index 88% rename from core/src/main/java/org/apache/struts/action2/components/table/renderer/DefaultCellRenderer.java rename to core/src/main/java/org/apache/struts2/components/table/renderer/DefaultCellRenderer.java index de76759b0..032a5082f 100644 --- a/core/src/main/java/org/apache/struts/action2/components/table/renderer/DefaultCellRenderer.java +++ b/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; /** diff --git a/core/src/main/java/org/apache/struts/action2/components/table/renderer/FixedTextCellRenderer.java b/core/src/main/java/org/apache/struts2/components/table/renderer/FixedTextCellRenderer.java similarity index 90% rename from core/src/main/java/org/apache/struts/action2/components/table/renderer/FixedTextCellRenderer.java rename to core/src/main/java/org/apache/struts2/components/table/renderer/FixedTextCellRenderer.java index 97b8e9cc4..71e2a0870 100644 --- a/core/src/main/java/org/apache/struts/action2/components/table/renderer/FixedTextCellRenderer.java +++ b/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; /** diff --git a/core/src/main/java/org/apache/struts/action2/components/table/renderer/LinkCellRenderer.java b/core/src/main/java/org/apache/struts2/components/table/renderer/LinkCellRenderer.java similarity index 98% rename from core/src/main/java/org/apache/struts/action2/components/table/renderer/LinkCellRenderer.java rename to core/src/main/java/org/apache/struts2/components/table/renderer/LinkCellRenderer.java index 3562da01a..67e97be13 100644 --- a/core/src/main/java/org/apache/struts/action2/components/table/renderer/LinkCellRenderer.java +++ b/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; /** diff --git a/core/src/main/java/org/apache/struts/action2/components/table/renderer/NumericCellRenderer.java b/core/src/main/java/org/apache/struts2/components/table/renderer/NumericCellRenderer.java similarity index 95% rename from core/src/main/java/org/apache/struts/action2/components/table/renderer/NumericCellRenderer.java rename to core/src/main/java/org/apache/struts2/components/table/renderer/NumericCellRenderer.java index b3b91b545..c77e56733 100644 --- a/core/src/main/java/org/apache/struts/action2/components/table/renderer/NumericCellRenderer.java +++ b/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; diff --git a/core/src/main/java/org/apache/struts/action2/components/table/renderer/package.html b/core/src/main/java/org/apache/struts2/components/table/renderer/package.html similarity index 100% rename from core/src/main/java/org/apache/struts/action2/components/table/renderer/package.html rename to core/src/main/java/org/apache/struts2/components/table/renderer/package.html diff --git a/core/src/main/java/org/apache/struts/action2/components/template/BaseTemplateEngine.java b/core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java similarity index 97% rename from core/src/main/java/org/apache/struts/action2/components/template/BaseTemplateEngine.java rename to core/src/main/java/org/apache/struts2/components/template/BaseTemplateEngine.java index 4628c5776..f2fb3aa25 100644 --- a/core/src/main/java/org/apache/struts/action2/components/template/BaseTemplateEngine.java +++ b/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; diff --git a/core/src/main/java/org/apache/struts/action2/components/template/FreemarkerTemplateEngine.java b/core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java similarity index 96% rename from core/src/main/java/org/apache/struts/action2/components/template/FreemarkerTemplateEngine.java rename to core/src/main/java/org/apache/struts2/components/template/FreemarkerTemplateEngine.java index ffb367553..f3ac5e33f 100644 --- a/core/src/main/java/org/apache/struts/action2/components/template/FreemarkerTemplateEngine.java +++ b/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; diff --git a/core/src/main/java/org/apache/struts/action2/components/template/JspTemplateEngine.java b/core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java similarity index 92% rename from core/src/main/java/org/apache/struts/action2/components/template/JspTemplateEngine.java rename to core/src/main/java/org/apache/struts2/components/template/JspTemplateEngine.java index 03d074772..392c3eb61 100644 --- a/core/src/main/java/org/apache/struts/action2/components/template/JspTemplateEngine.java +++ b/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; diff --git a/core/src/main/java/org/apache/struts/action2/components/template/Template.java b/core/src/main/java/org/apache/struts2/components/template/Template.java similarity index 97% rename from core/src/main/java/org/apache/struts/action2/components/template/Template.java rename to core/src/main/java/org/apache/struts2/components/template/Template.java index c1e329428..f0bf1c4b7 100644 --- a/core/src/main/java/org/apache/struts/action2/components/template/Template.java +++ b/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; diff --git a/core/src/main/java/org/apache/struts/action2/components/template/TemplateEngine.java b/core/src/main/java/org/apache/struts2/components/template/TemplateEngine.java similarity index 96% rename from core/src/main/java/org/apache/struts/action2/components/template/TemplateEngine.java rename to core/src/main/java/org/apache/struts2/components/template/TemplateEngine.java index 6be03b8e9..83f66e1f0 100644 --- a/core/src/main/java/org/apache/struts/action2/components/template/TemplateEngine.java +++ b/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; diff --git a/core/src/main/java/org/apache/struts/action2/components/template/TemplateEngineManager.java b/core/src/main/java/org/apache/struts2/components/template/TemplateEngineManager.java similarity index 96% rename from core/src/main/java/org/apache/struts/action2/components/template/TemplateEngineManager.java rename to core/src/main/java/org/apache/struts2/components/template/TemplateEngineManager.java index eea01e74e..b6d6baf91 100644 --- a/core/src/main/java/org/apache/struts/action2/components/template/TemplateEngineManager.java +++ b/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; diff --git a/core/src/main/java/org/apache/struts/action2/components/template/TemplateRenderingContext.java b/core/src/main/java/org/apache/struts2/components/template/TemplateRenderingContext.java similarity index 94% rename from core/src/main/java/org/apache/struts/action2/components/template/TemplateRenderingContext.java rename to core/src/main/java/org/apache/struts2/components/template/TemplateRenderingContext.java index c28c6f750..9f94f12ab 100644 --- a/core/src/main/java/org/apache/struts/action2/components/template/TemplateRenderingContext.java +++ b/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; diff --git a/core/src/main/java/org/apache/struts/action2/components/template/VelocityTemplateEngine.java b/core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java similarity index 95% rename from core/src/main/java/org/apache/struts/action2/components/template/VelocityTemplateEngine.java rename to core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java index ab8faa605..81d7a3921 100644 --- a/core/src/main/java/org/apache/struts/action2/components/template/VelocityTemplateEngine.java +++ b/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; diff --git a/core/src/main/java/org/apache/struts/action2/config/Configuration.java b/core/src/main/java/org/apache/struts2/config/Configuration.java similarity index 98% rename from core/src/main/java/org/apache/struts/action2/config/Configuration.java rename to core/src/main/java/org/apache/struts2/config/Configuration.java index 6451739fe..9a2bd51a1 100644 --- a/core/src/main/java/org/apache/struts/action2/config/Configuration.java +++ b/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; diff --git a/core/src/main/java/org/apache/struts/action2/config/DefaultConfiguration.java b/core/src/main/java/org/apache/struts2/config/DefaultConfiguration.java similarity index 95% rename from core/src/main/java/org/apache/struts/action2/config/DefaultConfiguration.java rename to core/src/main/java/org/apache/struts2/config/DefaultConfiguration.java index e3039046d..eb01ea7dd 100644 --- a/core/src/main/java/org/apache/struts/action2/config/DefaultConfiguration.java +++ b/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()) { diff --git a/core/src/main/java/org/apache/struts/action2/config/DelegatingConfiguration.java b/core/src/main/java/org/apache/struts2/config/DelegatingConfiguration.java similarity index 99% rename from core/src/main/java/org/apache/struts/action2/config/DelegatingConfiguration.java rename to core/src/main/java/org/apache/struts2/config/DelegatingConfiguration.java index afd8a54e0..b4af3733e 100644 --- a/core/src/main/java/org/apache/struts/action2/config/DelegatingConfiguration.java +++ b/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; diff --git a/core/src/main/java/org/apache/struts/action2/config/PropertiesConfiguration.java b/core/src/main/java/org/apache/struts2/config/PropertiesConfiguration.java similarity index 98% rename from core/src/main/java/org/apache/struts/action2/config/PropertiesConfiguration.java rename to core/src/main/java/org/apache/struts2/config/PropertiesConfiguration.java index e2024c365..dfad447ac 100644 --- a/core/src/main/java/org/apache/struts/action2/config/PropertiesConfiguration.java +++ b/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; diff --git a/core/src/main/java/org/apache/struts/action2/config/ServletContextSingleton.java b/core/src/main/java/org/apache/struts2/config/ServletContextSingleton.java similarity index 91% rename from core/src/main/java/org/apache/struts/action2/config/ServletContextSingleton.java rename to core/src/main/java/org/apache/struts2/config/ServletContextSingleton.java index c7657ef0a..8f8e6ea67 100644 --- a/core/src/main/java/org/apache/struts/action2/config/ServletContextSingleton.java +++ b/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. *

* 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. * */ diff --git a/core/src/main/java/org/apache/struts/action2/config/package.html b/core/src/main/java/org/apache/struts2/config/package.html similarity index 100% rename from core/src/main/java/org/apache/struts/action2/config/package.html rename to core/src/main/java/org/apache/struts2/config/package.html diff --git a/core/src/main/java/org/apache/struts/action2/config_browser/ActionNamesAction.java b/core/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java similarity index 93% rename from core/src/main/java/org/apache/struts/action2/config_browser/ActionNamesAction.java rename to core/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java index 217bbfcf1..c8671477b 100644 --- a/core/src/main/java/org/apache/struts/action2/config_browser/ActionNamesAction.java +++ b/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; diff --git a/core/src/main/java/org/apache/struts/action2/config_browser/ConfigurationHelper.java b/core/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java similarity index 97% rename from core/src/main/java/org/apache/struts/action2/config_browser/ConfigurationHelper.java rename to core/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java index 26ee33b91..8c20ce849 100644 --- a/core/src/main/java/org/apache/struts/action2/config_browser/ConfigurationHelper.java +++ b/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; diff --git a/core/src/main/java/org/apache/struts/action2/config_browser/ListValidatorsAction.java b/core/src/main/java/org/apache/struts2/config_browser/ListValidatorsAction.java similarity index 95% rename from core/src/main/java/org/apache/struts/action2/config_browser/ListValidatorsAction.java rename to core/src/main/java/org/apache/struts2/config_browser/ListValidatorsAction.java index f314f39fb..065e89b96 100644 --- a/core/src/main/java/org/apache/struts/action2/config_browser/ListValidatorsAction.java +++ b/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; diff --git a/core/src/main/java/org/apache/struts/action2/config_browser/ShowConfigAction.java b/core/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java similarity index 98% rename from core/src/main/java/org/apache/struts/action2/config_browser/ShowConfigAction.java rename to core/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java index b5124210a..c5fc4d65b 100644 --- a/core/src/main/java/org/apache/struts/action2/config_browser/ShowConfigAction.java +++ b/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; diff --git a/core/src/main/java/org/apache/struts/action2/config_browser/ShowValidatorAction.java b/core/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java similarity index 99% rename from core/src/main/java/org/apache/struts/action2/config_browser/ShowValidatorAction.java rename to core/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java index 83d979442..42ceb64af 100644 --- a/core/src/main/java/org/apache/struts/action2/config_browser/ShowValidatorAction.java +++ b/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; diff --git a/core/src/main/java/org/apache/struts/action2/dispatcher/ActionContextCleanUp.java b/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java similarity index 98% rename from core/src/main/java/org/apache/struts/action2/dispatcher/ActionContextCleanUp.java rename to core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java index 2ff5b72bd..aae56a295 100644 --- a/core/src/main/java/org/apache/struts/action2/dispatcher/ActionContextCleanUp.java +++ b/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; diff --git a/core/src/main/java/org/apache/struts/action2/dispatcher/ApplicationMap.java b/core/src/main/java/org/apache/struts2/dispatcher/ApplicationMap.java similarity index 99% rename from core/src/main/java/org/apache/struts/action2/dispatcher/ApplicationMap.java rename to core/src/main/java/org/apache/struts2/dispatcher/ApplicationMap.java index 39efdba8f..8b752ef7a 100644 --- a/core/src/main/java/org/apache/struts/action2/dispatcher/ApplicationMap.java +++ b/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; diff --git a/core/src/main/java/org/apache/struts/action2/dispatcher/DefaultActionSupport.java b/core/src/main/java/org/apache/struts2/dispatcher/DefaultActionSupport.java similarity index 94% rename from core/src/main/java/org/apache/struts/action2/dispatcher/DefaultActionSupport.java rename to core/src/main/java/org/apache/struts2/dispatcher/DefaultActionSupport.java index 0663137d9..e7d0cae87 100644 --- a/core/src/main/java/org/apache/struts/action2/dispatcher/DefaultActionSupport.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/DefaultActionSupport.java @@ -15,12 +15,12 @@ * 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.http.HttpServletRequest; -import org.apache.struts.action2.ServletActionContext; +import org.apache.struts2.ServletActionContext; import com.opensymphony.xwork.ActionSupport; /** diff --git a/core/src/main/java/org/apache/struts/action2/dispatcher/DispatcherUtils.java b/core/src/main/java/org/apache/struts2/dispatcher/DispatcherUtils.java similarity index 94% rename from core/src/main/java/org/apache/struts/action2/dispatcher/DispatcherUtils.java rename to core/src/main/java/org/apache/struts2/dispatcher/DispatcherUtils.java index 2cde54784..20d172590 100644 --- a/core/src/main/java/org/apache/struts/action2/dispatcher/DispatcherUtils.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/DispatcherUtils.java @@ -15,20 +15,20 @@ * 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.util.ClassLoaderUtil; import com.opensymphony.util.FileManager; -import org.apache.struts.action2.ServletActionContext; -import org.apache.struts.action2.StrutsStatics; -import org.apache.struts.action2.StrutsConstants; -import org.apache.struts.action2.config.Configuration; -import org.apache.struts.action2.dispatcher.mapper.ActionMapping; -import org.apache.struts.action2.dispatcher.multipart.MultiPartRequest; -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 org.apache.struts2.ServletActionContext; +import org.apache.struts2.StrutsStatics; +import org.apache.struts2.StrutsConstants; +import org.apache.struts2.config.Configuration; +import org.apache.struts2.dispatcher.mapper.ActionMapping; +import org.apache.struts2.dispatcher.multipart.MultiPartRequest; +import org.apache.struts2.dispatcher.multipart.MultiPartRequestWrapper; +import org.apache.struts2.util.AttributeMap; +import org.apache.struts2.util.ObjectFactoryDestroyable; +import org.apache.struts2.util.ObjectFactoryInitializable; import com.opensymphony.xwork.*; import com.opensymphony.xwork.config.ConfigurationException; import com.opensymphony.xwork.util.*; @@ -39,7 +39,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import freemarker.template.Template; -import org.apache.struts.action2.views.freemarker.FreemarkerManager; +import org.apache.struts2.views.freemarker.FreemarkerManager; import javax.servlet.ServletContext; import javax.servlet.ServletException; @@ -60,7 +60,7 @@ import java.util.Map; * initalize(ServletContext) * method * - * @see org.apache.struts.action2.dispatcher.FilterDispatcher + * @see org.apache.struts2.dispatcher.FilterDispatcher */ public class DispatcherUtils { private static final Log LOG = LogFactory.getLog(DispatcherUtils.class); @@ -119,11 +119,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 = "org.apache.struts.action2.spring.StrutsSpringObjectFactory"; + className = "org.apache.struts2.spring.StrutsSpringObjectFactory"; } 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 = "org.apache.struts.action2.plexus.PlexusObjectFactory"; + className = "org.apache.struts2.plexus.PlexusObjectFactory"; } try { @@ -428,12 +428,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 org.apache.struts.action2.dispatcher.multipart.MultiPartRequestWrapper} is + * requests in a special way or to handle other types of requests. Note, {@link org.apache.struts2.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 org.apache.struts.action2.dispatcher.multipart.MultiPartRequestWrapper + * @see org.apache.struts2.dispatcher.multipart.MultiPartRequestWrapper */ public HttpServletRequest wrapRequest(HttpServletRequest request, ServletContext servletContext) throws IOException { // don't wrap more than once @@ -465,7 +465,7 @@ public class DispatcherUtils { try { freemarker.template.Configuration config = FreemarkerManager.getInstance().getConfiguration(ctx); - Template template = config.getTemplate("/org/apache/struts/action2/dispatcher/error.ftl"); + Template template = config.getTemplate("/org/apache/struts2/dispatcher/error.ftl"); List chain = new ArrayList(); Throwable cur = e; diff --git a/core/src/main/java/org/apache/struts/action2/dispatcher/FilterDispatcher.java b/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java similarity index 94% rename from core/src/main/java/org/apache/struts/action2/dispatcher/FilterDispatcher.java rename to core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java index 7d7c9e3d8..e7b5779a3 100644 --- a/core/src/main/java/org/apache/struts/action2/dispatcher/FilterDispatcher.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java @@ -15,16 +15,16 @@ * 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.util.ClassLoaderUtil; -import org.apache.struts.action2.RequestUtils; -import org.apache.struts.action2.StrutsConstants; -import org.apache.struts.action2.StrutsStatics; -import org.apache.struts.action2.config.Configuration; -import org.apache.struts.action2.dispatcher.mapper.ActionMapper; -import org.apache.struts.action2.dispatcher.mapper.ActionMapperFactory; -import org.apache.struts.action2.dispatcher.mapper.ActionMapping; +import org.apache.struts2.RequestUtils; +import org.apache.struts2.StrutsConstants; +import org.apache.struts2.StrutsStatics; +import org.apache.struts2.config.Configuration; +import org.apache.struts2.dispatcher.mapper.ActionMapper; +import org.apache.struts2.dispatcher.mapper.ActionMapperFactory; +import org.apache.struts2.dispatcher.mapper.ActionMapping; import com.opensymphony.xwork.ActionContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -82,7 +82,7 @@ import java.text.SimpleDateFormat; * *

* @@ -416,7 +416,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 = org.apache.struts.action2.views.velocity.StrutsResourceLoader + * class.resource.loader.class = org.apache.struts2.views.velocity.StrutsResourceLoader * *

* this default configuration can be overridden by specifying a struts.velocity.configfile property in the @@ -512,7 +512,7 @@ public class VelocityManager { * Matt Ho - Mon Mar 17 00:21:46 PST 2003 */ p.setProperty("safclass.resource.loader.description", "Velocity Classpath Resource Loader"); - p.setProperty("safclass.resource.loader.class", "org.apache.struts.action2.views.velocity.StrutsResourceLoader"); + p.setProperty("safclass.resource.loader.class", "org.apache.struts2.views.velocity.StrutsResourceLoader"); p.setProperty("safclass.resource.loader.modificationCheckInterval", "2"); p.setProperty("safclass.resource.loader.cache", "true"); diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/AbstractDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java similarity index 96% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/AbstractDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java index 4cb1f3593..863fbd0bd 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/AbstractDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.ServletActionContext; -import org.apache.struts.action2.components.Component; +import org.apache.struts2.ServletActionContext; +import org.apache.struts2.components.Component; import com.opensymphony.xwork.util.OgnlValueStack; import org.apache.velocity.context.InternalContextAdapter; import org.apache.velocity.exception.MethodInvocationException; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/ActionDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/ActionDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/ActionDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/ActionDirective.java index 6794163e4..aee4d2200 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/ActionDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/ActionDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.ActionComponent; -import org.apache.struts.action2.components.Component; +import org.apache.struts2.components.ActionComponent; +import org.apache.struts2.components.Component; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/ActionErrorDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/ActionErrorDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/ActionErrorDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/ActionErrorDirective.java index 34c55e10f..a4af15aa4 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/ActionErrorDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/ActionErrorDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.ActionError; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.ActionError; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/ActionMessageDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/ActionMessageDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/ActionMessageDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/ActionMessageDirective.java index 24f1af992..5a94af86b 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/ActionMessageDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/ActionMessageDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.ActionMessage; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.ActionMessage; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/AnchorDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/AnchorDirective.java similarity index 87% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/AnchorDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/AnchorDirective.java index 0bf843057..f9f55e01d 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/AnchorDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/AnchorDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.Anchor; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.Anchor; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/BeanDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/BeanDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/BeanDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/BeanDirective.java index d39ade7a1..49868dae0 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/BeanDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/BeanDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Bean; -import org.apache.struts.action2.components.Component; +import org.apache.struts2.components.Bean; +import org.apache.struts2.components.Component; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/CheckBoxDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/CheckBoxDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxDirective.java index 8e2d9680c..b1974fe95 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/CheckBoxDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Checkbox; -import org.apache.struts.action2.components.Component; +import org.apache.struts2.components.Checkbox; +import org.apache.struts2.components.Component; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/CheckBoxListDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxListDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/CheckBoxListDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxListDirective.java index 4256f4970..dcb018ddc 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/CheckBoxListDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/CheckBoxListDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.CheckboxList; -import org.apache.struts.action2.components.Component; +import org.apache.struts2.components.CheckboxList; +import org.apache.struts2.components.Component; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/ComboBoxDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/ComboBoxDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/ComboBoxDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/ComboBoxDirective.java index 21290c698..1e999585e 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/ComboBoxDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/ComboBoxDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.ComboBox; -import org.apache.struts.action2.components.Component; +import org.apache.struts2.components.ComboBox; +import org.apache.struts2.components.Component; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/ComponentDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/ComponentDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/ComponentDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/ComponentDirective.java index 49e36cbbf..50d36e37f 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/ComponentDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/ComponentDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.GenericUIBean; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.GenericUIBean; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/DateDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/DateDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/DateDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/DateDirective.java index 34484a98e..e2d8274af 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/DateDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/DateDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.Date; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.Date; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/DatePickerDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/DatePickerDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/DatePickerDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/DatePickerDirective.java index 6aa70829e..87be24f34 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/DatePickerDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/DatePickerDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.DatePicker; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.DatePicker; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/DivDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/DivDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java index de01930c0..9fbbf7038 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/DivDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.Div; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.Div; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/DoubleSelectDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/DoubleSelectDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/DoubleSelectDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/DoubleSelectDirective.java index 481faacef..5a8e2f5cc 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/DoubleSelectDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/DoubleSelectDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.DoubleSelect; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.DoubleSelect; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/FieldErrorDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/FieldErrorDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/FieldErrorDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/FieldErrorDirective.java index 8bd3fc38e..7c76710ee 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/FieldErrorDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/FieldErrorDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.FieldError; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.FieldError; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/FileDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/FileDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/FileDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/FileDirective.java index 87fb35c3d..c64a4edde 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/FileDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/FileDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.File; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.File; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/FormDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/FormDirective.java similarity index 87% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/FormDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/FormDirective.java index 17dd1b082..edf273b49 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/FormDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/FormDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.Form; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.Form; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/HeadDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/HeadDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/HeadDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/HeadDirective.java index 2b4d0f825..7db643836 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/HeadDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/HeadDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.Head; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.Head; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/HiddenDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/HiddenDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/HiddenDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/HiddenDirective.java index d6cf7c302..be18aac4d 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/HiddenDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/HiddenDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.Hidden; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.Hidden; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/I18nDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/I18nDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/I18nDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/I18nDirective.java index 90e7e4286..d56bfc6ef 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/I18nDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/I18nDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.I18n; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.I18n; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/IncludeDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/IncludeDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/IncludeDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/IncludeDirective.java index cddd55e49..5c36cdeed 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/IncludeDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/IncludeDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.Include; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.Include; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/LabelDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/LabelDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/LabelDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/LabelDirective.java index accc4ce1e..212668366 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/LabelDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/LabelDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.Label; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.Label; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/OptionTransferSelectDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/OptionTransferSelectDirective.java similarity index 85% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/OptionTransferSelectDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/OptionTransferSelectDirective.java index 0ff1a1cbd..172845ebd 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/OptionTransferSelectDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/OptionTransferSelectDirective.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.OptionTransferSelect; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.OptionTransferSelect; import com.opensymphony.xwork.util.OgnlValueStack; /** diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/PanelDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/PanelDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/PanelDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/PanelDirective.java index c99a6a044..d33d7b06a 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/PanelDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/PanelDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.Panel; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.Panel; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/ParamDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/ParamDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/ParamDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/ParamDirective.java index cba151eca..7601fa1ce 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/ParamDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/ParamDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.Param; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.Param; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/PasswordDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/PasswordDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.java index a880fbac9..1d7735bf5 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/PasswordDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/PasswordDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.Password; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.Password; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/PropertyDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/PropertyDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/PropertyDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/PropertyDirective.java index 3f0ddbf54..c0af04f38 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/PropertyDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/PropertyDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.Property; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.Property; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/PushDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/PushDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/PushDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/PushDirective.java index 571bbfd59..c0107c0b5 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/PushDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/PushDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.Push; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.Push; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/RadioDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/RadioDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/RadioDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/RadioDirective.java index 20897811b..a2af63dc0 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/RadioDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/RadioDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.Radio; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.Radio; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/ResetDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/ResetDirective.java similarity index 82% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/ResetDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/ResetDirective.java index a0aa6df12..8f435f5df 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/ResetDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/ResetDirective.java @@ -15,17 +15,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.Reset; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.Reset; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; /** - * @see org.apache.struts.action2.components.Reset + * @see org.apache.struts2.components.Reset */ public class ResetDirective extends AbstractDirective { public String getBeanName() { diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/RichTextEditorDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/RichTextEditorDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/RichTextEditorDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/RichTextEditorDirective.java index 40d07e7c9..dff68fbb2 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/RichTextEditorDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/RichTextEditorDirective.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.RichTextEditor; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.RichTextEditor; import com.opensymphony.xwork.util.OgnlValueStack; /** diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/SelectDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/SelectDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/SelectDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/SelectDirective.java index 415f6c167..972d62b34 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/SelectDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/SelectDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.Select; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.Select; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/SetDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/SetDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/SetDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/SetDirective.java index 738d9dc2d..fe55497ae 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/SetDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/SetDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.Set; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.Set; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/SubmitDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/SubmitDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/SubmitDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/SubmitDirective.java index d6eb32272..759a62c78 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/SubmitDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/SubmitDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.Submit; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.Submit; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/TabbedPanelDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/TabbedPanelDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/TabbedPanelDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/TabbedPanelDirective.java index 6c9943f1d..b89117744 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/TabbedPanelDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/TabbedPanelDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.TabbedPanel; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.TabbedPanel; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/TextAreaDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/TextAreaDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/TextAreaDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/TextAreaDirective.java index c4f4235b5..ba3650a94 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/TextAreaDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/TextAreaDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.TextArea; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.TextArea; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/TextDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/TextDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/TextDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/TextDirective.java index fb4148fb1..63e9db039 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/TextDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/TextDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.Text; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.Text; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/TextFieldDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/TextFieldDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/TextFieldDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/TextFieldDirective.java index 9b438ef44..436a3dc44 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/TextFieldDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/TextFieldDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.TextField; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.TextField; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/TokenDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/TokenDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/TokenDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/TokenDirective.java index a0a01a29c..e413d99b8 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/TokenDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/TokenDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.Token; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.Token; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/TreeDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/TreeDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/TreeDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/TreeDirective.java index fd37ebd9c..d73193636 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/TreeDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/TreeDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.Tree; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.Tree; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/TreeNodeDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/TreeNodeDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/TreeNodeDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/TreeNodeDirective.java index c1e34eda2..fc20053e1 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/TreeNodeDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/TreeNodeDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.TreeNode; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.TreeNode; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/URLDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/URLDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/URLDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/URLDirective.java index 138b998a7..cb2c507b3 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/URLDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/URLDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.URL; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.URL; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/UpDownSelectDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/UpDownSelectDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/UpDownSelectDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/UpDownSelectDirective.java index fde9f8b66..ae7e68536 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/UpDownSelectDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/UpDownSelectDirective.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.UpDownSelect; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.UpDownSelect; import com.opensymphony.xwork.util.OgnlValueStack; /** diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/components/WebTableDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/WebTableDirective.java similarity index 86% rename from core/src/main/java/org/apache/struts/action2/views/velocity/components/WebTableDirective.java rename to core/src/main/java/org/apache/struts2/views/velocity/components/WebTableDirective.java index 1ed3a8fe6..7d67ae930 100644 --- a/core/src/main/java/org/apache/struts/action2/views/velocity/components/WebTableDirective.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/components/WebTableDirective.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.velocity.components; +package org.apache.struts2.views.velocity.components; -import org.apache.struts.action2.components.Component; -import org.apache.struts.action2.components.table.WebTable; +import org.apache.struts2.components.Component; +import org.apache.struts2.components.table.WebTable; import com.opensymphony.xwork.util.OgnlValueStack; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/java/org/apache/struts/action2/views/velocity/package.html b/core/src/main/java/org/apache/struts2/views/velocity/package.html similarity index 100% rename from core/src/main/java/org/apache/struts/action2/views/velocity/package.html rename to core/src/main/java/org/apache/struts2/views/velocity/package.html diff --git a/core/src/main/java/org/apache/struts/action2/views/xslt/AdapterNode.java b/core/src/main/java/org/apache/struts2/views/xslt/AdapterNode.java similarity index 95% rename from core/src/main/java/org/apache/struts/action2/views/xslt/AdapterNode.java rename to core/src/main/java/org/apache/struts2/views/xslt/AdapterNode.java index 007c24858..290a36e70 100644 --- a/core/src/main/java/org/apache/struts/action2/views/xslt/AdapterNode.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/AdapterNode.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.xslt; +package org.apache.struts2.views.xslt; import org.w3c.dom.Node; diff --git a/core/src/main/java/org/apache/struts/action2/views/xslt/ArrayAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java similarity index 97% rename from core/src/main/java/org/apache/struts/action2/views/xslt/ArrayAdapter.java rename to core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java index 33f04876b..0e0f30545 100644 --- a/core/src/main/java/org/apache/struts/action2/views/xslt/ArrayAdapter.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/ArrayAdapter.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.xslt; +package org.apache.struts2.views.xslt; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/core/src/main/java/org/apache/struts/action2/views/xslt/BeanAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java similarity index 99% rename from core/src/main/java/org/apache/struts/action2/views/xslt/BeanAdapter.java rename to core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java index d3d653a7b..5b70ba237 100644 --- a/core/src/main/java/org/apache/struts/action2/views/xslt/BeanAdapter.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/BeanAdapter.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.xslt; +package org.apache.struts2.views.xslt; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/core/src/main/java/org/apache/struts/action2/views/xslt/CollectionAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/CollectionAdapter.java similarity index 97% rename from core/src/main/java/org/apache/struts/action2/views/xslt/CollectionAdapter.java rename to core/src/main/java/org/apache/struts2/views/xslt/CollectionAdapter.java index 09f4dfef1..1521912d0 100644 --- a/core/src/main/java/org/apache/struts/action2/views/xslt/CollectionAdapter.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/CollectionAdapter.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.xslt; +package org.apache.struts2.views.xslt; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/core/src/main/java/org/apache/struts/action2/views/xslt/CollectionNodeList.java b/core/src/main/java/org/apache/struts2/views/xslt/CollectionNodeList.java similarity index 95% rename from core/src/main/java/org/apache/struts/action2/views/xslt/CollectionNodeList.java rename to core/src/main/java/org/apache/struts2/views/xslt/CollectionNodeList.java index c90c828a5..ee90db4cb 100644 --- a/core/src/main/java/org/apache/struts/action2/views/xslt/CollectionNodeList.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/CollectionNodeList.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.xslt; +package org.apache.struts2.views.xslt; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/core/src/main/java/org/apache/struts/action2/views/xslt/DOMAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/DOMAdapter.java similarity index 99% rename from core/src/main/java/org/apache/struts/action2/views/xslt/DOMAdapter.java rename to core/src/main/java/org/apache/struts2/views/xslt/DOMAdapter.java index a46faa522..e476de656 100644 --- a/core/src/main/java/org/apache/struts/action2/views/xslt/DOMAdapter.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/DOMAdapter.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.xslt; +package org.apache.struts2.views.xslt; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/core/src/main/java/org/apache/struts/action2/views/xslt/DefaultAdapterNode.java b/core/src/main/java/org/apache/struts2/views/xslt/DefaultAdapterNode.java similarity index 99% rename from core/src/main/java/org/apache/struts/action2/views/xslt/DefaultAdapterNode.java rename to core/src/main/java/org/apache/struts2/views/xslt/DefaultAdapterNode.java index 5ea213b7f..8ba1afd77 100644 --- a/core/src/main/java/org/apache/struts/action2/views/xslt/DefaultAdapterNode.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/DefaultAdapterNode.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.xslt; +package org.apache.struts2.views.xslt; import org.apache.commons.logging.LogFactory; import org.w3c.dom.*; diff --git a/core/src/main/java/org/apache/struts/action2/views/xslt/DefaultElementAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/DefaultElementAdapter.java similarity index 99% rename from core/src/main/java/org/apache/struts/action2/views/xslt/DefaultElementAdapter.java rename to core/src/main/java/org/apache/struts2/views/xslt/DefaultElementAdapter.java index e2ef8bb03..8a42c8c43 100644 --- a/core/src/main/java/org/apache/struts/action2/views/xslt/DefaultElementAdapter.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/DefaultElementAdapter.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.xslt; +package org.apache.struts2.views.xslt; import org.w3c.dom.*; diff --git a/core/src/main/java/org/apache/struts/action2/views/xslt/DocumentAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/DocumentAdapter.java similarity index 98% rename from core/src/main/java/org/apache/struts/action2/views/xslt/DocumentAdapter.java rename to core/src/main/java/org/apache/struts2/views/xslt/DocumentAdapter.java index 4890fe7f9..7324fc8af 100644 --- a/core/src/main/java/org/apache/struts/action2/views/xslt/DocumentAdapter.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/DocumentAdapter.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.xslt; +package org.apache.struts2.views.xslt; import org.w3c.dom.*; diff --git a/core/src/main/java/org/apache/struts/action2/views/xslt/ServletURIResolver.java b/core/src/main/java/org/apache/struts2/views/xslt/ServletURIResolver.java similarity index 97% rename from core/src/main/java/org/apache/struts/action2/views/xslt/ServletURIResolver.java rename to core/src/main/java/org/apache/struts2/views/xslt/ServletURIResolver.java index 633c5a010..158c45706 100644 --- a/core/src/main/java/org/apache/struts/action2/views/xslt/ServletURIResolver.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/ServletURIResolver.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.xslt; +package org.apache.struts2.views.xslt; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/core/src/main/java/org/apache/struts/action2/views/xslt/SimpleTextNode.java b/core/src/main/java/org/apache/struts2/views/xslt/SimpleTextNode.java similarity index 98% rename from core/src/main/java/org/apache/struts/action2/views/xslt/SimpleTextNode.java rename to core/src/main/java/org/apache/struts2/views/xslt/SimpleTextNode.java index 8d416b7b3..e5efaf2ff 100644 --- a/core/src/main/java/org/apache/struts/action2/views/xslt/SimpleTextNode.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/SimpleTextNode.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.xslt; +package org.apache.struts2.views.xslt; import org.w3c.dom.DOMException; import org.w3c.dom.Node; diff --git a/core/src/main/java/org/apache/struts/action2/views/xslt/ToStringAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/ToStringAdapter.java similarity index 98% rename from core/src/main/java/org/apache/struts/action2/views/xslt/ToStringAdapter.java rename to core/src/main/java/org/apache/struts2/views/xslt/ToStringAdapter.java index 5a3f54640..240dc6803 100644 --- a/core/src/main/java/org/apache/struts/action2/views/xslt/ToStringAdapter.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/ToStringAdapter.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.xslt; +package org.apache.struts2.views.xslt; import org.w3c.dom.*; diff --git a/core/src/main/java/org/apache/struts/action2/views/xslt/XSLTResult.java b/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java similarity index 98% rename from core/src/main/java/org/apache/struts/action2/views/xslt/XSLTResult.java rename to core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java index 08127ec8f..31d5d8b11 100644 --- a/core/src/main/java/org/apache/struts/action2/views/xslt/XSLTResult.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.xslt; +package org.apache.struts2.views.xslt; -import org.apache.struts.action2.ServletActionContext; -import org.apache.struts.action2.StrutsConstants; -import org.apache.struts.action2.config.Configuration; +import org.apache.struts2.ServletActionContext; +import org.apache.struts2.StrutsConstants; +import org.apache.struts2.config.Configuration; import com.opensymphony.xwork.ActionContext; import com.opensymphony.xwork.ActionInvocation; import com.opensymphony.xwork.Result; diff --git a/core/src/main/java/org/apache/struts/action2/views/xslt/package.html b/core/src/main/java/org/apache/struts2/views/xslt/package.html similarity index 100% rename from core/src/main/java/org/apache/struts/action2/views/xslt/package.html rename to core/src/main/java/org/apache/struts2/views/xslt/package.html diff --git a/core/src/main/resources/config-browser.xml b/core/src/main/resources/config-browser.xml index 1116e7fa3..7f857b4da 100644 --- a/core/src/main/resources/config-browser.xml +++ b/core/src/main/resources/config-browser.xml @@ -21,21 +21,21 @@ actionNames - + /config-browser/actionNames.ftl - + /config-browser/showConfig.ftl - + /config-browser/simple-error.ftl /config-browser/simple-error.ftl /config-browser/showValidators.ftl - + /config-browser/validatorDetails.ftl diff --git a/core/src/main/resources/org/apache/struts/action2/default.properties b/core/src/main/resources/org/apache/struts2/default.properties similarity index 93% rename from core/src/main/resources/org/apache/struts/action2/default.properties rename to core/src/main/resources/org/apache/struts2/default.properties index de53a6642..412af6799 100644 --- a/core/src/main/resources/org/apache/struts/action2/default.properties +++ b/core/src/main/resources/org/apache/struts2/default.properties @@ -5,9 +5,9 @@ ### ### Specifies the Configuration used to configure Struts Action 2.0 -### one could extend org.apache.struts.action2.config.Configuration +### one could extend org.apache.struts2.config.Configuration ### to build one's customize way of getting the configurations parameters into Struts Action 2.0 -# struts.configuration=org.apache.struts.action2.config.DefaultConfiguration +# struts.configuration=org.apache.struts2.config.DefaultConfiguration ### This can be used to set your default locale and encoding scheme # struts.locale=en_US @@ -48,7 +48,7 @@ struts.multipart.maxSize=2097152 # struts.custom.properties=application,com/webwork/extension/custom ### How request URLs are mapped to and from actions -struts.mapper.class=org.apache.struts.action2.dispatcher.mapper.DefaultActionMapper +struts.mapper.class=org.apache.struts2.dispatcher.mapper.DefaultActionMapper ### Used by the DefaultActionMapper ### You may provide a comma separated list, e.g. struts.action.extension=action,jnlp,do @@ -121,8 +121,8 @@ struts.dispatcher.parametersWorkaround = false ### configure the Freemarker Manager class to be used ### Allows user to plug-in customised Freemarker Manager if necessary -### MUST extends off org.apache.struts.action2.views.freemarker.FreemarkerManager -#struts.freemarker.manager.classname=org.apache.struts.action2.views.freemarker.FreemarkerManager +### MUST extends off org.apache.struts2.views.freemarker.FreemarkerManager +#struts.freemarker.manager.classname=org.apache.struts2.views.freemarker.FreemarkerManager ### See the StrutsBeanWrapper javadocs for more information struts.freemarker.wrapper.altMap=true diff --git a/core/src/main/resources/org/apache/struts/action2/dispatcher/error.ftl b/core/src/main/resources/org/apache/struts2/dispatcher/error.ftl similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/dispatcher/error.ftl rename to core/src/main/resources/org/apache/struts2/dispatcher/error.ftl diff --git a/core/src/main/resources/org/apache/struts/action2/interceptor/debugging/console.ftl b/core/src/main/resources/org/apache/struts2/interceptor/debugging/console.ftl similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/interceptor/debugging/console.ftl rename to core/src/main/resources/org/apache/struts2/interceptor/debugging/console.ftl diff --git a/core/src/main/resources/org/apache/struts/action2/interceptor/debugging/webconsole.css b/core/src/main/resources/org/apache/struts2/interceptor/debugging/webconsole.css similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/interceptor/debugging/webconsole.css rename to core/src/main/resources/org/apache/struts2/interceptor/debugging/webconsole.css diff --git a/core/src/main/resources/org/apache/struts/action2/interceptor/debugging/webconsole.html b/core/src/main/resources/org/apache/struts2/interceptor/debugging/webconsole.html similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/interceptor/debugging/webconsole.html rename to core/src/main/resources/org/apache/struts2/interceptor/debugging/webconsole.html diff --git a/core/src/main/resources/org/apache/struts/action2/interceptor/debugging/webconsole.js b/core/src/main/resources/org/apache/struts2/interceptor/debugging/webconsole.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/interceptor/debugging/webconsole.js rename to core/src/main/resources/org/apache/struts2/interceptor/debugging/webconsole.js diff --git a/core/src/main/resources/org/apache/struts/action2/interceptor/package.html b/core/src/main/resources/org/apache/struts2/interceptor/package.html similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/interceptor/package.html rename to core/src/main/resources/org/apache/struts2/interceptor/package.html diff --git a/core/src/main/resources/org/apache/struts/action2/interceptor/wait.ftl b/core/src/main/resources/org/apache/struts2/interceptor/wait.ftl similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/interceptor/wait.ftl rename to core/src/main/resources/org/apache/struts2/interceptor/wait.ftl diff --git a/core/src/main/resources/org/apache/struts/action2/jsf/package.html b/core/src/main/resources/org/apache/struts2/jsf/package.html similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/jsf/package.html rename to core/src/main/resources/org/apache/struts2/jsf/package.html diff --git a/core/src/main/resources/org/apache/struts/action2/lifecycle/package.html b/core/src/main/resources/org/apache/struts2/lifecycle/package.html similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/lifecycle/package.html rename to core/src/main/resources/org/apache/struts2/lifecycle/package.html diff --git a/core/src/main/resources/org/apache/struts/action2/package.html b/core/src/main/resources/org/apache/struts2/package.html similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/package.html rename to core/src/main/resources/org/apache/struts2/package.html diff --git a/core/src/main/resources/org/apache/struts/action2/sitegraph/sitegraph-usage.txt b/core/src/main/resources/org/apache/struts2/sitegraph/sitegraph-usage.txt similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/sitegraph/sitegraph-usage.txt rename to core/src/main/resources/org/apache/struts2/sitegraph/sitegraph-usage.txt diff --git a/core/src/main/resources/org/apache/struts/action2/static/CommonFunctions.js b/core/src/main/resources/org/apache/struts2/static/CommonFunctions.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/CommonFunctions.js rename to core/src/main/resources/org/apache/struts2/static/CommonFunctions.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/LICENSE b/core/src/main/resources/org/apache/struts2/static/dojo/LICENSE similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/LICENSE rename to core/src/main/resources/org/apache/struts2/static/dojo/LICENSE diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/README b/core/src/main/resources/org/apache/struts2/static/dojo/README similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/README rename to core/src/main/resources/org/apache/struts2/static/dojo/README diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/build.txt b/core/src/main/resources/org/apache/struts2/static/dojo/build.txt similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/build.txt rename to core/src/main/resources/org/apache/struts2/static/dojo/build.txt diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/dojo.js b/core/src/main/resources/org/apache/struts2/static/dojo/dojo.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/dojo.js rename to core/src/main/resources/org/apache/struts2/static/dojo/dojo.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/dojo.js.uncompressed.js b/core/src/main/resources/org/apache/struts2/static/dojo/dojo.js.uncompressed.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/dojo.js.uncompressed.js rename to core/src/main/resources/org/apache/struts2/static/dojo/dojo.js.uncompressed.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/alg/Alg.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/alg/Alg.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/alg/Alg.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/alg/Alg.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/alg/__package__.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/alg/__package__.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/alg/__package__.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/alg/__package__.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/animation/Animation.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/animation/Animation.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/animation/Animation.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/animation/Animation.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/animation/Timer.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/animation/Timer.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/animation/Timer.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/animation/Timer.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/animation/__package__.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/animation/__package__.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/animation/__package__.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/animation/__package__.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/bootstrap1.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/bootstrap1.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/bootstrap1.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/bootstrap1.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/bootstrap2.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/bootstrap2.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/bootstrap2.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/bootstrap2.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/browser_debug.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/browser_debug.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/browser_debug.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/browser_debug.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/ArrayList.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/collections/ArrayList.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/ArrayList.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/collections/ArrayList.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/BinaryTree.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/collections/BinaryTree.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/BinaryTree.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/collections/BinaryTree.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/ByteArray.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/collections/ByteArray.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/ByteArray.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/collections/ByteArray.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Collections.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/collections/Collections.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Collections.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/collections/Collections.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Dictionary.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/collections/Dictionary.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Dictionary.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/collections/Dictionary.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Graph.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/collections/Graph.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Graph.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/collections/Graph.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/List.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/collections/List.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/List.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/collections/List.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Queue.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/collections/Queue.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Queue.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/collections/Queue.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Set.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/collections/Set.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Set.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/collections/Set.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/SkipList.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/collections/SkipList.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/SkipList.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/collections/SkipList.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/SortedList.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/collections/SortedList.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/SortedList.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/collections/SortedList.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Stack.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/collections/Stack.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Stack.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/collections/Stack.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/__package__.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/collections/__package__.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/__package__.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/collections/__package__.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/crypto.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/crypto.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/Blowfish.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/crypto/Blowfish.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/Blowfish.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/crypto/Blowfish.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/LICENSE b/core/src/main/resources/org/apache/struts2/static/dojo/src/crypto/LICENSE similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/LICENSE rename to core/src/main/resources/org/apache/struts2/static/dojo/src/crypto/LICENSE diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/MD5.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/crypto/MD5.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/MD5.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/crypto/MD5.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/Rijndael.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/crypto/Rijndael.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/Rijndael.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/crypto/Rijndael.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/SHA.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/crypto/SHA.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/SHA.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/crypto/SHA.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/SHA1.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/crypto/SHA1.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/SHA1.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/crypto/SHA1.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/SHA256.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/crypto/SHA256.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/SHA256.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/crypto/SHA256.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/__package__.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/crypto/__package__.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/__package__.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/crypto/__package__.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/data.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/data.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/data.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/data.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/data/__package__.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/data/__package__.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/data/__package__.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/data/__package__.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/date.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/date.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/date.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/date.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/DragAndDrop.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/dnd/DragAndDrop.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/DragAndDrop.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/dnd/DragAndDrop.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/HtmlDragAndDrop.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/dnd/HtmlDragAndDrop.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/HtmlDragAndDrop.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/dnd/HtmlDragAndDrop.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/HtmlDragManager.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/dnd/HtmlDragManager.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/HtmlDragManager.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/dnd/HtmlDragManager.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/HtmlDragMove.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/dnd/HtmlDragMove.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/HtmlDragMove.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/dnd/HtmlDragMove.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/Sortable.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/dnd/Sortable.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/Sortable.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/dnd/Sortable.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/TreeDragAndDrop.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/dnd/TreeDragAndDrop.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/TreeDragAndDrop.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/dnd/TreeDragAndDrop.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/__package__.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/dnd/__package__.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/__package__.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/dnd/__package__.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/dom.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/dom.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/dom.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/dom.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/event.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/event.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/event.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/event.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/event/__package__.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/event/__package__.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/event/__package__.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/event/__package__.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/event/browser.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/event/browser.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/event/browser.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/event/browser.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/event/topic.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/event/topic.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/event/topic.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/event/topic.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/flash.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/flash.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/flash.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/flash.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/flash/flash6/DojoExternalInterface.as b/core/src/main/resources/org/apache/struts2/static/dojo/src/flash/flash6/DojoExternalInterface.as similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/flash/flash6/DojoExternalInterface.as rename to core/src/main/resources/org/apache/struts2/static/dojo/src/flash/flash6/DojoExternalInterface.as diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/flash/flash8/DojoExternalInterface.as b/core/src/main/resources/org/apache/struts2/static/dojo/src/flash/flash8/DojoExternalInterface.as similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/flash/flash8/DojoExternalInterface.as rename to core/src/main/resources/org/apache/struts2/static/dojo/src/flash/flash8/DojoExternalInterface.as diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/fx/__package__.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/fx/__package__.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/fx/__package__.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/fx/__package__.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/fx/html.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/fx/html.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/fx/html.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/fx/html.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/fx/svg.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/fx/svg.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/fx/svg.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/fx/svg.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/graphics/Colorspace.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/graphics/Colorspace.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/graphics/Colorspace.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/graphics/Colorspace.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/graphics/__package__.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/graphics/__package__.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/graphics/__package__.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/graphics/__package__.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/graphics/color.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/graphics/color.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/graphics/color.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/graphics/color.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/graphics/htmlEffects.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/graphics/htmlEffects.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/graphics/htmlEffects.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/graphics/htmlEffects.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_adobesvg.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/hostenv_adobesvg.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_adobesvg.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/hostenv_adobesvg.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_browser.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/hostenv_browser.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_browser.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/hostenv_browser.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_jsc.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/hostenv_jsc.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_jsc.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/hostenv_jsc.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_rhino.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/hostenv_rhino.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_rhino.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/hostenv_rhino.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_spidermonkey.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/hostenv_spidermonkey.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_spidermonkey.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/hostenv_spidermonkey.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_svg.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/hostenv_svg.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_svg.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/hostenv_svg.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_wsh.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/hostenv_wsh.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_wsh.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/hostenv_wsh.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/html.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/html.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/html.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/html.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/iCalendar.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/iCalendar.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/iCalendar.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/iCalendar.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/io.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/io.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/io.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/io.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/io/BrowserIO.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/io/BrowserIO.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/io/BrowserIO.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/io/BrowserIO.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/io/IframeIO.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/io/IframeIO.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/io/IframeIO.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/io/IframeIO.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/io/RepubsubIO.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/io/RepubsubIO.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/io/RepubsubIO.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/io/RepubsubIO.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/io/RhinoIO.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/io/RhinoIO.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/io/RhinoIO.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/io/RhinoIO.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/io/__package__.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/io/__package__.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/io/__package__.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/io/__package__.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/io/cookie.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/io/cookie.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/io/cookie.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/io/cookie.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/io/cookies.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/io/cookies.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/io/cookies.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/io/cookies.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/json.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/json.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/json.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/json.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/lang.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/lang.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/lang.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/lang.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/lang/Lang.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/lang/Lang.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/lang/Lang.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/lang/Lang.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/lang/__package__.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/lang/__package__.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/lang/__package__.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/lang/__package__.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/logging/Logger.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/logging/Logger.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/logging/Logger.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/logging/Logger.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/logging/__package__.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/logging/__package__.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/logging/__package__.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/logging/__package__.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/math.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/math.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/math.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/math.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/math/Math.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/math/Math.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/math/Math.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/math/Math.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/math/__package__.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/math/__package__.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/math/__package__.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/math/__package__.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/math/curves.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/math/curves.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/math/curves.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/math/curves.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/math/matrix.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/math/matrix.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/math/matrix.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/math/matrix.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/math/points.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/math/points.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/math/points.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/math/points.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/profile.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/profile.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/profile.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/profile.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/reflect/__package__.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/reflect/__package__.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/reflect/__package__.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/reflect/__package__.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/reflect/reflection.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/reflect/reflection.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/reflect/reflection.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/reflect/reflection.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/regexp.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/regexp.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/regexp.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/regexp.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/rpc/Deferred.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/rpc/Deferred.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/rpc/Deferred.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/rpc/Deferred.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/rpc/JotService.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/rpc/JotService.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/rpc/JotService.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/rpc/JotService.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/rpc/JsonService.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/rpc/JsonService.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/rpc/JsonService.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/rpc/JsonService.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/rpc/RpcService.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/rpc/RpcService.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/rpc/RpcService.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/rpc/RpcService.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/rpc/__package__.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/rpc/__package__.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/rpc/__package__.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/rpc/__package__.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/selection.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/selection.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/selection.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/selection.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/storage.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/storage.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/storage.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/storage.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/Storage.as b/core/src/main/resources/org/apache/struts2/static/dojo/src/storage/Storage.as similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/Storage.as rename to core/src/main/resources/org/apache/struts2/static/dojo/src/storage/Storage.as diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/Storage.swf b/core/src/main/resources/org/apache/struts2/static/dojo/src/storage/Storage.swf similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/Storage.swf rename to core/src/main/resources/org/apache/struts2/static/dojo/src/storage/Storage.swf diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/__package__.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/storage/__package__.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/__package__.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/storage/__package__.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/browser.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/storage/browser.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/browser.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/storage/browser.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/storage.sh b/core/src/main/resources/org/apache/struts2/static/dojo/src/storage/storage.sh similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/storage.sh rename to core/src/main/resources/org/apache/struts2/static/dojo/src/storage/storage.sh diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/string.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/string.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/string.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/string.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/string/Builder.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/string/Builder.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/string/Builder.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/string/Builder.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/string/__package__.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/string/__package__.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/string/__package__.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/string/__package__.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/style.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/style.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/style.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/style.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/svg.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/svg.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/svg.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/svg.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/text/Builder.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/text/Builder.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/text/Builder.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/text/Builder.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/text/String.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/text/String.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/text/String.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/text/String.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/text/Text.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/text/Text.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/text/Text.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/text/Text.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/text/__package__.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/text/__package__.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/text/__package__.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/text/__package__.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/text/textDirectory.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/text/textDirectory.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/text/textDirectory.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/text/textDirectory.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/undo/Manager.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/undo/Manager.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/undo/Manager.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/undo/Manager.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/uri/Uri.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/uri/Uri.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/uri/Uri.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/uri/Uri.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/uri/__package__.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/uri/__package__.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/uri/__package__.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/uri/__package__.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/validate.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/validate.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/validate.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/validate.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/DomWidget.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/webui/DomWidget.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/DomWidget.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/webui/DomWidget.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/HtmlWidget.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/webui/HtmlWidget.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/HtmlWidget.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/webui/HtmlWidget.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/SvgWidget.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/webui/SvgWidget.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/SvgWidget.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/webui/SvgWidget.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/Widget.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/webui/Widget.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/Widget.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/webui/Widget.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/WidgetManager.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/webui/WidgetManager.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/WidgetManager.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/webui/WidgetManager.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/__package__.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/webui/__package__.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/__package__.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/webui/__package__.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/Button.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/Button.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/Button.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/Button.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/ComboBox.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/ComboBox.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/ComboBox.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/ComboBox.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/ContextMenu.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/ContextMenu.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/ContextMenu.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/ContextMenu.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/DropdownButtons.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/DropdownButtons.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/DropdownButtons.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/DropdownButtons.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLButton.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/HTMLButton.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLButton.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/HTMLButton.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLComboBox.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/HTMLComboBox.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLComboBox.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/HTMLComboBox.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLContextMenu.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/HTMLContextMenu.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLContextMenu.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/HTMLContextMenu.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLMenu.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/HTMLMenu.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLMenu.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/HTMLMenu.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLMenuItem.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/HTMLMenuItem.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLMenuItem.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/HTMLMenuItem.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLResizableTextarea.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/HTMLResizableTextarea.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLResizableTextarea.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/HTMLResizableTextarea.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/InlineEditBox.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/InlineEditBox.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/InlineEditBox.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/InlineEditBox.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/Menu.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/Menu.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/Menu.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/Menu.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/MenuItem.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/MenuItem.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/MenuItem.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/MenuItem.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/Parse.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/Parse.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/Parse.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/Parse.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/SVGButton.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/SVGButton.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/SVGButton.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/SVGButton.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/SlideShow.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/SlideShow.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/SlideShow.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/SlideShow.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/Tabs.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/Tabs.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/Tabs.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/Tabs.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/__package__.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/__package__.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/__package__.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/webui/widgets/__package__.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Accordion.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Accordion.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Accordion.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Accordion.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Button.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Button.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Button.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Button.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Button2.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Button2.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Button2.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Button2.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Chart.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Chart.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Chart.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Chart.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Checkbox.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Checkbox.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Checkbox.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Checkbox.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/CiviCrmDatePicker.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/CiviCrmDatePicker.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/CiviCrmDatePicker.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/CiviCrmDatePicker.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ColorPalette.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/ColorPalette.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ColorPalette.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/ColorPalette.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ComboBox.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/ComboBox.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ComboBox.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/ComboBox.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Container.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Container.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Container.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Container.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ContentPane.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/ContentPane.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ContentPane.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/ContentPane.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ContextMenu.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/ContextMenu.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ContextMenu.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/ContextMenu.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/DatePicker.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/DatePicker.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/DatePicker.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/DatePicker.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/DebugConsole.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/DebugConsole.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/DebugConsole.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/DebugConsole.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Dialog.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Dialog.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Dialog.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Dialog.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/DomWidget.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/DomWidget.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/DomWidget.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/DomWidget.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/DropdownButton.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/DropdownButton.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/DropdownButton.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/DropdownButton.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Editor.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Editor.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Editor.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Editor.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/EditorTree.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/EditorTree.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/EditorTree.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/EditorTree.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/EditorTreeContextMenu.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/EditorTreeContextMenu.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/EditorTreeContextMenu.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/EditorTreeContextMenu.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/EditorTreeController.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/EditorTreeController.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/EditorTreeController.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/EditorTreeController.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/EditorTreeNode.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/EditorTreeNode.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/EditorTreeNode.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/EditorTreeNode.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/EditorTreeSelector.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/EditorTreeSelector.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/EditorTreeSelector.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/EditorTreeSelector.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/FisheyeList.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/FisheyeList.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/FisheyeList.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/FisheyeList.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/FloatingPane.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/FloatingPane.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/FloatingPane.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/FloatingPane.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HslColorPicker.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/HslColorPicker.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HslColorPicker.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/HslColorPicker.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlWidget.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/HtmlWidget.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlWidget.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/HtmlWidget.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/InlineEditBox.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/InlineEditBox.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/InlineEditBox.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/InlineEditBox.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/LayoutPane.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/LayoutPane.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/LayoutPane.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/LayoutPane.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/LinkPane.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/LinkPane.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/LinkPane.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/LinkPane.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Manager.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Manager.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Manager.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Manager.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Menu.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Menu.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Menu.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Menu.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Menu2.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Menu2.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Menu2.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Menu2.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/MenuItem.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/MenuItem.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/MenuItem.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/MenuItem.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Parse.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Parse.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Parse.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Parse.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/PopUpButton.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/PopUpButton.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/PopUpButton.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/PopUpButton.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ResizableTextarea.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/ResizableTextarea.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ResizableTextarea.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/ResizableTextarea.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ResizeHandle.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/ResizeHandle.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ResizeHandle.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/ResizeHandle.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/RichText.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/RichText.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/RichText.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/RichText.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SimpleDropdownButtons.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/SimpleDropdownButtons.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SimpleDropdownButtons.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/SimpleDropdownButtons.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SlideShow.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/SlideShow.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SlideShow.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/SlideShow.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SplitPane.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/SplitPane.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SplitPane.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/SplitPane.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SvgButton.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/SvgButton.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SvgButton.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/SvgButton.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SvgWidget.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/SvgWidget.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SvgWidget.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/SvgWidget.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/TabPane.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/TabPane.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/TabPane.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/TabPane.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Tabs.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Tabs.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Tabs.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Tabs.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/TaskBar.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/TaskBar.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/TaskBar.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/TaskBar.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/TemplatedContainer.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/TemplatedContainer.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/TemplatedContainer.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/TemplatedContainer.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/TimePicker.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/TimePicker.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/TimePicker.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/TimePicker.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Toggler.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Toggler.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Toggler.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Toggler.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Toolbar.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Toolbar.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Toolbar.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Toolbar.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Tooltip.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Tooltip.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Tooltip.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Tooltip.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Tree.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Tree.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Tree.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Tree.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Widget.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Widget.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Widget.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Widget.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Wizard.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Wizard.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Wizard.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/Wizard.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/__package__.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/__package__.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/__package__.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/__package__.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Button.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/Button.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Button.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/Button.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Button2.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/Button2.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Button2.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/Button2.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Checkbox.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/Checkbox.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Checkbox.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/Checkbox.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/ComboBox.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/ComboBox.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/ComboBox.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/ComboBox.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Container.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/Container.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Container.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/Container.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/ContentPane.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/ContentPane.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/ContentPane.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/ContentPane.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/ContextMenu.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/ContextMenu.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/ContextMenu.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/ContextMenu.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/DatePicker.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/DatePicker.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/DatePicker.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/DatePicker.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/DebugConsole.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/DebugConsole.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/DebugConsole.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/DebugConsole.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/DropdownButton.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/DropdownButton.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/DropdownButton.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/DropdownButton.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/LayoutPane.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/LayoutPane.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/LayoutPane.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/LayoutPane.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/LinkPane.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/LinkPane.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/LinkPane.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/LinkPane.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Menu.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/Menu.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Menu.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/Menu.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/MenuItem.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/MenuItem.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/MenuItem.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/MenuItem.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/TaskBar.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/TaskBar.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/TaskBar.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/TaskBar.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/TimePicker.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/TimePicker.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/TimePicker.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/TimePicker.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Tooltip.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/Tooltip.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Tooltip.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/Tooltip.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/stabile.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/stabile.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/stabile.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/html/stabile.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/svg/Chart.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/svg/Chart.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/svg/Chart.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/svg/Chart.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/svg/HslColorPicker.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/svg/HslColorPicker.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/svg/HslColorPicker.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/svg/HslColorPicker.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/AccordionPanel.css b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/AccordionPanel.css similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/AccordionPanel.css rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/AccordionPanel.css diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/AccordionPanel.html b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/AccordionPanel.html similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/AccordionPanel.html rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/AccordionPanel.html diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HslColorPicker.svg b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HslColorPicker.svg similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HslColorPicker.svg rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HslColorPicker.svg diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButton2Template.css b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlButton2Template.css similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButton2Template.css rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlButton2Template.css diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButton2Template.html b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlButton2Template.html similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButton2Template.html rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlButton2Template.html diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButtonTemplate.css b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlButtonTemplate.css similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButtonTemplate.css rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlButtonTemplate.css diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButtonTemplate.html b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlButtonTemplate.html similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButtonTemplate.html rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlButtonTemplate.html diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlCiviCrmDatePicker.html b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlCiviCrmDatePicker.html similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlCiviCrmDatePicker.html rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlCiviCrmDatePicker.html diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlComboBox.css b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlComboBox.css similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlComboBox.css rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlComboBox.css diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlComboBox.html b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlComboBox.html similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlComboBox.html rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlComboBox.html diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlComboButton2Template.html b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlComboButton2Template.html similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlComboButton2Template.html rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlComboButton2Template.html diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlContextMenuTemplate.html b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlContextMenuTemplate.html similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlContextMenuTemplate.html rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlContextMenuTemplate.html diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDatePicker.css b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlDatePicker.css similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDatePicker.css rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlDatePicker.css diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDatePicker.html b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlDatePicker.html similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDatePicker.html rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlDatePicker.html diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDialog.html b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlDialog.html similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDialog.html rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlDialog.html diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDropDownButtonTemplate.html b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlDropDownButtonTemplate.html similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDropDownButtonTemplate.html rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlDropDownButtonTemplate.html diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlFisheyeList.css b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlFisheyeList.css similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlFisheyeList.css rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlFisheyeList.css diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlFloatingPane.css b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlFloatingPane.css similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlFloatingPane.css rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlFloatingPane.css diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlInlineEditBox.css b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlInlineEditBox.css similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlInlineEditBox.css rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlInlineEditBox.css diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlInlineEditBox.html b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlInlineEditBox.html similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlInlineEditBox.html rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlInlineEditBox.html diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlLayoutPane.css b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlLayoutPane.css similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlLayoutPane.css rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlLayoutPane.css diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlMenu2.css b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlMenu2.css similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlMenu2.css rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlMenu2.css diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlMenuItemTemplate.html b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlMenuItemTemplate.html similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlMenuItemTemplate.html rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlMenuItemTemplate.html diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlResizableTextarea.css b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlResizableTextarea.css similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlResizableTextarea.css rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlResizableTextarea.css diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlResizableTextarea.html b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlResizableTextarea.html similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlResizableTextarea.html rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlResizableTextarea.html diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlResizeHandle.css b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlResizeHandle.css similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlResizeHandle.css rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlResizeHandle.css diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSimpleDropdownButtons.css b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlSimpleDropdownButtons.css similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSimpleDropdownButtons.css rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlSimpleDropdownButtons.css diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSlideShow.css b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlSlideShow.css similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSlideShow.css rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlSlideShow.css diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSlideShow.html b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlSlideShow.html similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSlideShow.html rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlSlideShow.html diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSplitPane.css b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlSplitPane.css similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSplitPane.css rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlSplitPane.css diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTabPane.css b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlTabPane.css similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTabPane.css rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlTabPane.css diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTabs.css b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlTabs.css similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTabs.css rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlTabs.css diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTaskBar.css b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlTaskBar.css similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTaskBar.css rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlTaskBar.css diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTaskBarItemTemplate.html b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlTaskBarItemTemplate.html similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTaskBarItemTemplate.html rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlTaskBarItemTemplate.html diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTimePicker.css b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlTimePicker.css similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTimePicker.css rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlTimePicker.css diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTimePicker.html b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlTimePicker.html similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTimePicker.html rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlTimePicker.html diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlToolbar.css b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlToolbar.css similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlToolbar.css rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlToolbar.css diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTooltipTemplate.css b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlTooltipTemplate.css similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTooltipTemplate.css rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlTooltipTemplate.css diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTooltipTemplate.html b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlTooltipTemplate.html similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTooltipTemplate.html rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/HtmlTooltipTemplate.html diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/Menu.css b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/Menu.css similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/Menu.css rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/Menu.css diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/PopUpButton.css b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/PopUpButton.css similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/PopUpButton.css rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/PopUpButton.css diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/Tree.css b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/Tree.css similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/Tree.css rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/Tree.css diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/Wizard.css b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/Wizard.css similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/Wizard.css rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/Wizard.css diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/Wizard.html b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/Wizard.html similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/Wizard.html rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/Wizard.html diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/-.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/-.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/-.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/-.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/backcolor.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/backcolor.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/backcolor.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/backcolor.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/bold.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/bold.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/bold.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/bold.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/cancel.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/cancel.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/cancel.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/cancel.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/copy.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/copy.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/copy.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/copy.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/createlink.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/createlink.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/createlink.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/createlink.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/cut.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/cut.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/cut.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/cut.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/delete.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/delete.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/delete.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/delete.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/forecolor.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/forecolor.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/forecolor.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/forecolor.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/hilitecolor.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/hilitecolor.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/hilitecolor.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/hilitecolor.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/indent.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/indent.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/indent.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/indent.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/inserthorizontalrule.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/inserthorizontalrule.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/inserthorizontalrule.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/inserthorizontalrule.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/insertimage.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/insertimage.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/insertimage.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/insertimage.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/insertorderedlist.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/insertorderedlist.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/insertorderedlist.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/insertorderedlist.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/inserttable.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/inserttable.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/inserttable.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/inserttable.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/insertunorderedlist.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/insertunorderedlist.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/insertunorderedlist.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/insertunorderedlist.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/italic.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/italic.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/italic.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/italic.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifycenter.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/justifycenter.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifycenter.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/justifycenter.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifyfull.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/justifyfull.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifyfull.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/justifyfull.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifyleft.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/justifyleft.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifyleft.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/justifyleft.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifyright.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/justifyright.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifyright.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/justifyright.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/left_to_right.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/left_to_right.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/left_to_right.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/left_to_right.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_bullet_indent.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/list_bullet_indent.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_bullet_indent.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/list_bullet_indent.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_bullet_outdent.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/list_bullet_outdent.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_bullet_outdent.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/list_bullet_outdent.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_num_indent.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/list_num_indent.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_num_indent.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/list_num_indent.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_num_outdent.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/list_num_outdent.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_num_outdent.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/list_num_outdent.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/outdent.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/outdent.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/outdent.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/outdent.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/paste.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/paste.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/paste.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/paste.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/redo.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/redo.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/redo.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/redo.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/removeformat.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/removeformat.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/removeformat.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/removeformat.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/right_to_left.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/right_to_left.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/right_to_left.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/right_to_left.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/save.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/save.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/save.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/save.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/space.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/space.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/space.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/space.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/strikethrough.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/strikethrough.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/strikethrough.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/strikethrough.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/subscript.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/subscript.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/subscript.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/subscript.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/superscript.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/superscript.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/superscript.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/superscript.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/underline.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/underline.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/underline.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/underline.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/undo.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/undo.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/undo.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/undo.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/wikiword.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/wikiword.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/wikiword.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/buttons/wikiword.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/check_off.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/check_off.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/check_off.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/check_off.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/check_on.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/check_on.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/check_on.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/check_on.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/decrementMonth.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/decrementMonth.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/decrementMonth.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/decrementMonth.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/decrementWeek.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/decrementWeek.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/decrementWeek.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/decrementWeek.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/grabCorner.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/grabCorner.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/grabCorner.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/grabCorner.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/EditorTree.css b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/EditorTree.css similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/EditorTree.css rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/EditorTree.css diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/blank.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/blank.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/blank.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/blank.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/closed.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/closed.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/closed.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/closed.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/document.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/document.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/document.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/document.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/minus.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/minus.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/minus.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/minus.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/open.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/open.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/open.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/open.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/plus.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/plus.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/plus.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/plus.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_blank.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/treenode_blank.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_blank.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/treenode_blank.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_child.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/treenode_child.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_child.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/treenode_child.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_expand_minus.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/treenode_expand_minus.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_expand_minus.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/treenode_expand_minus.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_expand_plus.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/treenode_expand_plus.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_expand_plus.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/treenode_expand_plus.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_c.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_c.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_c.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_c.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_l.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_l.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_l.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_l.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_p.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_p.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_p.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_p.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_t.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_t.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_t.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_t.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_v.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_v.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_v.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_v.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_x.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_x.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_x.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_x.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_y.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_y.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_y.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_y.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_z.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_z.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_z.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/treenode_grid_z.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_loading.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/treenode_loading.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/EditorTree/treenode_loading.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/EditorTree/treenode_loading.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/blank.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/blank.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/blank.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/blank.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/combo_box_arrow.png b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/combo_box_arrow.png similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/combo_box_arrow.png rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/combo_box_arrow.png diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/dropdownButtonsArrow-disabled.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/dropdownButtonsArrow-disabled.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/dropdownButtonsArrow-disabled.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/dropdownButtonsArrow-disabled.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/dropdownButtonsArrow.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/dropdownButtonsArrow.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/dropdownButtonsArrow.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/dropdownButtonsArrow.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/floatingPaneClose.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/floatingPaneClose.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/floatingPaneClose.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/floatingPaneClose.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/floatingPaneMaximize.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/floatingPaneMaximize.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/floatingPaneMaximize.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/floatingPaneMaximize.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/floatingPaneMinimize.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/floatingPaneMinimize.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/floatingPaneMinimize.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/floatingPaneMinimize.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/floatingPaneRestore.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/floatingPaneRestore.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/floatingPaneRestore.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/floatingPaneRestore.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/hue.png b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/hue.png similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/hue.png rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/hue.png diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/no.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/no.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/no.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/no.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/no.svg b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/no.svg similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/no.svg rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/no.svg diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji-c.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/pill-button-blue_benji-c.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji-c.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/pill-button-blue_benji-c.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji-l.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/pill-button-blue_benji-l.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji-l.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/pill-button-blue_benji-l.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji-r.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/pill-button-blue_benji-r.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji-r.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/pill-button-blue_benji-r.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji_p_01.svg b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/pill-button-blue_benji_p_01.svg similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji_p_01.svg rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/pill-button-blue_benji_p_01.svg diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji-c.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/pill-button-gray_benji-c.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji-c.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/pill-button-gray_benji-c.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji-l.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/pill-button-gray_benji-l.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji-l.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/pill-button-gray_benji-l.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji-r.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/pill-button-gray_benji-r.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji-r.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/pill-button-gray_benji-r.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji.svg b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/pill-button-gray_benji.svg similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji.svg rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/pill-button-gray_benji.svg diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji-c.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/pill-button-purple_benji-c.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji-c.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/pill-button-purple_benji-c.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji-l.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/pill-button-purple_benji-l.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji-l.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/pill-button-purple_benji-l.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji-r.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/pill-button-purple_benji-r.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji-r.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/pill-button-purple_benji-r.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji_01.svg b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/pill-button-purple_benji_01.svg similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji_01.svg rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/pill-button-purple_benji_01.svg diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_ben_01.svg b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/pill-button-seagreen_ben_01.svg similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_ben_01.svg rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/pill-button-seagreen_ben_01.svg diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-c.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-c.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-c.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-c.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-l.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-l.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-l.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-l.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-r.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-r.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-r.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-r.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowB.png b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/shadowB.png similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowB.png rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/shadowB.png diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowBL.png b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/shadowBL.png similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowBL.png rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/shadowBL.png diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowBR.png b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/shadowBR.png similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowBR.png rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/shadowBR.png diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowL.png b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/shadowL.png similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowL.png rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/shadowL.png diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowR.png b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/shadowR.png similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowR.png rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/shadowR.png diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowTR..png b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/shadowTR..png similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowTR..png rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/shadowTR..png diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowUL.png b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/shadowUL.png similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowUL.png rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/shadowUL.png diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowUR.png b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/shadowUR.png similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/shadowUR.png rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/shadowUR.png diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/submenu_off.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/submenu_off.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/submenu_off.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/submenu_off.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/submenu_on.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/submenu_on.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/submenu_on.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/submenu_on.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_left.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/tab_left.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_left.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/tab_left.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_left_r.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/tab_left_r.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_left_r.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/tab_left_r.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_left_r_curr.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/tab_left_r_curr.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_left_r_curr.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/tab_left_r_curr.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_right.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/tab_right.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_right.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/tab_right.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_right_r.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/tab_right_r.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_right_r.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/tab_right_r.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_right_r_curr.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/tab_right_r_curr.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_right_r_curr.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/tab_right_r_curr.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/titlebar-bg.jpg b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/titlebar-bg.jpg similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/titlebar-bg.jpg rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/titlebar-bg.jpg diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/toolbar-bg.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/toolbar-bg.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/toolbar-bg.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/toolbar-bg.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/transparent.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/transparent.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/transparent.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/transparent.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_blank.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/treenode_blank.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_blank.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/treenode_blank.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_expand_minus.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/treenode_expand_minus.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_expand_minus.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/treenode_expand_minus.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_expand_plus.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/treenode_expand_plus.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_expand_plus.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/treenode_expand_plus.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_c.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/treenode_grid_c.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_c.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/treenode_grid_c.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_l.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/treenode_grid_l.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_l.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/treenode_grid_l.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_p.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/treenode_grid_p.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_p.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/treenode_grid_p.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_t.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/treenode_grid_t.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_t.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/treenode_grid_t.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_v.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/treenode_grid_v.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_v.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/treenode_grid_v.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_x.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/treenode_grid_x.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_x.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/treenode_grid_x.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_y.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/treenode_grid_y.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_y.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/treenode_grid_y.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_z.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/treenode_grid_z.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_z.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/treenode_grid_z.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_node.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/treenode_node.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_node.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/treenode_node.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/verticalbar.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/verticalbar.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/verticalbar.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/verticalbar.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/whiteDownArrow.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/whiteDownArrow.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/whiteDownArrow.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/images/whiteDownArrow.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/incrementMonth.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/incrementMonth.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/incrementMonth.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/incrementMonth.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/incrementWeek.gif b/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/incrementWeek.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/incrementWeek.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/incrementWeek.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/Parse.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/xml/Parse.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/Parse.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/xml/Parse.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/__package__.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/xml/__package__.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/__package__.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/xml/__package__.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/domUtil.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/xml/domUtil.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/domUtil.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/xml/domUtil.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/htmlUtil.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/xml/htmlUtil.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/htmlUtil.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/xml/htmlUtil.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/svgUtil.js b/core/src/main/resources/org/apache/struts2/static/dojo/src/xml/svgUtil.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/svgUtil.js rename to core/src/main/resources/org/apache/struts2/static/dojo/src/xml/svgUtil.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/struts/Util.js b/core/src/main/resources/org/apache/struts2/static/dojo/struts/Util.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/struts/Util.js rename to core/src/main/resources/org/apache/struts2/static/dojo/struts/Util.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/struts/tooltip.gif b/core/src/main/resources/org/apache/struts2/static/dojo/struts/tooltip.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/struts/tooltip.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/struts/tooltip.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/Bind.html b/core/src/main/resources/org/apache/struts2/static/dojo/struts/widgets/Bind.html similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/Bind.html rename to core/src/main/resources/org/apache/struts2/static/dojo/struts/widgets/Bind.html diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/Bind.js b/core/src/main/resources/org/apache/struts2/static/dojo/struts/widgets/Bind.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/Bind.js rename to core/src/main/resources/org/apache/struts2/static/dojo/struts/widgets/Bind.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindAnchor.html b/core/src/main/resources/org/apache/struts2/static/dojo/struts/widgets/BindAnchor.html similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindAnchor.html rename to core/src/main/resources/org/apache/struts2/static/dojo/struts/widgets/BindAnchor.html diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindAnchor.js b/core/src/main/resources/org/apache/struts2/static/dojo/struts/widgets/BindAnchor.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindAnchor.js rename to core/src/main/resources/org/apache/struts2/static/dojo/struts/widgets/BindAnchor.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindButton.html b/core/src/main/resources/org/apache/struts2/static/dojo/struts/widgets/BindButton.html similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindButton.html rename to core/src/main/resources/org/apache/struts2/static/dojo/struts/widgets/BindButton.html diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindButton.js b/core/src/main/resources/org/apache/struts2/static/dojo/struts/widgets/BindButton.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindButton.js rename to core/src/main/resources/org/apache/struts2/static/dojo/struts/widgets/BindButton.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindDiv.html b/core/src/main/resources/org/apache/struts2/static/dojo/struts/widgets/BindDiv.html similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindDiv.html rename to core/src/main/resources/org/apache/struts2/static/dojo/struts/widgets/BindDiv.html diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindDiv.js b/core/src/main/resources/org/apache/struts2/static/dojo/struts/widgets/BindDiv.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindDiv.js rename to core/src/main/resources/org/apache/struts2/static/dojo/struts/widgets/BindDiv.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/DropdownContainer.js b/core/src/main/resources/org/apache/struts2/static/dojo/struts/widgets/DropdownContainer.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/DropdownContainer.js rename to core/src/main/resources/org/apache/struts2/static/dojo/struts/widgets/DropdownContainer.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/DynArchCalendar.html b/core/src/main/resources/org/apache/struts2/static/dojo/struts/widgets/DynArchCalendar.html similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/DynArchCalendar.html rename to core/src/main/resources/org/apache/struts2/static/dojo/struts/widgets/DynArchCalendar.html diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/DynArchCalendar.js b/core/src/main/resources/org/apache/struts2/static/dojo/struts/widgets/DynArchCalendar.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/DynArchCalendar.js rename to core/src/main/resources/org/apache/struts2/static/dojo/struts/widgets/DynArchCalendar.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/ToggleBindDiv.js b/core/src/main/resources/org/apache/struts2/static/dojo/struts/widgets/ToggleBindDiv.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/ToggleBindDiv.js rename to core/src/main/resources/org/apache/struts2/static/dojo/struts/widgets/ToggleBindDiv.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/__package__.js b/core/src/main/resources/org/apache/struts2/static/dojo/struts/widgets/__package__.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/__package__.js rename to core/src/main/resources/org/apache/struts2/static/dojo/struts/widgets/__package__.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/dateIcon.gif b/core/src/main/resources/org/apache/struts2/static/dojo/struts/widgets/dateIcon.gif similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/dateIcon.gif rename to core/src/main/resources/org/apache/struts2/static/dojo/struts/widgets/dateIcon.gif diff --git a/core/src/main/resources/org/apache/struts/action2/static/niftycorners/layout.js b/core/src/main/resources/org/apache/struts2/static/niftycorners/layout.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/niftycorners/layout.js rename to core/src/main/resources/org/apache/struts2/static/niftycorners/layout.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/niftycorners/nifty.js b/core/src/main/resources/org/apache/struts2/static/niftycorners/nifty.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/niftycorners/nifty.js rename to core/src/main/resources/org/apache/struts2/static/niftycorners/nifty.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/niftycorners/niftyCorners.css b/core/src/main/resources/org/apache/struts2/static/niftycorners/niftyCorners.css similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/niftycorners/niftyCorners.css rename to core/src/main/resources/org/apache/struts2/static/niftycorners/niftyCorners.css diff --git a/core/src/main/resources/org/apache/struts/action2/static/niftycorners/niftyPrint.css b/core/src/main/resources/org/apache/struts2/static/niftycorners/niftyPrint.css similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/niftycorners/niftyPrint.css rename to core/src/main/resources/org/apache/struts2/static/niftycorners/niftyPrint.css diff --git a/core/src/main/resources/org/apache/struts/action2/static/niftycorners/niftylayout.css b/core/src/main/resources/org/apache/struts2/static/niftycorners/niftylayout.css similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/niftycorners/niftylayout.css rename to core/src/main/resources/org/apache/struts2/static/niftycorners/niftylayout.css diff --git a/core/src/main/resources/org/apache/struts/action2/static/optiontransferselect.js b/core/src/main/resources/org/apache/struts2/static/optiontransferselect.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/optiontransferselect.js rename to core/src/main/resources/org/apache/struts2/static/optiontransferselect.js diff --git a/core/src/main/resources/org/apache/struts/action2/static/tabs.css b/core/src/main/resources/org/apache/struts2/static/tabs.css similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/tabs.css rename to core/src/main/resources/org/apache/struts2/static/tabs.css diff --git a/core/src/main/resources/org/apache/struts/action2/static/tree.css b/core/src/main/resources/org/apache/struts2/static/tree.css similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/tree.css rename to core/src/main/resources/org/apache/struts2/static/tree.css diff --git a/core/src/main/resources/org/apache/struts/action2/static/validationClient.js b/core/src/main/resources/org/apache/struts2/static/validationClient.js similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/static/validationClient.js rename to core/src/main/resources/org/apache/struts2/static/validationClient.js diff --git a/core/src/main/resources/org/apache/struts/action2/struts-messages.properties b/core/src/main/resources/org/apache/struts2/struts-messages.properties similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/struts-messages.properties rename to core/src/main/resources/org/apache/struts2/struts-messages.properties diff --git a/core/src/main/resources/org/apache/struts/action2/struts-messages_da.properties b/core/src/main/resources/org/apache/struts2/struts-messages_da.properties similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/struts-messages_da.properties rename to core/src/main/resources/org/apache/struts2/struts-messages_da.properties diff --git a/core/src/main/resources/org/apache/struts/action2/struts-messages_de.properties b/core/src/main/resources/org/apache/struts2/struts-messages_de.properties similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/struts-messages_de.properties rename to core/src/main/resources/org/apache/struts2/struts-messages_de.properties diff --git a/core/src/main/resources/org/apache/struts/action2/util/package.html b/core/src/main/resources/org/apache/struts2/util/package.html similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/util/package.html rename to core/src/main/resources/org/apache/struts2/util/package.html diff --git a/core/src/main/resources/org/apache/struts/action2/views/freemarker/package.html b/core/src/main/resources/org/apache/struts2/views/freemarker/package.html similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/views/freemarker/package.html rename to core/src/main/resources/org/apache/struts2/views/freemarker/package.html diff --git a/core/src/main/resources/org/apache/struts/action2/views/jasperreports/package.html b/core/src/main/resources/org/apache/struts2/views/jasperreports/package.html similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/views/jasperreports/package.html rename to core/src/main/resources/org/apache/struts2/views/jasperreports/package.html diff --git a/core/src/main/resources/org/apache/struts/action2/views/jsp/iterator/package.html b/core/src/main/resources/org/apache/struts2/views/jsp/iterator/package.html similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/views/jsp/iterator/package.html rename to core/src/main/resources/org/apache/struts2/views/jsp/iterator/package.html diff --git a/core/src/main/resources/org/apache/struts/action2/views/jsp/ui/package.html b/core/src/main/resources/org/apache/struts2/views/jsp/ui/package.html similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/views/jsp/ui/package.html rename to core/src/main/resources/org/apache/struts2/views/jsp/ui/package.html diff --git a/core/src/main/resources/org/apache/struts/action2/views/jsp/ui/table/package.html b/core/src/main/resources/org/apache/struts2/views/jsp/ui/table/package.html similarity index 100% rename from core/src/main/resources/org/apache/struts/action2/views/jsp/ui/table/package.html rename to core/src/main/resources/org/apache/struts2/views/jsp/ui/table/package.html diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml index b6f1b4859..8a9f3d1ee 100644 --- a/core/src/main/resources/struts-default.xml +++ b/core/src/main/resources/struts-default.xml @@ -3,44 +3,44 @@ - - - - - - - - - - + + + + + + + + + + - + - - - + + + - + - + - - - + + + - - + + diff --git a/core/src/main/resources/struts-jsf.xml b/core/src/main/resources/struts-jsf.xml index d026e7a94..4c758be04 100644 --- a/core/src/main/resources/struts-jsf.xml +++ b/core/src/main/resources/struts-jsf.xml @@ -2,17 +2,17 @@ - + - - - - - - + + + + + + diff --git a/core/src/main/resources/struts-portlet-default.xml b/core/src/main/resources/struts-portlet-default.xml index 63ebfcfd9..4e547259c 100644 --- a/core/src/main/resources/struts-portlet-default.xml +++ b/core/src/main/resources/struts-portlet-default.xml @@ -5,18 +5,18 @@ - - - + + + - + ${location} - + ${location} - + ${location} diff --git a/core/src/test/java/org/apache/struts/action2/ExecutionCountTestAction.java b/core/src/test/java/org/apache/struts2/ExecutionCountTestAction.java similarity index 97% rename from core/src/test/java/org/apache/struts/action2/ExecutionCountTestAction.java rename to core/src/test/java/org/apache/struts2/ExecutionCountTestAction.java index 4a41dc4db..87bde4429 100644 --- a/core/src/test/java/org/apache/struts/action2/ExecutionCountTestAction.java +++ b/core/src/test/java/org/apache/struts2/ExecutionCountTestAction.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.ActionSupport; import org.apache.commons.logging.Log; diff --git a/core/src/test/java/org/apache/struts/action2/RequestUtilsTest.java b/core/src/test/java/org/apache/struts2/RequestUtilsTest.java similarity index 98% rename from core/src/test/java/org/apache/struts/action2/RequestUtilsTest.java rename to core/src/test/java/org/apache/struts2/RequestUtilsTest.java index f58b3e07d..5b345487e 100644 --- a/core/src/test/java/org/apache/struts/action2/RequestUtilsTest.java +++ b/core/src/test/java/org/apache/struts2/RequestUtilsTest.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; /** * RequestUtilsTest diff --git a/core/src/test/java/org/apache/struts/action2/ServletActionContextTest.java b/core/src/test/java/org/apache/struts2/ServletActionContextTest.java similarity index 98% rename from core/src/test/java/org/apache/struts/action2/ServletActionContextTest.java rename to core/src/test/java/org/apache/struts2/ServletActionContextTest.java index 5a3a909d8..0d4f16eb7 100644 --- a/core/src/test/java/org/apache/struts/action2/ServletActionContextTest.java +++ b/core/src/test/java/org/apache/struts2/ServletActionContextTest.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.mockobjects.servlet.MockHttpServletRequest; import com.mockobjects.servlet.MockHttpServletResponse; diff --git a/core/src/test/java/org/apache/struts/action2/TestAction.java b/core/src/test/java/org/apache/struts2/TestAction.java similarity index 97% rename from core/src/test/java/org/apache/struts/action2/TestAction.java rename to core/src/test/java/org/apache/struts2/TestAction.java index 6d674a862..949d510a2 100644 --- a/core/src/test/java/org/apache/struts/action2/TestAction.java +++ b/core/src/test/java/org/apache/struts2/TestAction.java @@ -15,9 +15,9 @@ * 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.views.jsp.ui.User; +import org.apache.struts2.views.jsp.ui.User; import com.opensymphony.xwork.Action; import com.opensymphony.xwork.ActionSupport; diff --git a/core/src/test/java/org/apache/struts/action2/TestActionTagResult.java b/core/src/test/java/org/apache/struts2/TestActionTagResult.java similarity index 96% rename from core/src/test/java/org/apache/struts/action2/TestActionTagResult.java rename to core/src/test/java/org/apache/struts2/TestActionTagResult.java index d825a748f..17bb065fd 100644 --- a/core/src/test/java/org/apache/struts/action2/TestActionTagResult.java +++ b/core/src/test/java/org/apache/struts2/TestActionTagResult.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.ActionInvocation; import com.opensymphony.xwork.Result; diff --git a/core/src/test/java/org/apache/struts/action2/TestConfigurationProvider.java b/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java similarity index 95% rename from core/src/test/java/org/apache/struts/action2/TestConfigurationProvider.java rename to core/src/test/java/org/apache/struts2/TestConfigurationProvider.java index 72dbe9568..49efd936c 100644 --- a/core/src/test/java/org/apache/struts/action2/TestConfigurationProvider.java +++ b/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java @@ -15,11 +15,11 @@ * 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.dispatcher.ServletDispatcherResult; -import org.apache.struts.action2.interceptor.TokenInterceptor; -import org.apache.struts.action2.interceptor.TokenSessionStoreInterceptor; +import org.apache.struts2.dispatcher.ServletDispatcherResult; +import org.apache.struts2.interceptor.TokenInterceptor; +import org.apache.struts2.interceptor.TokenSessionStoreInterceptor; import com.opensymphony.xwork.Action; import com.opensymphony.xwork.ActionChainResult; import com.opensymphony.xwork.config.Configuration; diff --git a/core/src/test/java/org/apache/struts/action2/TestResult.java b/core/src/test/java/org/apache/struts2/TestResult.java similarity index 98% rename from core/src/test/java/org/apache/struts/action2/TestResult.java rename to core/src/test/java/org/apache/struts2/TestResult.java index 8fc2b14d8..b38ddca05 100644 --- a/core/src/test/java/org/apache/struts/action2/TestResult.java +++ b/core/src/test/java/org/apache/struts2/TestResult.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.ActionInvocation; diff --git a/core/src/test/java/org/apache/struts/action2/components/AbstractRichtexteditorConnectorTest.java b/core/src/test/java/org/apache/struts2/components/AbstractRichtexteditorConnectorTest.java similarity index 99% rename from core/src/test/java/org/apache/struts/action2/components/AbstractRichtexteditorConnectorTest.java rename to core/src/test/java/org/apache/struts2/components/AbstractRichtexteditorConnectorTest.java index 50b1a6e99..94469bab1 100644 --- a/core/src/test/java/org/apache/struts/action2/components/AbstractRichtexteditorConnectorTest.java +++ b/core/src/test/java/org/apache/struts2/components/AbstractRichtexteditorConnectorTest.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.Action; import com.opensymphony.xwork.ActionContext; diff --git a/core/src/test/java/org/apache/struts/action2/components/ComponentTest.java b/core/src/test/java/org/apache/struts2/components/ComponentTest.java similarity index 92% rename from core/src/test/java/org/apache/struts/action2/components/ComponentTest.java rename to core/src/test/java/org/apache/struts2/components/ComponentTest.java index d1eba644d..3f75246ad 100644 --- a/core/src/test/java/org/apache/struts/action2/components/ComponentTest.java +++ b/core/src/test/java/org/apache/struts2/components/ComponentTest.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.Iterator; import java.util.Locale; @@ -24,23 +24,23 @@ import java.util.Stack; import javax.servlet.jsp.tagext.TagSupport; -import org.apache.struts.action2.views.jsp.AbstractTagTest; -import org.apache.struts.action2.views.jsp.BeanTag; -import org.apache.struts.action2.views.jsp.ElseIfTag; -import org.apache.struts.action2.views.jsp.ElseTag; -import org.apache.struts.action2.views.jsp.I18nTag; -import org.apache.struts.action2.views.jsp.IfTag; -import org.apache.struts.action2.views.jsp.IteratorTag; -import org.apache.struts.action2.views.jsp.PropertyTag; -import org.apache.struts.action2.views.jsp.PushTag; -import org.apache.struts.action2.views.jsp.SetTag; -import org.apache.struts.action2.views.jsp.TextTag; -import org.apache.struts.action2.views.jsp.URLTag; -import org.apache.struts.action2.views.jsp.iterator.AppendIteratorTag; -import org.apache.struts.action2.views.jsp.iterator.MergeIteratorTag; -import org.apache.struts.action2.views.jsp.ui.RichTextEditorTag; -import org.apache.struts.action2.views.jsp.ui.TextFieldTag; -import org.apache.struts.action2.views.jsp.ui.UpDownSelectTag; +import org.apache.struts2.views.jsp.AbstractTagTest; +import org.apache.struts2.views.jsp.BeanTag; +import org.apache.struts2.views.jsp.ElseIfTag; +import org.apache.struts2.views.jsp.ElseTag; +import org.apache.struts2.views.jsp.I18nTag; +import org.apache.struts2.views.jsp.IfTag; +import org.apache.struts2.views.jsp.IteratorTag; +import org.apache.struts2.views.jsp.PropertyTag; +import org.apache.struts2.views.jsp.PushTag; +import org.apache.struts2.views.jsp.SetTag; +import org.apache.struts2.views.jsp.TextTag; +import org.apache.struts2.views.jsp.URLTag; +import org.apache.struts2.views.jsp.iterator.AppendIteratorTag; +import org.apache.struts2.views.jsp.iterator.MergeIteratorTag; +import org.apache.struts2.views.jsp.ui.RichTextEditorTag; +import org.apache.struts2.views.jsp.ui.TextFieldTag; +import org.apache.struts2.views.jsp.ui.UpDownSelectTag; import com.opensymphony.xwork.ActionContext; import com.opensymphony.xwork.util.LocalizedTextUtil; @@ -184,7 +184,7 @@ public class ComponentTest extends AbstractTagTest { t.setName("textFieldName"); BeanTag tag = new BeanTag(); - tag.setName("org.apache.struts.action2.util.Counter"); + tag.setName("org.apache.struts2.util.Counter"); tag.setPageContext(pageContext); try { @@ -436,11 +436,11 @@ public class ComponentTest extends AbstractTagTest { t.setPageContext(pageContext); t.setName("textFieldName"); - ResourceBundle bundle = ResourceBundle.getBundle("org.apache.struts.action2.components.tempo"); - LocalizedTextUtil.addDefaultResourceBundle("org.apache.struts.action2.components.temp"); + ResourceBundle bundle = ResourceBundle.getBundle("org.apache.struts2.components.tempo"); + LocalizedTextUtil.addDefaultResourceBundle("org.apache.struts2.components.temp"); I18nTag tag = new I18nTag(); - tag.setName("org.apache.struts.action2.components.tempo"); + tag.setName("org.apache.struts2.components.tempo"); tag.setPageContext(pageContext); try { diff --git a/core/src/test/java/org/apache/struts/action2/components/FormTest.java b/core/src/test/java/org/apache/struts2/components/FormTest.java similarity index 88% rename from core/src/test/java/org/apache/struts/action2/components/FormTest.java rename to core/src/test/java/org/apache/struts2/components/FormTest.java index 3c2f90018..4b2372e61 100644 --- a/core/src/test/java/org/apache/struts/action2/components/FormTest.java +++ b/core/src/test/java/org/apache/struts2/components/FormTest.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.views.jsp.AbstractUITagTest; -import org.apache.struts.action2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; import com.opensymphony.xwork.validator.validators.RequiredFieldValidator; import java.util.List; diff --git a/core/src/test/java/org/apache/struts/action2/components/MockRichtexteditorConnector.java b/core/src/test/java/org/apache/struts2/components/MockRichtexteditorConnector.java similarity index 86% rename from core/src/test/java/org/apache/struts/action2/components/MockRichtexteditorConnector.java rename to core/src/test/java/org/apache/struts2/components/MockRichtexteditorConnector.java index 7de4bd59d..7239873bb 100644 --- a/core/src/test/java/org/apache/struts/action2/components/MockRichtexteditorConnector.java +++ b/core/src/test/java/org/apache/struts2/components/MockRichtexteditorConnector.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.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 org.apache.struts2.components.AbstractRichtexteditorConnector.CreateFolderResult; +import org.apache.struts2.components.AbstractRichtexteditorConnector.FileUploadResult; +import org.apache.struts2.components.AbstractRichtexteditorConnector.Folder; +import org.apache.struts2.components.AbstractRichtexteditorConnector.FoldersAndFiles; /** * diff --git a/core/src/test/java/org/apache/struts/action2/components/PropertyTest.java b/core/src/test/java/org/apache/struts2/components/PropertyTest.java similarity index 94% rename from core/src/test/java/org/apache/struts/action2/components/PropertyTest.java rename to core/src/test/java/org/apache/struts2/components/PropertyTest.java index 8fd83d24e..78e717c7d 100644 --- a/core/src/test/java/org/apache/struts/action2/components/PropertyTest.java +++ b/core/src/test/java/org/apache/struts2/components/PropertyTest.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.components.Property; -import org.apache.struts.action2.util.StrutsTypeConverter; +import org.apache.struts2.components.Property; +import org.apache.struts2.util.StrutsTypeConverter; import com.opensymphony.xwork.util.OgnlValueStack; import com.opensymphony.xwork.util.XWorkConverter; import junit.framework.TestCase; @@ -135,7 +135,7 @@ public class PropertyTest extends TestCase { private final class TestDefaultConverter extends XWorkConverter { protected TestDefaultConverter() { super(); - registerConverter("org.apache.struts.action2.components.PropertyTest$FooBar", new FooBarConverter()); + registerConverter("org.apache.struts2.components.PropertyTest$FooBar", new FooBarConverter()); } } } diff --git a/core/src/test/java/org/apache/struts/action2/components/UIComponentTest.java b/core/src/test/java/org/apache/struts2/components/UIComponentTest.java similarity index 98% rename from core/src/test/java/org/apache/struts/action2/components/UIComponentTest.java rename to core/src/test/java/org/apache/struts2/components/UIComponentTest.java index 033b64b07..25823474a 100644 --- a/core/src/test/java/org/apache/struts/action2/components/UIComponentTest.java +++ b/core/src/test/java/org/apache/struts2/components/UIComponentTest.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.ActionContext; import com.opensymphony.xwork.XWorkStatic; -import org.apache.struts.action2.TestConfigurationProvider; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; -import org.apache.struts.action2.views.jsp.ui.*; +import org.apache.struts2.TestConfigurationProvider; +import org.apache.struts2.views.jsp.AbstractUITagTest; +import org.apache.struts2.views.jsp.ui.*; /** diff --git a/core/src/test/java/org/apache/struts/action2/config/ConfigurationTest.java b/core/src/test/java/org/apache/struts2/config/ConfigurationTest.java similarity index 91% rename from core/src/test/java/org/apache/struts/action2/config/ConfigurationTest.java rename to core/src/test/java/org/apache/struts2/config/ConfigurationTest.java index 074946b68..c2d6653f4 100644 --- a/core/src/test/java/org/apache/struts/action2/config/ConfigurationTest.java +++ b/core/src/test/java/org/apache/struts2/config/ConfigurationTest.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 org.apache.struts.action2.StrutsTestCase; -import org.apache.struts.action2.StrutsConstants; +import org.apache.struts2.StrutsTestCase; +import org.apache.struts2.StrutsConstants; import com.opensymphony.xwork.util.LocalizedTextUtil; import java.util.Iterator; @@ -35,7 +35,7 @@ public class ConfigurationTest extends StrutsTestCase { assertEquals("12345", Configuration.getString(StrutsConstants.STRUTS_MULTIPART_MAXSIZE)); assertEquals("\temp", Configuration.getString(StrutsConstants.STRUTS_MULTIPART_SAVEDIR)); - assertEquals("test,org/apache/struts/action2/othertest", Configuration.getString( StrutsConstants.STRUTS_CUSTOM_PROPERTIES)); + assertEquals("test,org/apache/struts2/othertest", Configuration.getString( StrutsConstants.STRUTS_CUSTOM_PROPERTIES)); assertEquals("testvalue", Configuration.getString("testkey")); assertEquals("othertestvalue", Configuration.getString("othertestkey")); @@ -56,7 +56,7 @@ public class ConfigurationTest extends StrutsTestCase { Locale.setDefault(Locale.US); // force to US locale as we also have _de and _da properties LocalizedTextUtil.clearDefaultResourceBundles(); - LocalizedTextUtil.addDefaultResourceBundle("org/apache/struts/action2/struts-messages"); + LocalizedTextUtil.addDefaultResourceBundle("org/apache/struts2/struts-messages"); assertEquals("The form has already been processed or no token was supplied, please try again.", LocalizedTextUtil.findDefaultText("struts.messages.invalid.token", Locale.getDefault())); Configuration.reset(); diff --git a/core/src/test/java/org/apache/struts/action2/config/TestConfiguration.java b/core/src/test/java/org/apache/struts2/config/TestConfiguration.java similarity index 96% rename from core/src/test/java/org/apache/struts/action2/config/TestConfiguration.java rename to core/src/test/java/org/apache/struts2/config/TestConfiguration.java index 0412a7cf2..89f98de3c 100644 --- a/core/src/test/java/org/apache/struts/action2/config/TestConfiguration.java +++ b/core/src/test/java/org/apache/struts2/config/TestConfiguration.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.ArrayList; import java.util.Iterator; diff --git a/core/src/test/java/org/apache/struts/action2/dispatcher/AbstractServletDispatcherTestCase.java b/core/src/test/java/org/apache/struts2/dispatcher/AbstractServletDispatcherTestCase.java similarity index 94% rename from core/src/test/java/org/apache/struts/action2/dispatcher/AbstractServletDispatcherTestCase.java rename to core/src/test/java/org/apache/struts2/dispatcher/AbstractServletDispatcherTestCase.java index 9b120a604..e4a65c16b 100644 --- a/core/src/test/java/org/apache/struts/action2/dispatcher/AbstractServletDispatcherTestCase.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/AbstractServletDispatcherTestCase.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.mockobjects.dynamic.C; import com.mockobjects.dynamic.Mock; @@ -25,9 +25,9 @@ import com.mockobjects.servlet.MockServletConfig; import com.mockobjects.servlet.MockServletOutputStream; import com.opensymphony.xwork.XWorkStatic; import com.opensymphony.xwork.config.providers.XmlConfigurationProvider; -import org.apache.struts.action2.StrutsTestCase; -import org.apache.struts.action2.views.jsp.StrutsMockHttpServletRequest; -import org.apache.struts.action2.views.jsp.StrutsMockHttpServletResponse; +import org.apache.struts2.StrutsTestCase; +import org.apache.struts2.views.jsp.StrutsMockHttpServletRequest; +import org.apache.struts2.views.jsp.StrutsMockHttpServletResponse; import javax.servlet.RequestDispatcher; import javax.servlet.ServletContext; diff --git a/core/src/test/java/org/apache/struts/action2/dispatcher/DefautActionMapperTest.java b/core/src/test/java/org/apache/struts2/dispatcher/DefautActionMapperTest.java similarity index 92% rename from core/src/test/java/org/apache/struts/action2/dispatcher/DefautActionMapperTest.java rename to core/src/test/java/org/apache/struts2/dispatcher/DefautActionMapperTest.java index 8ccf49612..4bedc4fd0 100644 --- a/core/src/test/java/org/apache/struts/action2/dispatcher/DefautActionMapperTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/DefautActionMapperTest.java @@ -15,14 +15,14 @@ * 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.mockobjects.servlet.MockHttpServletRequest; -import org.apache.struts.action2.StrutsTestCase; -import org.apache.struts.action2.StrutsConstants; -import org.apache.struts.action2.config.Configuration; -import org.apache.struts.action2.dispatcher.mapper.ActionMapping; -import org.apache.struts.action2.dispatcher.mapper.DefaultActionMapper; +import org.apache.struts2.StrutsTestCase; +import org.apache.struts2.StrutsConstants; +import org.apache.struts2.config.Configuration; +import org.apache.struts2.dispatcher.mapper.ActionMapping; +import org.apache.struts2.dispatcher.mapper.DefaultActionMapper; import java.util.HashMap; diff --git a/core/src/test/java/org/apache/struts/action2/dispatcher/DispatcherUtilsTest.java b/core/src/test/java/org/apache/struts2/dispatcher/DispatcherUtilsTest.java similarity index 94% rename from core/src/test/java/org/apache/struts/action2/dispatcher/DispatcherUtilsTest.java rename to core/src/test/java/org/apache/struts2/dispatcher/DispatcherUtilsTest.java index 0066cd49c..76699c317 100644 --- a/core/src/test/java/org/apache/struts/action2/dispatcher/DispatcherUtilsTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/DispatcherUtilsTest.java @@ -15,12 +15,12 @@ * 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 java.util.Locale; import org.springframework.mock.web.MockServletContext; -import org.apache.struts.action2.StrutsTestCase; +import org.apache.struts2.StrutsTestCase; import com.opensymphony.xwork.util.LocalizedTextUtil; diff --git a/core/src/test/java/org/apache/struts/action2/dispatcher/FilterDispatcherTest.java b/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java similarity index 91% rename from core/src/test/java/org/apache/struts/action2/dispatcher/FilterDispatcherTest.java rename to core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java index b574f1517..6963beb29 100644 --- a/core/src/test/java/org/apache/struts/action2/dispatcher/FilterDispatcherTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java @@ -15,15 +15,15 @@ * 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.ObjectFactory; -import org.apache.struts.action2.StrutsConstants; -import org.apache.struts.action2.StrutsTestCase; -import org.apache.struts.action2.config.Configuration; -import org.apache.struts.action2.util.ObjectFactoryDestroyable; -import org.apache.struts.action2.util.ObjectFactoryInitializable; -import org.apache.struts.action2.util.ObjectFactoryLifecycle; +import org.apache.struts2.StrutsConstants; +import org.apache.struts2.StrutsTestCase; +import org.apache.struts2.config.Configuration; +import org.apache.struts2.util.ObjectFactoryDestroyable; +import org.apache.struts2.util.ObjectFactoryInitializable; +import org.apache.struts2.util.ObjectFactoryLifecycle; import org.springframework.mock.web.MockFilterConfig; import org.springframework.mock.web.MockServletContext; @@ -84,7 +84,7 @@ public class FilterDispatcherTest extends StrutsTestCase { DispatcherUtils.setInstance(null); Map configMap = new HashMap(); - configMap.put(StrutsConstants.STRUTS_OBJECTFACTORY, "org.apache.struts.action2.dispatcher.FilterDispatcherTest$InnerInitializableObjectFactory"); + configMap.put(StrutsConstants.STRUTS_OBJECTFACTORY, "org.apache.struts2.dispatcher.FilterDispatcherTest$InnerInitializableObjectFactory"); configMap.put(StrutsConstants.STRUTS_CONFIGURATION_XML_RELOAD, "false"); Configuration.setConfiguration(new InnerConfiguration(configMap)); @@ -104,7 +104,7 @@ public class FilterDispatcherTest extends StrutsTestCase { DispatcherUtils.setInstance(null); Map configMap = new HashMap(); - configMap.put(StrutsConstants.STRUTS_OBJECTFACTORY, "org.apache.struts.action2.dispatcher.FilterDispatcherTest$InnerInitailizableDestroyableObjectFactory"); + configMap.put(StrutsConstants.STRUTS_OBJECTFACTORY, "org.apache.struts2.dispatcher.FilterDispatcherTest$InnerInitailizableDestroyableObjectFactory"); configMap.put(StrutsConstants.STRUTS_CONFIGURATION_XML_RELOAD, "false"); Configuration.setConfiguration(new InnerConfiguration(configMap)); diff --git a/core/src/test/java/org/apache/struts/action2/dispatcher/HttpHeaderResultTest.java b/core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java similarity index 95% rename from core/src/test/java/org/apache/struts/action2/dispatcher/HttpHeaderResultTest.java rename to core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java index f87139a76..3d5790a4a 100644 --- a/core/src/test/java/org/apache/struts/action2/dispatcher/HttpHeaderResultTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java @@ -15,12 +15,12 @@ * 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.mockobjects.dynamic.C; import com.mockobjects.dynamic.Mock; -import org.apache.struts.action2.ServletActionContext; -import org.apache.struts.action2.StrutsTestCase; +import org.apache.struts2.ServletActionContext; +import org.apache.struts2.StrutsTestCase; import com.opensymphony.xwork.ActionContext; import com.opensymphony.xwork.ActionInvocation; import com.opensymphony.xwork.XWorkTestCase; diff --git a/core/src/test/java/org/apache/struts/action2/dispatcher/NullActionMapper.java b/core/src/test/java/org/apache/struts2/dispatcher/NullActionMapper.java similarity index 87% rename from core/src/test/java/org/apache/struts/action2/dispatcher/NullActionMapper.java rename to core/src/test/java/org/apache/struts2/dispatcher/NullActionMapper.java index 2f49be1a3..6c904951e 100644 --- a/core/src/test/java/org/apache/struts/action2/dispatcher/NullActionMapper.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/NullActionMapper.java @@ -15,12 +15,12 @@ * 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.http.HttpServletRequest; -import org.apache.struts.action2.dispatcher.mapper.ActionMapper; -import org.apache.struts.action2.dispatcher.mapper.ActionMapping; +import org.apache.struts2.dispatcher.mapper.ActionMapper; +import org.apache.struts2.dispatcher.mapper.ActionMapping; /** * ActionMapper for testing FilterDispatcher (used in FilterDispaatcherTest) diff --git a/core/src/test/java/org/apache/struts/action2/dispatcher/PlainTextResultTest.java b/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java similarity index 87% rename from core/src/test/java/org/apache/struts/action2/dispatcher/PlainTextResultTest.java rename to core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java index 1c2ec4662..0a3a626f4 100644 --- a/core/src/test/java/org/apache/struts/action2/dispatcher/PlainTextResultTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java @@ -15,17 +15,17 @@ * 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 java.io.InputStream; import java.io.PrintWriter; import java.io.StringWriter; import com.opensymphony.util.ClassLoaderUtil; -import org.apache.struts.action2.StrutsStatics; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; -import org.apache.struts.action2.views.jsp.StrutsMockHttpServletResponse; -import org.apache.struts.action2.views.jsp.StrutsMockServletContext; +import org.apache.struts2.StrutsStatics; +import org.apache.struts2.views.jsp.AbstractUITagTest; +import org.apache.struts2.views.jsp.StrutsMockHttpServletResponse; +import org.apache.struts2.views.jsp.StrutsMockServletContext; import com.opensymphony.xwork.ActionContext; import com.opensymphony.xwork.mock.MockActionInvocation; import com.opensymphony.xwork.util.OgnlValueStack; @@ -55,7 +55,7 @@ public class PlainTextResultTest extends TestCase { response.setExpectedHeader("Content-Disposition", "inline"); InputStream jspResourceInputStream = ClassLoaderUtil.getResourceAsStream( - "org/apache/struts/action2/dispatcher/someJspFile.jsp", + "org/apache/struts2/dispatcher/someJspFile.jsp", PlainTextResultTest.class); @@ -65,7 +65,7 @@ public class PlainTextResultTest extends TestCase { String r = AbstractUITagTest.normalize(stringWriter.getBuffer().toString(), true); String e = AbstractUITagTest.normalize( - readAsString("org/apache/struts/action2/dispatcher/someJspFile.jsp"), true); + readAsString("org/apache/struts2/dispatcher/someJspFile.jsp"), true); assertEquals(r, e); } finally { @@ -82,7 +82,7 @@ public class PlainTextResultTest extends TestCase { response.setExpectedHeader("Content-Disposition", "inline"); InputStream jspResourceInputStream = ClassLoaderUtil.getResourceAsStream( - "org/apache/struts/action2/dispatcher/someJspFile.jsp", + "org/apache/struts2/dispatcher/someJspFile.jsp", PlainTextResultTest.class); @@ -92,7 +92,7 @@ public class PlainTextResultTest extends TestCase { String r = AbstractUITagTest.normalize(stringWriter.getBuffer().toString(), true); String e = AbstractUITagTest.normalize( - readAsString("org/apache/struts/action2/dispatcher/someJspFile.jsp"), true); + readAsString("org/apache/struts2/dispatcher/someJspFile.jsp"), true); assertEquals(r, e); } finally { diff --git a/core/src/test/java/org/apache/struts/action2/dispatcher/ServletDispatchedTestAssertInterceptor.java b/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatchedTestAssertInterceptor.java similarity index 93% rename from core/src/test/java/org/apache/struts/action2/dispatcher/ServletDispatchedTestAssertInterceptor.java rename to core/src/test/java/org/apache/struts2/dispatcher/ServletDispatchedTestAssertInterceptor.java index ac88ba2ec..a5a8015df 100644 --- a/core/src/test/java/org/apache/struts/action2/dispatcher/ServletDispatchedTestAssertInterceptor.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatchedTestAssertInterceptor.java @@ -15,9 +15,9 @@ * 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 org.apache.struts.action2.TestAction; +import org.apache.struts2.TestAction; import com.opensymphony.xwork.ActionInvocation; import com.opensymphony.xwork.interceptor.Interceptor; import junit.framework.Assert; diff --git a/core/src/test/java/org/apache/struts/action2/dispatcher/ServletDispatcherResultTest.java b/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatcherResultTest.java similarity index 94% rename from core/src/test/java/org/apache/struts/action2/dispatcher/ServletDispatcherResultTest.java rename to core/src/test/java/org/apache/struts2/dispatcher/ServletDispatcherResultTest.java index 72675fd06..87a6f66d4 100644 --- a/core/src/test/java/org/apache/struts/action2/dispatcher/ServletDispatcherResultTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatcherResultTest.java @@ -15,13 +15,13 @@ * 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.mockobjects.dynamic.C; import com.mockobjects.dynamic.Mock; -import org.apache.struts.action2.ServletActionContext; -import org.apache.struts.action2.StrutsStatics; -import org.apache.struts.action2.StrutsTestCase; +import org.apache.struts2.ServletActionContext; +import org.apache.struts2.StrutsStatics; +import org.apache.struts2.StrutsTestCase; import com.opensymphony.xwork.ActionContext; import ognl.Ognl; diff --git a/core/src/test/java/org/apache/struts/action2/dispatcher/ServletDispatcherTest.java b/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatcherTest.java similarity index 91% rename from core/src/test/java/org/apache/struts/action2/dispatcher/ServletDispatcherTest.java rename to core/src/test/java/org/apache/struts2/dispatcher/ServletDispatcherTest.java index 8e49be2bd..226508942 100644 --- a/core/src/test/java/org/apache/struts/action2/dispatcher/ServletDispatcherTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatcherTest.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 java.util.HashMap; import java.util.Map; @@ -25,7 +25,7 @@ import java.util.Map; */ public class ServletDispatcherTest extends AbstractServletDispatcherTestCase { public String getConfigFilename() { - return "org/apache/struts/action2/dispatcher/ServletDispatcherTest-xwork.xml"; + return "org/apache/struts2/dispatcher/ServletDispatcherTest-xwork.xml"; } public ServletDispatcher getServletDispatcher() { diff --git a/core/src/test/java/org/apache/struts/action2/dispatcher/ServletRedirectResultTest.java b/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java similarity index 94% rename from core/src/test/java/org/apache/struts/action2/dispatcher/ServletRedirectResultTest.java rename to core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java index d2cf2bcbc..e0e42b225 100644 --- a/core/src/test/java/org/apache/struts/action2/dispatcher/ServletRedirectResultTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java @@ -15,13 +15,13 @@ * 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.mockobjects.dynamic.C; import com.mockobjects.dynamic.Mock; -import org.apache.struts.action2.ServletActionContext; -import org.apache.struts.action2.StrutsStatics; -import org.apache.struts.action2.StrutsTestCase; +import org.apache.struts2.ServletActionContext; +import org.apache.struts2.StrutsStatics; +import org.apache.struts2.StrutsTestCase; import com.opensymphony.xwork.ActionContext; import com.opensymphony.xwork.ActionInvocation; import com.opensymphony.xwork.mock.MockActionInvocation; diff --git a/core/src/test/java/org/apache/struts/action2/dispatcher/SessionMapTest.java b/core/src/test/java/org/apache/struts2/dispatcher/SessionMapTest.java similarity index 99% rename from core/src/test/java/org/apache/struts/action2/dispatcher/SessionMapTest.java rename to core/src/test/java/org/apache/struts2/dispatcher/SessionMapTest.java index edaaf8b1c..a8ce8fc26 100644 --- a/core/src/test/java/org/apache/struts/action2/dispatcher/SessionMapTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/SessionMapTest.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.mockobjects.constraint.Constraint; import com.mockobjects.constraint.IsAnything; diff --git a/core/src/test/java/org/apache/struts/action2/dispatcher/StreamResultTest.java b/core/src/test/java/org/apache/struts2/dispatcher/StreamResultTest.java similarity index 98% rename from core/src/test/java/org/apache/struts/action2/dispatcher/StreamResultTest.java rename to core/src/test/java/org/apache/struts2/dispatcher/StreamResultTest.java index 2f0107f45..53dcd7bd9 100644 --- a/core/src/test/java/org/apache/struts/action2/dispatcher/StreamResultTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/StreamResultTest.java @@ -15,10 +15,10 @@ * 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.util.ClassLoaderUtil; -import org.apache.struts.action2.ServletActionContext; +import org.apache.struts2.ServletActionContext; import com.opensymphony.xwork.Action; import com.opensymphony.xwork.ActionContext; import com.opensymphony.xwork.mock.MockActionInvocation; diff --git a/core/src/test/java/org/apache/struts/action2/dispatcher/StrutsResultSupportTest.java b/core/src/test/java/org/apache/struts2/dispatcher/StrutsResultSupportTest.java similarity index 97% rename from core/src/test/java/org/apache/struts/action2/dispatcher/StrutsResultSupportTest.java rename to core/src/test/java/org/apache/struts2/dispatcher/StrutsResultSupportTest.java index d591a26e6..020536184 100644 --- a/core/src/test/java/org/apache/struts/action2/dispatcher/StrutsResultSupportTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/StrutsResultSupportTest.java @@ -15,9 +15,9 @@ * 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 org.apache.struts.action2.StrutsTestCase; +import org.apache.struts2.StrutsTestCase; /* * $Id: StrutsResultSupport.java 394468 2006-04-16 12:16:03Z tmjee $ * diff --git a/core/src/test/java/org/apache/struts/action2/dispatcher/VelocityResultTest.java b/core/src/test/java/org/apache/struts2/dispatcher/VelocityResultTest.java similarity index 99% rename from core/src/test/java/org/apache/struts/action2/dispatcher/VelocityResultTest.java rename to core/src/test/java/org/apache/struts2/dispatcher/VelocityResultTest.java index 819f052e8..537578147 100644 --- a/core/src/test/java/org/apache/struts/action2/dispatcher/VelocityResultTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/VelocityResultTest.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.mockobjects.dynamic.Mock; import com.opensymphony.xwork.ActionContext; diff --git a/core/src/test/java/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapperTest.java b/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java similarity index 97% rename from core/src/test/java/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapperTest.java rename to core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java index ef3c3cfad..0d9bb2491 100644 --- a/core/src/test/java/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapperTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.dispatcher.mapper; +package org.apache.struts2.dispatcher.mapper; import com.opensymphony.xwork.Result; -import org.apache.struts.action2.StrutsTestCase; -import org.apache.struts.action2.dispatcher.ServletRedirectResult; -import org.apache.struts.action2.views.jsp.StrutsMockHttpServletRequest; +import org.apache.struts2.StrutsTestCase; +import org.apache.struts2.dispatcher.ServletRedirectResult; +import org.apache.struts2.views.jsp.StrutsMockHttpServletRequest; import java.util.HashMap; import java.util.Map; diff --git a/core/src/test/java/org/apache/struts/action2/dispatcher/mapper/RestfulActionMapperTest.java b/core/src/test/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapperTest.java similarity index 96% rename from core/src/test/java/org/apache/struts/action2/dispatcher/mapper/RestfulActionMapperTest.java rename to core/src/test/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapperTest.java index 87582d3d0..7e60bd065 100644 --- a/core/src/test/java/org/apache/struts/action2/dispatcher/mapper/RestfulActionMapperTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapperTest.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.mapper; +package org.apache.struts2.dispatcher.mapper; import junit.framework.TestCase; @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Collections; import java.util.HashMap; -import org.apache.struts.action2.views.jsp.StrutsMockHttpServletRequest; +import org.apache.struts2.views.jsp.StrutsMockHttpServletRequest; /** * Unit test for {@link RestfulActionMapper}. diff --git a/core/src/test/java/org/apache/struts/action2/interceptor/CreateSessionInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/CreateSessionInterceptorTest.java similarity index 90% rename from core/src/test/java/org/apache/struts/action2/interceptor/CreateSessionInterceptorTest.java rename to core/src/test/java/org/apache/struts2/interceptor/CreateSessionInterceptorTest.java index 30b87add1..082bc27ee 100644 --- a/core/src/test/java/org/apache/struts/action2/interceptor/CreateSessionInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/CreateSessionInterceptorTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.interceptor; +package org.apache.struts2.interceptor; import javax.servlet.http.HttpServletRequest; @@ -23,8 +23,8 @@ import org.jmock.Mock; import org.jmock.core.constraint.IsEqual; import org.jmock.core.matcher.InvokeOnceMatcher; -import org.apache.struts.action2.ServletActionContext; -import org.apache.struts.action2.StrutsTestCase; +import org.apache.struts2.ServletActionContext; +import org.apache.struts2.StrutsTestCase; import com.opensymphony.xwork.mock.MockActionInvocation; /** diff --git a/core/src/test/java/org/apache/struts/action2/interceptor/ExecuteAndWaitDelayAction.java b/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitDelayAction.java similarity index 94% rename from core/src/test/java/org/apache/struts/action2/interceptor/ExecuteAndWaitDelayAction.java rename to core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitDelayAction.java index 5319ffc8d..f98518c41 100644 --- a/core/src/test/java/org/apache/struts/action2/interceptor/ExecuteAndWaitDelayAction.java +++ b/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitDelayAction.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.interceptor; +package org.apache.struts2.interceptor; import com.opensymphony.xwork.Action; diff --git a/core/src/test/java/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java similarity index 96% rename from core/src/test/java/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptorTest.java rename to core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java index 0903a6d24..0b216156c 100644 --- a/core/src/test/java/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.interceptor; +package org.apache.struts2.interceptor; import com.opensymphony.xwork.*; import com.opensymphony.xwork.config.Configuration; @@ -27,10 +27,10 @@ import com.opensymphony.xwork.config.entities.PackageConfig; import com.opensymphony.xwork.config.entities.ResultConfig; import com.opensymphony.xwork.interceptor.ParametersInterceptor; import com.opensymphony.xwork.mock.MockResult; -import org.apache.struts.action2.ServletActionContext; -import org.apache.struts.action2.StrutsTestCase; -import org.apache.struts.action2.views.jsp.StrutsMockHttpServletRequest; -import org.apache.struts.action2.views.jsp.StrutsMockHttpSession; +import org.apache.struts2.ServletActionContext; +import org.apache.struts2.StrutsTestCase; +import org.apache.struts2.views.jsp.StrutsMockHttpServletRequest; +import org.apache.struts2.views.jsp.StrutsMockHttpSession; import javax.servlet.http.HttpSession; import java.util.ArrayList; diff --git a/core/src/test/java/org/apache/struts/action2/interceptor/FileUploadInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java similarity index 97% rename from core/src/test/java/org/apache/struts/action2/interceptor/FileUploadInterceptorTest.java rename to core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java index 99b9df96f..da4ecc28b 100644 --- a/core/src/test/java/org/apache/struts/action2/interceptor/FileUploadInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.interceptor; +package org.apache.struts2.interceptor; import com.opensymphony.util.ClassLoaderUtil; -import org.apache.struts.action2.ServletActionContext; -import org.apache.struts.action2.StrutsTestCase; -import org.apache.struts.action2.dispatcher.multipart.MultiPartRequestWrapper; +import org.apache.struts2.ServletActionContext; +import org.apache.struts2.StrutsTestCase; +import org.apache.struts2.dispatcher.multipart.MultiPartRequestWrapper; import com.opensymphony.xwork.*; import com.opensymphony.xwork.mock.MockActionInvocation; import org.springframework.mock.web.MockHttpServletRequest; diff --git a/core/src/test/java/org/apache/struts/action2/interceptor/ServletConfigInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java similarity index 97% rename from core/src/test/java/org/apache/struts/action2/interceptor/ServletConfigInterceptorTest.java rename to core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java index 8e650b183..1871bb594 100644 --- a/core/src/test/java/org/apache/struts/action2/interceptor/ServletConfigInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.interceptor; +package org.apache.struts2.interceptor; -import org.apache.struts.action2.StrutsStatics; -import org.apache.struts.action2.StrutsTestCase; -import org.apache.struts.action2.util.ServletContextAware; +import org.apache.struts2.StrutsStatics; +import org.apache.struts2.StrutsTestCase; +import org.apache.struts2.util.ServletContextAware; import com.opensymphony.xwork.ActionContext; import com.opensymphony.xwork.Action; import com.opensymphony.xwork.mock.MockActionInvocation; diff --git a/core/src/test/java/org/apache/struts/action2/interceptor/StrutsConversionErrorInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptorTest.java similarity index 97% rename from core/src/test/java/org/apache/struts/action2/interceptor/StrutsConversionErrorInterceptorTest.java rename to core/src/test/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptorTest.java index e0b43b10e..33f1af88d 100644 --- a/core/src/test/java/org/apache/struts/action2/interceptor/StrutsConversionErrorInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/StrutsConversionErrorInterceptorTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.interceptor; +package org.apache.struts2.interceptor; import com.mockobjects.dynamic.C; import com.mockobjects.dynamic.Mock; @@ -24,7 +24,7 @@ import com.opensymphony.xwork.ActionContext; import com.opensymphony.xwork.ActionInvocation; import com.opensymphony.xwork.ActionSupport; import com.opensymphony.xwork.util.OgnlValueStack; -import org.apache.struts.action2.StrutsTestCase; +import org.apache.struts2.StrutsTestCase; import java.util.HashMap; import java.util.Map; diff --git a/core/src/test/java/org/apache/struts/action2/interceptor/TokenInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java similarity index 91% rename from core/src/test/java/org/apache/struts/action2/interceptor/TokenInterceptorTest.java rename to core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java index 41334150b..2e91bc6e7 100644 --- a/core/src/test/java/org/apache/struts/action2/interceptor/TokenInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java @@ -15,16 +15,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.interceptor; +package org.apache.struts2.interceptor; import com.opensymphony.xwork.*; import com.opensymphony.xwork.util.OgnlValueStack; -import org.apache.struts.action2.ServletActionContext; -import org.apache.struts.action2.StrutsTestCase; -import org.apache.struts.action2.TestConfigurationProvider; -import org.apache.struts.action2.util.TokenHelper; -import org.apache.struts.action2.views.jsp.StrutsMockHttpServletRequest; -import org.apache.struts.action2.views.jsp.StrutsMockHttpSession; +import org.apache.struts2.ServletActionContext; +import org.apache.struts2.StrutsTestCase; +import org.apache.struts2.TestConfigurationProvider; +import org.apache.struts2.util.TokenHelper; +import org.apache.struts2.views.jsp.StrutsMockHttpServletRequest; +import org.apache.struts2.views.jsp.StrutsMockHttpSession; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; diff --git a/core/src/test/java/org/apache/struts/action2/interceptor/TokenSessionStoreInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptorTest.java similarity index 93% rename from core/src/test/java/org/apache/struts/action2/interceptor/TokenSessionStoreInterceptorTest.java rename to core/src/test/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptorTest.java index 2adf2948d..0e0c7eb8b 100644 --- a/core/src/test/java/org/apache/struts/action2/interceptor/TokenSessionStoreInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptorTest.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.interceptor; +package org.apache.struts2.interceptor; import com.opensymphony.xwork.ActionProxy; import com.opensymphony.xwork.Action; -import org.apache.struts.action2.TestConfigurationProvider; +import org.apache.struts2.TestConfigurationProvider; /** * Unit test for {@link TokenSessionStoreInterceptor}. diff --git a/core/src/test/java/org/apache/struts/action2/portlet/PortletApplicationMapTest.java b/core/src/test/java/org/apache/struts2/portlet/PortletApplicationMapTest.java similarity index 99% rename from core/src/test/java/org/apache/struts/action2/portlet/PortletApplicationMapTest.java rename to core/src/test/java/org/apache/struts2/portlet/PortletApplicationMapTest.java index 65c5fe20e..3bcc618a6 100644 --- a/core/src/test/java/org/apache/struts/action2/portlet/PortletApplicationMapTest.java +++ b/core/src/test/java/org/apache/struts2/portlet/PortletApplicationMapTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.portlet; +package org.apache.struts2.portlet; import java.util.ArrayList; import java.util.Arrays; diff --git a/core/src/test/java/org/apache/struts/action2/portlet/PortletRequestMapTest.java b/core/src/test/java/org/apache/struts2/portlet/PortletRequestMapTest.java similarity index 99% rename from core/src/test/java/org/apache/struts/action2/portlet/PortletRequestMapTest.java rename to core/src/test/java/org/apache/struts2/portlet/PortletRequestMapTest.java index a2b180a7b..d1547536e 100644 --- a/core/src/test/java/org/apache/struts/action2/portlet/PortletRequestMapTest.java +++ b/core/src/test/java/org/apache/struts2/portlet/PortletRequestMapTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.portlet; +package org.apache.struts2.portlet; import java.util.ArrayList; import java.util.Arrays; diff --git a/core/src/test/java/org/apache/struts/action2/portlet/PortletSessionMapTest.java b/core/src/test/java/org/apache/struts2/portlet/PortletSessionMapTest.java similarity index 99% rename from core/src/test/java/org/apache/struts/action2/portlet/PortletSessionMapTest.java rename to core/src/test/java/org/apache/struts2/portlet/PortletSessionMapTest.java index dff985e67..3674d9363 100644 --- a/core/src/test/java/org/apache/struts/action2/portlet/PortletSessionMapTest.java +++ b/core/src/test/java/org/apache/struts2/portlet/PortletSessionMapTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.portlet; +package org.apache.struts2.portlet; import java.util.Arrays; import java.util.Enumeration; diff --git a/core/src/test/java/org/apache/struts/action2/portlet/context/PortletActionContextTest.java b/core/src/test/java/org/apache/struts2/portlet/context/PortletActionContextTest.java similarity index 98% rename from core/src/test/java/org/apache/struts/action2/portlet/context/PortletActionContextTest.java rename to core/src/test/java/org/apache/struts2/portlet/context/PortletActionContextTest.java index 7ba60929e..54207d6da 100644 --- a/core/src/test/java/org/apache/struts/action2/portlet/context/PortletActionContextTest.java +++ b/core/src/test/java/org/apache/struts2/portlet/context/PortletActionContextTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.portlet.context; +package org.apache.struts2.portlet.context; import java.util.HashMap; import java.util.Map; @@ -31,7 +31,7 @@ import junit.textui.TestRunner; import org.jmock.Mock; import org.jmock.MockObjectTestCase; -import org.apache.struts.action2.portlet.PortletActionConstants; +import org.apache.struts2.portlet.PortletActionConstants; import com.opensymphony.xwork.ActionContext; /** diff --git a/core/src/test/java/org/apache/struts/action2/portlet/context/PreparatorServletTest.java b/core/src/test/java/org/apache/struts2/portlet/context/PreparatorServletTest.java similarity index 93% rename from core/src/test/java/org/apache/struts/action2/portlet/context/PreparatorServletTest.java rename to core/src/test/java/org/apache/struts2/portlet/context/PreparatorServletTest.java index ce7332ea6..eb95b08a3 100644 --- a/core/src/test/java/org/apache/struts/action2/portlet/context/PreparatorServletTest.java +++ b/core/src/test/java/org/apache/struts2/portlet/context/PreparatorServletTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.portlet.context; +package org.apache.struts2.portlet.context; import javax.servlet.ServletConfig; import javax.servlet.ServletContext; @@ -24,8 +24,8 @@ import javax.servlet.http.HttpServletResponse; import org.easymock.MockControl; -import org.apache.struts.action2.ServletActionContext; -import org.apache.struts.action2.StrutsTestCase; +import org.apache.struts2.ServletActionContext; +import org.apache.struts2.StrutsTestCase; import junit.framework.TestCase; diff --git a/core/src/test/java/org/apache/struts/action2/portlet/context/ServletContextHolderListenerTest.java b/core/src/test/java/org/apache/struts2/portlet/context/ServletContextHolderListenerTest.java similarity index 96% rename from core/src/test/java/org/apache/struts/action2/portlet/context/ServletContextHolderListenerTest.java rename to core/src/test/java/org/apache/struts2/portlet/context/ServletContextHolderListenerTest.java index 2c806732f..e0be1903c 100644 --- a/core/src/test/java/org/apache/struts/action2/portlet/context/ServletContextHolderListenerTest.java +++ b/core/src/test/java/org/apache/struts2/portlet/context/ServletContextHolderListenerTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.portlet.context; +package org.apache.struts2.portlet.context; import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; diff --git a/core/src/test/java/org/apache/struts/action2/portlet/dispatcher/Jsr168DispatcherTest.java b/core/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java similarity index 98% rename from core/src/test/java/org/apache/struts/action2/portlet/dispatcher/Jsr168DispatcherTest.java rename to core/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java index a3588b517..5b54f063b 100644 --- a/core/src/test/java/org/apache/struts/action2/portlet/dispatcher/Jsr168DispatcherTest.java +++ b/core/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.portlet.dispatcher; +package org.apache.struts2.portlet.dispatcher; import java.util.Collections; import java.util.HashMap; @@ -42,8 +42,8 @@ import org.jmock.Mock; import org.jmock.cglib.MockObjectTestCase; import org.jmock.core.Constraint; -import org.apache.struts.action2.portlet.PortletActionConstants; -import org.apache.struts.action2.portlet.context.ServletContextHolderListener; +import org.apache.struts2.portlet.PortletActionConstants; +import org.apache.struts2.portlet.context.ServletContextHolderListener; import com.opensymphony.xwork.Action; import com.opensymphony.xwork.ActionInvocation; import com.opensymphony.xwork.ActionProxy; diff --git a/core/src/test/java/org/apache/struts/action2/portlet/result/PortletResultTest.java b/core/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java similarity index 98% rename from core/src/test/java/org/apache/struts/action2/portlet/result/PortletResultTest.java rename to core/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java index d17f3c907..e0594f3cc 100644 --- a/core/src/test/java/org/apache/struts/action2/portlet/result/PortletResultTest.java +++ b/core/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.portlet.result; +package org.apache.struts2.portlet.result; import java.util.HashMap; import java.util.Map; @@ -35,7 +35,7 @@ import org.jmock.Mock; import org.jmock.cglib.MockObjectTestCase; import org.jmock.core.Constraint; -import org.apache.struts.action2.portlet.PortletActionConstants; +import org.apache.struts2.portlet.PortletActionConstants; import com.opensymphony.xwork.ActionContext; import com.opensymphony.xwork.ActionInvocation; diff --git a/core/src/test/java/org/apache/struts/action2/portlet/util/PortletUrlHelperTest.java b/core/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java similarity index 97% rename from core/src/test/java/org/apache/struts/action2/portlet/util/PortletUrlHelperTest.java rename to core/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java index 6db70b83d..54260c08f 100644 --- a/core/src/test/java/org/apache/struts/action2/portlet/util/PortletUrlHelperTest.java +++ b/core/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.portlet.util; +package org.apache.struts2.portlet.util; import java.util.HashMap; import java.util.Map; @@ -30,7 +30,7 @@ import junit.framework.TestCase; import org.easymock.MockControl; -import org.apache.struts.action2.portlet.context.PortletActionContext; +import org.apache.struts2.portlet.context.PortletActionContext; import com.opensymphony.xwork.ActionContext; /** diff --git a/core/src/test/java/org/apache/struts/action2/portlet/util/StrutsUtilTest.java b/core/src/test/java/org/apache/struts2/portlet/util/StrutsUtilTest.java similarity index 96% rename from core/src/test/java/org/apache/struts/action2/portlet/util/StrutsUtilTest.java rename to core/src/test/java/org/apache/struts2/portlet/util/StrutsUtilTest.java index c24e11a37..7a0ae660a 100644 --- a/core/src/test/java/org/apache/struts/action2/portlet/util/StrutsUtilTest.java +++ b/core/src/test/java/org/apache/struts2/portlet/util/StrutsUtilTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.portlet.util; +package org.apache.struts2.portlet.util; import java.util.ArrayList; import java.util.List; @@ -28,10 +28,10 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockRequestDispatcher; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.StrutsTestCase; -import org.apache.struts.action2.util.ListEntry; -import org.apache.struts.action2.util.StrutsUtil; +import org.apache.struts2.TestAction; +import org.apache.struts2.StrutsTestCase; +import org.apache.struts2.util.ListEntry; +import org.apache.struts2.util.StrutsUtil; import com.opensymphony.xwork.util.OgnlValueStack; import junit.framework.TestCase; @@ -48,7 +48,7 @@ public class StrutsUtilTest extends StrutsTestCase { protected StrutsUtil strutsUtil = null; public void testBeanMethod() throws Exception { - Object o = strutsUtil.bean("org.apache.struts.action2.TestAction"); + Object o = strutsUtil.bean("org.apache.struts2.TestAction"); assertNotNull(o); assertTrue(o instanceof TestAction); } diff --git a/core/src/test/java/org/apache/struts/action2/sitegraph/SiteGraphTest.java b/core/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java similarity index 92% rename from core/src/test/java/org/apache/struts/action2/sitegraph/SiteGraphTest.java rename to core/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java index 700a195a5..5cc9d5140 100644 --- a/core/src/test/java/org/apache/struts/action2/sitegraph/SiteGraphTest.java +++ b/core/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.sitegraph; +package org.apache.struts2.sitegraph; import com.opensymphony.util.ClassLoaderUtil; -import org.apache.struts.action2.StrutsTestCase; +import org.apache.struts2.StrutsTestCase; import java.io.File; import java.io.InputStream; @@ -32,7 +32,7 @@ public class SiteGraphTest extends StrutsTestCase { // use the classloader rather than relying on the // working directory being an assumed value when // running the test: so let's get this class's parent dir - URL url = ClassLoaderUtil.getResource("org/apache/struts/action2/sitegraph/xwork.xml", SiteGraphTest.class); + URL url = ClassLoaderUtil.getResource("org/apache/struts2/sitegraph/xwork.xml", SiteGraphTest.class); File file = new File(url.toString().substring(5)); String dir = file.getParent(); diff --git a/core/src/test/java/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest.java b/core/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java similarity index 87% rename from core/src/test/java/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest.java rename to core/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java index 13150c64c..3bd2fb74e 100644 --- a/core/src/test/java/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest.java +++ b/core/src/test/java/org/apache/struts2/spring/StrutsSpringObjectFactoryTest.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.spring; +package org.apache.struts2.spring; -import org.apache.struts.action2.StrutsConstants; -import org.apache.struts.action2.StrutsTestCase; -import org.apache.struts.action2.config.Configuration; +import org.apache.struts2.StrutsConstants; +import org.apache.struts2.StrutsTestCase; +import org.apache.struts2.config.Configuration; import junit.framework.TestCase; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; import org.springframework.mock.web.MockServletContext; @@ -54,7 +54,7 @@ public class StrutsSpringObjectFactoryTest extends StrutsTestCase { ServletContext msc = (ServletContext) new MockServletContext(); msc.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, ac); ac.setServletContext(msc); - ac.setConfigLocations(new String[] {"org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest-applicationContext.xml"}); + ac.setConfigLocations(new String[] {"org/apache/struts2/spring/StrutsSpringObjectFactoryTest-applicationContext.xml"}); ac.refresh(); fac.init(msc); diff --git a/core/src/test/java/org/apache/struts/action2/util/CounterTest.java b/core/src/test/java/org/apache/struts2/util/CounterTest.java similarity index 96% rename from core/src/test/java/org/apache/struts/action2/util/CounterTest.java rename to core/src/test/java/org/apache/struts2/util/CounterTest.java index 97e8e3f56..4295e9191 100644 --- a/core/src/test/java/org/apache/struts/action2/util/CounterTest.java +++ b/core/src/test/java/org/apache/struts2/util/CounterTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.util; +package org.apache.struts2.util; import junit.framework.TestCase; diff --git a/core/src/test/java/org/apache/struts/action2/util/InvocationSessionStoreTest.java b/core/src/test/java/org/apache/struts2/util/InvocationSessionStoreTest.java similarity index 93% rename from core/src/test/java/org/apache/struts/action2/util/InvocationSessionStoreTest.java rename to core/src/test/java/org/apache/struts2/util/InvocationSessionStoreTest.java index 47d6127c7..e89d985c6 100644 --- a/core/src/test/java/org/apache/struts/action2/util/InvocationSessionStoreTest.java +++ b/core/src/test/java/org/apache/struts2/util/InvocationSessionStoreTest.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.util; +package org.apache.struts2.util; import com.mockobjects.dynamic.Mock; -import org.apache.struts.action2.StrutsTestCase; +import org.apache.struts2.StrutsTestCase; import com.opensymphony.xwork.ActionContext; import com.opensymphony.xwork.ActionInvocation; import com.opensymphony.xwork.ActionProxy; @@ -34,8 +34,8 @@ import java.util.Map; */ public class InvocationSessionStoreTest extends StrutsTestCase { - private static final String INVOCATION_KEY = "org.apache.struts.action2.util.InvocationSessionStoreTest.invocation"; - private static final String TOKEN_VALUE = "org.apache.struts.action2.util.InvocationSessionStoreTest.token"; + private static final String INVOCATION_KEY = "org.apache.struts2.util.InvocationSessionStoreTest.invocation"; + private static final String TOKEN_VALUE = "org.apache.struts2.util.InvocationSessionStoreTest.token"; private ActionInvocation invocation; diff --git a/core/src/test/java/org/apache/struts/action2/util/PrefixTrieTest.java b/core/src/test/java/org/apache/struts2/util/PrefixTrieTest.java similarity index 96% rename from core/src/test/java/org/apache/struts/action2/util/PrefixTrieTest.java rename to core/src/test/java/org/apache/struts2/util/PrefixTrieTest.java index 48e4aabae..ec98c01c2 100644 --- a/core/src/test/java/org/apache/struts/action2/util/PrefixTrieTest.java +++ b/core/src/test/java/org/apache/struts2/util/PrefixTrieTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.util; +package org.apache.struts2.util; import junit.framework.TestCase; diff --git a/core/src/test/java/org/apache/struts/action2/util/StrutsTypeConverterTest.java b/core/src/test/java/org/apache/struts2/util/StrutsTypeConverterTest.java similarity index 98% rename from core/src/test/java/org/apache/struts/action2/util/StrutsTypeConverterTest.java rename to core/src/test/java/org/apache/struts2/util/StrutsTypeConverterTest.java index 8ef6b4326..5010c5a9b 100644 --- a/core/src/test/java/org/apache/struts/action2/util/StrutsTypeConverterTest.java +++ b/core/src/test/java/org/apache/struts2/util/StrutsTypeConverterTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.util; +package org.apache.struts2.util; import java.util.Date; import java.util.HashMap; diff --git a/core/src/test/java/org/apache/struts/action2/util/TokenHelperTest.java b/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java similarity index 98% rename from core/src/test/java/org/apache/struts/action2/util/TokenHelperTest.java rename to core/src/test/java/org/apache/struts2/util/TokenHelperTest.java index 7966a8188..fbfe31279 100644 --- a/core/src/test/java/org/apache/struts/action2/util/TokenHelperTest.java +++ b/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.util; +package org.apache.struts2.util; import java.util.HashMap; import java.util.Map; diff --git a/core/src/test/java/org/apache/struts/action2/views/TemplateEngineManagerTest.java b/core/src/test/java/org/apache/struts2/views/TemplateEngineManagerTest.java similarity index 95% rename from core/src/test/java/org/apache/struts/action2/views/TemplateEngineManagerTest.java rename to core/src/test/java/org/apache/struts2/views/TemplateEngineManagerTest.java index 6a37203a3..45da69255 100644 --- a/core/src/test/java/org/apache/struts/action2/views/TemplateEngineManagerTest.java +++ b/core/src/test/java/org/apache/struts2/views/TemplateEngineManagerTest.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views; +package org.apache.struts2.views; -import org.apache.struts.action2.components.template.*; -import org.apache.struts.action2.config.Configuration; +import org.apache.struts2.components.template.*; +import org.apache.struts2.config.Configuration; import junit.framework.TestCase; /** diff --git a/core/src/test/java/org/apache/struts/action2/views/freemarker/FreemarkerManagerTest.java b/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerManagerTest.java similarity index 81% rename from core/src/test/java/org/apache/struts/action2/views/freemarker/FreemarkerManagerTest.java rename to core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerManagerTest.java index 6860455c1..379c9977a 100644 --- a/core/src/test/java/org/apache/struts/action2/views/freemarker/FreemarkerManagerTest.java +++ b/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerManagerTest.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.freemarker; +package org.apache.struts2.views.freemarker; -import org.apache.struts.action2.StrutsConstants; -import org.apache.struts.action2.StrutsTestCase; -import org.apache.struts.action2.config.Configuration; -import org.apache.struts.action2.views.jsp.StrutsMockServletContext; +import org.apache.struts2.StrutsConstants; +import org.apache.struts2.StrutsTestCase; +import org.apache.struts2.config.Configuration; +import org.apache.struts2.views.jsp.StrutsMockServletContext; /** * Test case for FreemarkerManager diff --git a/core/src/test/java/org/apache/struts/action2/views/freemarker/FreemarkerTest.java b/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerTest.java similarity index 94% rename from core/src/test/java/org/apache/struts/action2/views/freemarker/FreemarkerTest.java rename to core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerTest.java index 0bca4a93d..5f8e4f8e6 100644 --- a/core/src/test/java/org/apache/struts/action2/views/freemarker/FreemarkerTest.java +++ b/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerTest.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.freemarker; +package org.apache.struts2.views.freemarker; -import org.apache.struts.action2.util.ListEntry; -import org.apache.struts.action2.util.StrutsUtil; +import org.apache.struts2.util.ListEntry; +import org.apache.struts2.util.StrutsUtil; import com.opensymphony.xwork.ActionContext; import com.opensymphony.xwork.util.OgnlValueStack; import freemarker.ext.beans.CollectionModel; diff --git a/core/src/test/java/org/apache/struts/action2/views/freemarker/TestAction.java b/core/src/test/java/org/apache/struts2/views/freemarker/TestAction.java similarity index 96% rename from core/src/test/java/org/apache/struts/action2/views/freemarker/TestAction.java rename to core/src/test/java/org/apache/struts2/views/freemarker/TestAction.java index 0845459ec..473890791 100644 --- a/core/src/test/java/org/apache/struts/action2/views/freemarker/TestAction.java +++ b/core/src/test/java/org/apache/struts2/views/freemarker/TestAction.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.freemarker; +package org.apache.struts2.views.freemarker; import com.opensymphony.xwork.ActionSupport; diff --git a/core/src/test/java/org/apache/struts/action2/views/freemarker/TestBean.java b/core/src/test/java/org/apache/struts2/views/freemarker/TestBean.java similarity index 95% rename from core/src/test/java/org/apache/struts/action2/views/freemarker/TestBean.java rename to core/src/test/java/org/apache/struts2/views/freemarker/TestBean.java index ad662b46d..64da713b2 100644 --- a/core/src/test/java/org/apache/struts/action2/views/freemarker/TestBean.java +++ b/core/src/test/java/org/apache/struts2/views/freemarker/TestBean.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.freemarker; +package org.apache.struts2.views.freemarker; /** diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/AbstractTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java similarity index 89% rename from core/src/test/java/org/apache/struts/action2/views/jsp/AbstractTagTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java index 9a017005e..73db20ef2 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/AbstractTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java @@ -15,16 +15,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp; +package org.apache.struts2.views.jsp; -import org.apache.struts.action2.ServletActionContext; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.StrutsTestCase; -import org.apache.struts.action2.config.Configuration; -import org.apache.struts.action2.dispatcher.ApplicationMap; -import org.apache.struts.action2.dispatcher.DispatcherUtils; -import org.apache.struts.action2.dispatcher.RequestMap; -import org.apache.struts.action2.dispatcher.SessionMap; +import org.apache.struts2.ServletActionContext; +import org.apache.struts2.TestAction; +import org.apache.struts2.StrutsTestCase; +import org.apache.struts2.config.Configuration; +import org.apache.struts2.dispatcher.ApplicationMap; +import org.apache.struts2.dispatcher.DispatcherUtils; +import org.apache.struts2.dispatcher.RequestMap; +import org.apache.struts2.dispatcher.SessionMap; import com.opensymphony.xwork.Action; import com.opensymphony.xwork.ActionContext; import com.opensymphony.xwork.util.OgnlValueStack; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/AbstractUITagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java similarity index 96% rename from core/src/test/java/org/apache/struts/action2/views/jsp/AbstractUITagTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java index f19f8058d..0c24be416 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/AbstractUITagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp; +package org.apache.struts2.views.jsp; -import org.apache.struts.action2.ServletActionContext; -import org.apache.struts.action2.views.jsp.ui.AbstractUITag; +import org.apache.struts2.ServletActionContext; +import org.apache.struts2.views.jsp.ui.AbstractUITag; import com.opensymphony.xwork.ActionContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -142,11 +142,11 @@ public abstract class AbstractUITagTest extends AbstractTagTest { /** * Initialize a map of {@link PropertyHolder} for generic tag property testing. Will be used when calling {@link - * #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag, String, String[])} as properties to + * #verifyGenericProperties(org.apache.struts2.views.jsp.ui.AbstractUITag, String, String[])} as properties to * verify.

This implementation defines testdata for all common AbstractUITag properties and may be overridden in * subclasses. * - * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} + * @return A Map of PropertyHolders values bound to {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} * as key. */ protected Map initializedGenericTagTestProperties() { @@ -181,7 +181,7 @@ public abstract class AbstractUITagTest extends AbstractTagTest { /** * Do a generic verification that setting certain properties on a tag causes expected output regarding this * property. In most cases you would not call this directly, instead use {@link - * #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag, String, String[])}. + * #verifyGenericProperties(org.apache.struts2.views.jsp.ui.AbstractUITag, String, String[])}. * * @param tag The fresh created tag instance to test. * @param theme The theme to use. If null, use configured default theme. diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ActionTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java similarity index 96% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ActionTagTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java index 72f965a11..2d7702e35 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ActionTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java @@ -15,15 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp; +package org.apache.struts2.views.jsp; import com.opensymphony.xwork.*; import com.opensymphony.xwork.util.OgnlValueStack; -import org.apache.struts.action2.ServletActionContext; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.TestActionTagResult; -import org.apache.struts.action2.TestConfigurationProvider; -import org.apache.struts.action2.components.ActionComponent; +import org.apache.struts2.ServletActionContext; +import org.apache.struts2.TestAction; +import org.apache.struts2.TestActionTagResult; +import org.apache.struts2.TestConfigurationProvider; +import org.apache.struts2.components.ActionComponent; import javax.servlet.jsp.JspException; import javax.servlet.jsp.PageContext; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/AnchorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/AnchorTagTest.java similarity index 92% rename from core/src/test/java/org/apache/struts/action2/views/jsp/AnchorTagTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/AnchorTagTest.java index e5aea426d..35a19bf70 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/AnchorTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/AnchorTagTest.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp; +package org.apache.struts2.views.jsp; -import org.apache.struts.action2.views.jsp.ui.AnchorTag; -import org.apache.struts.action2.views.jsp.ui.StrutsBodyContent; +import org.apache.struts2.views.jsp.ui.AnchorTag; +import org.apache.struts2.views.jsp.ui.StrutsBodyContent; import javax.servlet.jsp.JspException; import javax.servlet.jsp.JspWriter; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/AppendIteratorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java similarity index 97% rename from core/src/test/java/org/apache/struts/action2/views/jsp/AppendIteratorTagTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java index b85bd6b46..87d9256c2 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/AppendIteratorTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/AppendIteratorTagTest.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp; +package org.apache.struts2.views.jsp; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apache.struts.action2.views.jsp.iterator.AppendIteratorTag; +import org.apache.struts2.views.jsp.iterator.AppendIteratorTag; import com.opensymphony.xwork.Action; import com.opensymphony.xwork.ActionSupport; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/BeanTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/BeanTagTest.java similarity index 92% rename from core/src/test/java/org/apache/struts/action2/views/jsp/BeanTagTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/BeanTagTest.java index 34e0b471d..a5811a3ea 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/BeanTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/BeanTagTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp; +package org.apache.struts2.views.jsp; import javax.servlet.jsp.JspException; @@ -27,7 +27,7 @@ public class BeanTagTest extends AbstractUITagTest { public void testSimple() { BeanTag tag = new BeanTag(); tag.setPageContext(pageContext); - tag.setName("org.apache.struts.action2.TestAction"); + tag.setName("org.apache.struts2.TestAction"); try { tag.doStartTag(); diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ElseIfTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ElseIfTagTest.java similarity index 95% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ElseIfTagTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ElseIfTagTest.java index a11b855fe..86e457667 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ElseIfTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ElseIfTagTest.java @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp; +package org.apache.struts2.views.jsp; import javax.servlet.jsp.tagext.TagSupport; import com.mockobjects.servlet.MockJspWriter; import com.mockobjects.servlet.MockPageContext; -import org.apache.struts.action2.ServletActionContext; -import org.apache.struts.action2.components.If; +import org.apache.struts2.ServletActionContext; +import org.apache.struts2.components.If; import com.opensymphony.xwork.util.OgnlValueStack; import junit.framework.TestCase; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ElseTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java similarity index 94% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ElseTagTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java index 1cc4fa27a..16d5eb2f1 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ElseTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp; +package org.apache.struts2.views.jsp; import com.mockobjects.servlet.MockJspWriter; import com.mockobjects.servlet.MockPageContext; -import org.apache.struts.action2.ServletActionContext; -import org.apache.struts.action2.StrutsTestCase; -import org.apache.struts.action2.components.If; +import org.apache.struts2.ServletActionContext; +import org.apache.struts2.StrutsTestCase; +import org.apache.struts2.components.If; import com.opensymphony.xwork.util.OgnlValueStack; import junit.framework.TestCase; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/IfTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/IfTagTest.java similarity index 97% rename from core/src/test/java/org/apache/struts/action2/views/jsp/IfTagTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/IfTagTest.java index 24bb6ecec..b5ed9e056 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/IfTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/IfTagTest.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp; +package org.apache.struts2.views.jsp; import com.mockobjects.servlet.MockJspWriter; import com.mockobjects.servlet.MockPageContext; import com.opensymphony.xwork.ActionContext; import com.opensymphony.xwork.util.OgnlValueStack; -import org.apache.struts.action2.ServletActionContext; +import org.apache.struts2.ServletActionContext; import junit.framework.TestCase; import javax.servlet.jsp.JspException; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/IncludeTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/IncludeTagTest.java similarity index 97% rename from core/src/test/java/org/apache/struts/action2/views/jsp/IncludeTagTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/IncludeTagTest.java index 0997b3a95..1e33b276b 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/IncludeTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/IncludeTagTest.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp; +package org.apache.struts2.views.jsp; import com.mockobjects.servlet.MockRequestDispatcher; -import org.apache.struts.action2.components.Include; +import org.apache.struts2.components.Include; import org.easymock.MockControl; import javax.servlet.RequestDispatcher; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/IteratorGeneratorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java similarity index 97% rename from core/src/test/java/org/apache/struts/action2/views/jsp/IteratorGeneratorTagTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java index bfc751d72..bf4e4938f 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/IteratorGeneratorTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/IteratorGeneratorTagTest.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp; +package org.apache.struts2.views.jsp; import java.util.Iterator; -import org.apache.struts.action2.util.IteratorGenerator.Converter; -import org.apache.struts.action2.views.jsp.iterator.IteratorGeneratorTag; +import org.apache.struts2.util.IteratorGenerator.Converter; +import org.apache.struts2.views.jsp.iterator.IteratorGeneratorTag; import com.opensymphony.xwork.Action; import com.opensymphony.xwork.ActionSupport; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/IteratorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/IteratorTagTest.java similarity index 99% rename from core/src/test/java/org/apache/struts/action2/views/jsp/IteratorTagTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/IteratorTagTest.java index fed22c97a..ae456ff63 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/IteratorTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/IteratorTagTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp; +package org.apache.struts2.views.jsp; import com.mockobjects.servlet.MockBodyContent; import com.mockobjects.servlet.MockJspWriter; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/MergeIteratorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/MergeIteratorTagTest.java similarity index 97% rename from core/src/test/java/org/apache/struts/action2/views/jsp/MergeIteratorTagTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/MergeIteratorTagTest.java index efba241cd..4a6d44c84 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/MergeIteratorTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/MergeIteratorTagTest.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp; +package org.apache.struts2.views.jsp; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apache.struts.action2.views.jsp.iterator.MergeIteratorTag; +import org.apache.struts2.views.jsp.iterator.MergeIteratorTag; import com.opensymphony.xwork.Action; import com.opensymphony.xwork.ActionSupport; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/PortletUrlTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java similarity index 97% rename from core/src/test/java/org/apache/struts/action2/views/jsp/PortletUrlTagTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java index 38d14da31..d4461f18d 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/PortletUrlTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp; +package org.apache.struts2.views.jsp; import java.lang.reflect.Field; import java.util.Arrays; @@ -43,13 +43,13 @@ import org.jmock.cglib.MockObjectTestCase; import org.jmock.core.Constraint; import com.mockobjects.servlet.MockJspWriter; -import org.apache.struts.action2.portlet.PortletActionConstants; -import org.apache.struts.action2.portlet.util.PortletUrlHelper; -import org.apache.struts.action2.views.jsp.ParamTag; -import org.apache.struts.action2.dispatcher.DispatcherUtils; +import org.apache.struts2.portlet.PortletActionConstants; +import org.apache.struts2.portlet.util.PortletUrlHelper; +import org.apache.struts2.views.jsp.ParamTag; +import org.apache.struts2.dispatcher.DispatcherUtils; import com.opensymphony.xwork.ActionContext; import com.opensymphony.xwork.util.OgnlValueStack; -import org.apache.struts.action2.config.Configuration; +import org.apache.struts2.config.Configuration; /** */ diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/PropertyTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/PropertyTagTest.java similarity index 96% rename from core/src/test/java/org/apache/struts/action2/views/jsp/PropertyTagTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/PropertyTagTest.java index 6024bb644..44eaf45c5 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/PropertyTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/PropertyTagTest.java @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp; +package org.apache.struts2.views.jsp; import com.mockobjects.servlet.MockJspWriter; import com.mockobjects.servlet.MockPageContext; -import org.apache.struts.action2.ServletActionContext; -import org.apache.struts.action2.StrutsTestCase; -import org.apache.struts.action2.StrutsConstants; -import org.apache.struts.action2.config.Configuration; +import org.apache.struts2.ServletActionContext; +import org.apache.struts2.StrutsTestCase; +import org.apache.struts2.StrutsConstants; +import org.apache.struts2.config.Configuration; import com.opensymphony.xwork.ActionContext; import com.opensymphony.xwork.util.OgnlValueStack; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/PushTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/PushTagTest.java similarity index 96% rename from core/src/test/java/org/apache/struts/action2/views/jsp/PushTagTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/PushTagTest.java index c4caa07d8..ee27b054b 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/PushTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/PushTagTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp; +package org.apache.struts2.views.jsp; import javax.servlet.jsp.JspException; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/SetTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/SetTagTest.java similarity index 98% rename from core/src/test/java/org/apache/struts/action2/views/jsp/SetTagTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/SetTagTest.java index 1ae47832d..4ab11ca33 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/SetTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/SetTagTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp; +package org.apache.struts2.views.jsp; import javax.servlet.jsp.JspException; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/SortIteratorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/SortIteratorTagTest.java similarity index 98% rename from core/src/test/java/org/apache/struts/action2/views/jsp/SortIteratorTagTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/SortIteratorTagTest.java index 592afebb0..29a07ffca 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/SortIteratorTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/SortIteratorTagTest.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp; +package org.apache.struts2.views.jsp; -import org.apache.struts.action2.views.jsp.iterator.SortIteratorTag; +import org.apache.struts2.views.jsp.iterator.SortIteratorTag; import com.opensymphony.xwork.Action; import com.opensymphony.xwork.ActionSupport; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockBodyContent.java b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockBodyContent.java similarity index 98% rename from core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockBodyContent.java rename to core/src/test/java/org/apache/struts2/views/jsp/StrutsMockBodyContent.java index d2e17a521..753e9a3ec 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockBodyContent.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockBodyContent.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp; +package org.apache.struts2.views.jsp; import javax.servlet.jsp.JspWriter; import javax.servlet.jsp.tagext.BodyContent; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockHttpServletRequest.java b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletRequest.java similarity index 99% rename from core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockHttpServletRequest.java rename to core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletRequest.java index eb2c72dbf..2c257553b 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockHttpServletRequest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletRequest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp; +package org.apache.struts2.views.jsp; import com.mockobjects.servlet.MockHttpServletRequest; import junit.framework.AssertionFailedError; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockHttpServletResponse.java b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletResponse.java similarity index 97% rename from core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockHttpServletResponse.java rename to core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletResponse.java index 81c9e3ca3..c70b4e68d 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockHttpServletResponse.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpServletResponse.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp; +package org.apache.struts2.views.jsp; import com.mockobjects.servlet.MockHttpServletResponse; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockHttpSession.java b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpSession.java similarity index 97% rename from core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockHttpSession.java rename to core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpSession.java index 82bcb52d3..3c458b93c 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockHttpSession.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockHttpSession.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp; +package org.apache.struts2.views.jsp; import com.mockobjects.servlet.MockHttpSession; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockJspWriter.java b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockJspWriter.java similarity index 98% rename from core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockJspWriter.java rename to core/src/test/java/org/apache/struts2/views/jsp/StrutsMockJspWriter.java index a8f913e0c..dc61aead4 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockJspWriter.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockJspWriter.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp; +package org.apache.struts2.views.jsp; import javax.servlet.jsp.JspWriter; import java.io.IOException; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockPageContext.java b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockPageContext.java similarity index 97% rename from core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockPageContext.java rename to core/src/test/java/org/apache/struts2/views/jsp/StrutsMockPageContext.java index ef7ed0002..373a5d959 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockPageContext.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockPageContext.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp; +package org.apache.struts2.views.jsp; import com.mockobjects.servlet.MockPageContext; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockServletContext.java b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockServletContext.java similarity index 98% rename from core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockServletContext.java rename to core/src/test/java/org/apache/struts2/views/jsp/StrutsMockServletContext.java index 4f0e5ea4b..5efc49db7 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockServletContext.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockServletContext.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp; +package org.apache.struts2.views.jsp; import javax.servlet.RequestDispatcher; import javax.servlet.Servlet; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/SubsetIteratorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/SubsetIteratorTagTest.java similarity index 97% rename from core/src/test/java/org/apache/struts/action2/views/jsp/SubsetIteratorTagTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/SubsetIteratorTagTest.java index 52bb4c34e..27928bf96 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/SubsetIteratorTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/SubsetIteratorTagTest.java @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp; +package org.apache.struts2.views.jsp; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apache.struts.action2.util.SubsetIteratorFilter.Decider; -import org.apache.struts.action2.views.jsp.iterator.SubsetIteratorTag; +import org.apache.struts2.util.SubsetIteratorFilter.Decider; +import org.apache.struts2.views.jsp.iterator.SubsetIteratorTag; import com.opensymphony.xwork.Action; import com.opensymphony.xwork.ActionSupport; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/TextTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java similarity index 95% rename from core/src/test/java/org/apache/struts/action2/views/jsp/TextTagTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java index 5cfc3bf99..4fc38bfe4 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/TextTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp; +package org.apache.struts2.views.jsp; -import org.apache.struts.action2.ServletActionContext; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.components.Text; -import org.apache.struts.action2.views.jsp.ui.TestAction1; -import org.apache.struts.action2.views.jsp.ui.StrutsBodyContent; +import org.apache.struts2.ServletActionContext; +import org.apache.struts2.TestAction; +import org.apache.struts2.components.Text; +import org.apache.struts2.views.jsp.ui.TestAction1; +import org.apache.struts2.views.jsp.ui.StrutsBodyContent; import com.mockobjects.servlet.MockBodyContent; import com.mockobjects.servlet.MockJspWriter; @@ -47,7 +47,7 @@ import java.util.Locale; */ public class TextTagTest extends AbstractTagTest { - private String fooValue = "org.apache.struts.action2.views.jsp.TextTagTest.fooValue"; + private String fooValue = "org.apache.struts2.views.jsp.TextTagTest.fooValue"; private TextTag tag; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/URLTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java similarity index 99% rename from core/src/test/java/org/apache/struts/action2/views/jsp/URLTagTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java index d5daae2a0..b26908f0e 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/URLTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp; +package org.apache.struts2.views.jsp; import java.util.HashMap; import java.util.Map; import javax.servlet.jsp.JspWriter; -import org.apache.struts.action2.components.URL; +import org.apache.struts2.components.URL; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/AbstractRichtexteditorTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/AbstractRichtexteditorTest.java similarity index 93% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/AbstractRichtexteditorTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/AbstractRichtexteditorTest.java index a8fe04fb9..3855663a9 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/AbstractRichtexteditorTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/AbstractRichtexteditorTest.java @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; import java.io.ByteArrayOutputStream; import java.io.InputStream; import com.mockobjects.servlet.MockHttpServletResponse; -import org.apache.struts.action2.ServletActionContext; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.ServletActionContext; +import org.apache.struts2.views.jsp.AbstractUITagTest; import com.opensymphony.xwork.mock.MockActionInvocation; import com.opensymphony.xwork.util.OgnlValueStack; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/ActionErrorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionErrorTagTest.java similarity index 93% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/ActionErrorTagTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/ActionErrorTagTest.java index 7a8cdce4f..75f28f5a1 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/ActionErrorTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionErrorTagTest.java @@ -15,15 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; -import org.apache.struts.action2.views.jsp.ui.ActionErrorTag; +import org.apache.struts2.views.jsp.AbstractUITagTest; +import org.apache.struts2.views.jsp.ui.ActionErrorTag; import com.opensymphony.xwork.Action; import com.opensymphony.xwork.ActionSupport; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/ActionMessageTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionMessageTagTest.java similarity index 95% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/ActionMessageTagTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/ActionMessageTagTest.java index 998694d13..f2f2927c8 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/ActionMessageTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/ActionMessageTagTest.java @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.views.jsp.AbstractUITagTest; import com.opensymphony.xwork.Action; import com.opensymphony.xwork.ActionSupport; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/AnchorTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/AnchorTest.java similarity index 89% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/AnchorTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/AnchorTest.java index d288a9a62..06b058f2f 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/AnchorTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/AnchorTest.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; /** diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/Category.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/Category.java similarity index 98% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/Category.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/Category.java index fc3553eda..78e033dc6 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/Category.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/Category.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; import java.util.ArrayList; import java.util.HashMap; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/CheckboxListTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxListTest.java similarity index 93% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/CheckboxListTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxListTest.java index ef0452286..a7ec8eb66 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/CheckboxListTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxListTest.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; import java.util.ArrayList; import java.util.Collection; @@ -32,11 +32,11 @@ import java.util.Map; public class CheckboxListTest extends AbstractUITagTest { /** - * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag - * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag, + * Initialize a map of {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag + * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts2.views.jsp.ui.AbstractUITag, * String, String[])} as properties to verify.

This implementation extends testdata from AbstractUITag. * - * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} + * @return A Map of PropertyHolders values bound to {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} * as key. */ protected Map initializedGenericTagTestProperties() { diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/CheckboxTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java similarity index 91% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/CheckboxTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java index c78e37871..e6cfd2743 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/CheckboxTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; import java.util.Map; @@ -31,11 +31,11 @@ public class CheckboxTest extends AbstractUITagTest { } /** - * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag - * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag, + * Initialize a map of {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag + * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts2.views.jsp.ui.AbstractUITag, * String, String[])} as properties to verify.

This implementation extends testdata from AbstractUITag. * - * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} + * @return A Map of PropertyHolders values bound to {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} * as key. */ protected Map initializedGenericTagTestProperties() { diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/ComboBoxTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/ComboBoxTest.java similarity index 96% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/ComboBoxTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/ComboBoxTest.java index 7ff77aa9d..e01ce5f54 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/ComboBoxTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/ComboBoxTest.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/ComponentTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/ComponentTest.java similarity index 95% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/ComponentTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/ComponentTest.java index f0beadf17..3307cd643 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/ComponentTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/ComponentTest.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; /** diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/DatePickerTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/DatePickerTagTest.java similarity index 96% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/DatePickerTagTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/DatePickerTagTest.java index 57f7ea6b7..17b6ed89e 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/DatePickerTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/DatePickerTagTest.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.views.jsp.AbstractUITagTest; import com.opensymphony.xwork.ActionContext; import java.util.Locale; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/DateTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java similarity index 95% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/DateTagTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java index 1eb476978..7e8512a2b 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/DateTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.views.jsp.AbstractTagTest; -import org.apache.struts.action2.views.jsp.DateTag; +import org.apache.struts2.views.jsp.AbstractTagTest; +import org.apache.struts2.views.jsp.DateTag; import com.opensymphony.xwork.ActionContext; import java.text.DateFormat; @@ -27,7 +27,7 @@ import java.util.Calendar; import java.util.Date; /** - * Unit test for {@link org.apache.struts.action2.components.Date}. + * Unit test for {@link org.apache.struts2.components.Date}. * */ public class DateTagTest extends AbstractTagTest { @@ -74,7 +74,7 @@ public class DateTagTest extends AbstractTagTest { tag.doStartTag(); // component test must be done between start and end tag - org.apache.struts.action2.components.Date component = (org.apache.struts.action2.components.Date) tag.getComponent(); + org.apache.struts2.components.Date component = (org.apache.struts2.components.Date) tag.getComponent(); assertEquals("myDate", component.getName()); assertEquals(format, component.getFormat()); assertEquals(false, component.isNice()); diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/DivTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/DivTest.java similarity index 92% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/DivTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/DivTest.java index fb7f56634..9cb9f6160 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/DivTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/DivTest.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; /** diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/DoubleSelectTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/DoubleSelectTest.java similarity index 98% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/DoubleSelectTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/DoubleSelectTest.java index e4c32a42e..6c3205b01 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/DoubleSelectTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/DoubleSelectTest.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; import java.util.ArrayList; import java.util.Collection; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/FieldErrorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/FieldErrorTagTest.java similarity index 97% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/FieldErrorTagTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/FieldErrorTagTest.java index 6f13720e5..c20ce2369 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/FieldErrorTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/FieldErrorTagTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; import java.util.ArrayList; import java.util.Collections; @@ -23,8 +23,8 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; -import org.apache.struts.action2.views.jsp.ParamTag; +import org.apache.struts2.views.jsp.AbstractUITagTest; +import org.apache.struts2.views.jsp.ParamTag; import com.opensymphony.xwork.Action; import com.opensymphony.xwork.ActionSupport; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/FileTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/FileTest.java similarity index 84% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/FileTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/FileTest.java index 6fd91d369..a8e0175ad 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/FileTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/FileTest.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; import java.util.Map; @@ -51,11 +51,11 @@ public class FileTest extends AbstractUITagTest { } /** - * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag - * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag, + * Initialize a map of {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag + * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts2.views.jsp.ui.AbstractUITag, * String, String[])} as properties to verify.

This implementation extends testdata from AbstractUITag. * - * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} + * @return A Map of PropertyHolders values bound to {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} * as key. */ protected Map initializedGenericTagTestProperties() { diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/FormTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java similarity index 97% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/FormTagTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java index c4c4202a0..5538fd7a0 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/FormTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; import com.opensymphony.xwork.ActionContext; import com.opensymphony.xwork.ActionSupport; @@ -25,13 +25,13 @@ import com.opensymphony.xwork.config.RuntimeConfiguration; import com.opensymphony.xwork.config.entities.ActionConfig; import com.opensymphony.xwork.config.entities.InterceptorMapping; import com.opensymphony.xwork.validator.ValidationInterceptor; -import org.apache.struts.action2.StrutsConstants; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.TestConfigurationProvider; -import org.apache.struts.action2.config.Configuration; -import org.apache.struts.action2.dispatcher.mapper.DefaultActionMapper; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; -import org.apache.struts.action2.views.jsp.ActionTag; +import org.apache.struts2.StrutsConstants; +import org.apache.struts2.TestAction; +import org.apache.struts2.TestConfigurationProvider; +import org.apache.struts2.config.Configuration; +import org.apache.struts2.dispatcher.mapper.DefaultActionMapper; +import org.apache.struts2.views.jsp.AbstractUITagTest; +import org.apache.struts2.views.jsp.ActionTag; import java.util.ArrayList; import java.util.List; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/HeadTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/HeadTagTest.java similarity index 95% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/HeadTagTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/HeadTagTest.java index a1755d16b..b1cfd5cf8 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/HeadTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/HeadTagTest.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; -import org.apache.struts.action2.components.Head; +import org.apache.struts2.views.jsp.AbstractUITagTest; +import org.apache.struts2.components.Head; /** * Unit test for {@link HeadTag}. diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/HiddenTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/HiddenTest.java similarity index 85% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/HiddenTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/HiddenTest.java index 985b4707c..a983f9691 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/HiddenTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/HiddenTest.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; import java.util.Map; import java.util.HashMap; @@ -45,11 +45,11 @@ public class HiddenTest extends AbstractUITagTest { } /** - * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag - * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag, + * Initialize a map of {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag + * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts2.views.jsp.ui.AbstractUITag, * String, String[])} as properties to verify.

This implementation extends testdata from AbstractUITag. * - * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} + * @return A Map of PropertyHolders values bound to {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} * as key. */ protected Map initializedGenericTagTestProperties() { diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/JspTemplateTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/JspTemplateTest.java similarity index 91% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/JspTemplateTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/JspTemplateTest.java index be9240272..8b1eff547 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/JspTemplateTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/JspTemplateTest.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; import com.mockobjects.dynamic.C; import com.mockobjects.dynamic.Mock; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/LabelTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java similarity index 88% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/LabelTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java index fff3146a9..d457b8999 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/LabelTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; import java.util.Map; import java.util.HashMap; @@ -63,11 +63,11 @@ public class LabelTest extends AbstractUITagTest { } /** - * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag - * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag, + * Initialize a map of {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag + * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts2.views.jsp.ui.AbstractUITag, * String, String[])} as properties to verify.

This implementation extends testdata from AbstractUITag. * - * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} + * @return A Map of PropertyHolders values bound to {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} * as key. */ protected Map initializedGenericTagTestProperties() { diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/MockTag.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/MockTag.java similarity index 98% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/MockTag.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/MockTag.java index 414364676..546de805f 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/MockTag.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/MockTag.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; import javax.servlet.jsp.tagext.BodyTagSupport; import java.util.Calendar; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/OptionTransferSelectTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTagTest.java similarity index 98% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/OptionTransferSelectTagTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTagTest.java index 59660054f..2384fe6d6 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/OptionTransferSelectTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTagTest.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; import java.util.ArrayList; import java.util.List; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; /** * diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/PasswordTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/PasswordTest.java similarity index 91% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/PasswordTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/PasswordTest.java index f688e02e5..66d33d3e1 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/PasswordTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/PasswordTest.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; /** diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/RadioTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java similarity index 95% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/RadioTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java index a6c605d19..baf6c4596 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/RadioTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/ResetTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java similarity index 91% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/ResetTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java index 17b58db29..0994526ac 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/ResetTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; import java.util.HashMap; import java.util.Map; @@ -97,11 +97,11 @@ public class ResetTest extends AbstractUITagTest { } /** - * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag + * Initialize a map of {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag * property testing. Will be used when calling {@link #verifyGenericProperties(AbstractUITag, * String, String[])} as properties to verify.

This implementation extends testdata from AbstractUITag. * - * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} + * @return A Map of PropertyHolders values bound to {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} * as key. */ protected Map initializedGenericTagTestProperties() { diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/RichTextEditorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/RichTextEditorTagTest.java similarity index 97% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/RichTextEditorTagTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/RichTextEditorTagTest.java index 39c9e83c3..dddbb35ad 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/RichTextEditorTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/RichTextEditorTagTest.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; import java.util.Locale; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.views.jsp.AbstractUITagTest; import com.opensymphony.xwork.ActionContext; /** diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/SelectTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java similarity index 97% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/SelectTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java index 3cb013ad7..006048634 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/SelectTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/SelectTest.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/StrutsBodyContent.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/StrutsBodyContent.java similarity index 98% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/StrutsBodyContent.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/StrutsBodyContent.java index 015e837b2..9e1a0e78f 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/StrutsBodyContent.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/StrutsBodyContent.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; import javax.servlet.jsp.JspWriter; import javax.servlet.jsp.tagext.BodyContent; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/SubmitTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java similarity index 94% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/SubmitTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java index 5e164a066..c44be1518 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/SubmitTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; import java.util.Map; import java.util.HashMap; @@ -211,11 +211,11 @@ public class SubmitTest extends AbstractUITagTest { } /** - * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag - * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag, + * Initialize a map of {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag + * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts2.views.jsp.ui.AbstractUITag, * String, String[])} as properties to verify.

This implementation extends testdata from AbstractUITag. * - * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} + * @return A Map of PropertyHolders values bound to {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} * as key. */ protected Map initializedGenericTagTestProperties() { diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/TestAction1.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/TestAction1.java similarity index 94% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/TestAction1.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/TestAction1.java index 9cd6cb200..8f3b4e4da 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/TestAction1.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/TestAction1.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; import com.opensymphony.xwork.ActionSupport; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/TextareaTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/TextareaTest.java similarity index 86% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/TextareaTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/TextareaTest.java index b9a1ceade..7cec6fd07 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/TextareaTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/TextareaTest.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.jsp.AbstractUITagTest; import java.util.Map; @@ -54,11 +54,11 @@ public class TextareaTest extends AbstractUITagTest { } /** - * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag - * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag, + * Initialize a map of {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag + * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts2.views.jsp.ui.AbstractUITag, * String, String[])} as properties to verify.

This implementation extends testdata from AbstractUITag. * - * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} + * @return A Map of PropertyHolders values bound to {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} * as key. */ protected Map initializedGenericTagTestProperties() { diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/TextfieldTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java similarity index 89% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/TextfieldTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java index 71fb9e84e..f1c81f8fb 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/TextfieldTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.TestAction; -import org.apache.struts.action2.views.freemarker.tags.TextFieldModel; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.TestAction; +import org.apache.struts2.views.freemarker.tags.TextFieldModel; +import org.apache.struts2.views.jsp.AbstractUITagTest; import freemarker.template.TransformControl; import java.util.HashMap; @@ -31,11 +31,11 @@ import java.util.Map; public class TextfieldTest extends AbstractUITagTest { /** - * Initialize a map of {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag - * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts.action2.views.jsp.ui.AbstractUITag, + * Initialize a map of {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag + * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts2.views.jsp.ui.AbstractUITag, * String, String[])} as properties to verify.

This implementation extends testdata from AbstractUITag. * - * @return A Map of PropertyHolders values bound to {@link org.apache.struts.action2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} + * @return A Map of PropertyHolders values bound to {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} * as key. */ protected Map initializedGenericTagTestProperties() { diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/TokenTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/TokenTagTest.java similarity index 94% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/TokenTagTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/TokenTagTest.java index d216d416c..eeba8caa5 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/TokenTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/TokenTagTest.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.util.TokenHelper; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.util.TokenHelper; +import org.apache.struts2.views.jsp.AbstractUITagTest; import javax.servlet.jsp.JspException; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/TooltipTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/TooltipTest.java similarity index 98% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/TooltipTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/TooltipTest.java index b96448455..d2ad4b42f 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/TooltipTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/TooltipTest.java @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; import com.mockobjects.servlet.MockJspWriter; import com.opensymphony.xwork.XWorkStatic; -import org.apache.struts.action2.TestConfigurationProvider; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; -import org.apache.struts.action2.views.jsp.ParamTag; -import org.apache.struts.action2.views.jsp.StrutsMockBodyContent; +import org.apache.struts2.TestConfigurationProvider; +import org.apache.struts2.views.jsp.AbstractUITagTest; +import org.apache.struts2.views.jsp.ParamTag; +import org.apache.struts2.views.jsp.StrutsMockBodyContent; /** * UI components Tooltip test case. diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/TreeTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/TreeTest.java similarity index 96% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/TreeTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/TreeTest.java index 84c21f934..89b9385f0 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/TreeTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/TreeTest.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.views.jsp.AbstractUITagTest; import com.opensymphony.xwork.Action; import com.opensymphony.xwork.ActionSupport; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/UpDownSelectTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/UpDownSelectTagTest.java similarity index 98% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/UpDownSelectTagTest.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/UpDownSelectTagTest.java index ef6bf709f..e9ab913d9 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/UpDownSelectTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/UpDownSelectTagTest.java @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.apache.struts.action2.views.jsp.AbstractUITagTest; +import org.apache.struts2.views.jsp.AbstractUITagTest; import com.opensymphony.xwork.Action; import com.opensymphony.xwork.ActionSupport; diff --git a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/User.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/User.java similarity index 94% rename from core/src/test/java/org/apache/struts/action2/views/jsp/ui/User.java rename to core/src/test/java/org/apache/struts2/views/jsp/ui/User.java index 316b3d553..2f5d2fa32 100644 --- a/core/src/test/java/org/apache/struts/action2/views/jsp/ui/User.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/User.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.jsp.ui; +package org.apache.struts2.views.jsp.ui; /** diff --git a/core/src/test/java/org/apache/struts/action2/views/util/ContextUtilTest.java b/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java similarity index 97% rename from core/src/test/java/org/apache/struts/action2/views/util/ContextUtilTest.java rename to core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java index ba3d96cd8..d472301cf 100755 --- a/core/src/test/java/org/apache/struts/action2/views/util/ContextUtilTest.java +++ b/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.util; +package org.apache.struts2.views.util; -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 com.opensymphony.xwork.util.OgnlValueStack; import junit.framework.TestCase; diff --git a/core/src/test/java/org/apache/struts/action2/views/util/ResourceUtilTest.java b/core/src/test/java/org/apache/struts2/views/util/ResourceUtilTest.java similarity index 97% rename from core/src/test/java/org/apache/struts/action2/views/util/ResourceUtilTest.java rename to core/src/test/java/org/apache/struts2/views/util/ResourceUtilTest.java index 1cf1b0e98..a0f49fb30 100644 --- a/core/src/test/java/org/apache/struts/action2/views/util/ResourceUtilTest.java +++ b/core/src/test/java/org/apache/struts2/views/util/ResourceUtilTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.util; +package org.apache.struts2.views.util; /** * ResourceUtilTest * diff --git a/core/src/test/java/org/apache/struts/action2/views/util/TextUtilTest.java b/core/src/test/java/org/apache/struts2/views/util/TextUtilTest.java similarity index 98% rename from core/src/test/java/org/apache/struts/action2/views/util/TextUtilTest.java rename to core/src/test/java/org/apache/struts2/views/util/TextUtilTest.java index 0c4ff5f98..f90086d5c 100644 --- a/core/src/test/java/org/apache/struts/action2/views/util/TextUtilTest.java +++ b/core/src/test/java/org/apache/struts2/views/util/TextUtilTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.util; +package org.apache.struts2.views.util; import junit.framework.TestCase; diff --git a/core/src/test/java/org/apache/struts/action2/views/util/UrlHelperTest.java b/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java similarity index 98% rename from core/src/test/java/org/apache/struts/action2/views/util/UrlHelperTest.java rename to core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java index 1c0151b18..08d2ed1cc 100644 --- a/core/src/test/java/org/apache/struts/action2/views/util/UrlHelperTest.java +++ b/core/src/test/java/org/apache/struts2/views/util/UrlHelperTest.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.util; +package org.apache.struts2.views.util; import com.mockobjects.dynamic.Mock; -import org.apache.struts.action2.StrutsTestCase; -import org.apache.struts.action2.StrutsConstants; -import org.apache.struts.action2.config.Configuration; +import org.apache.struts2.StrutsTestCase; +import org.apache.struts2.StrutsConstants; +import org.apache.struts2.config.Configuration; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/core/src/test/java/org/apache/struts/action2/views/xslt/XSLTResultTest.java b/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java similarity index 97% rename from core/src/test/java/org/apache/struts/action2/views/xslt/XSLTResultTest.java rename to core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java index a5d7cf1f5..1b0718290 100644 --- a/core/src/test/java/org/apache/struts/action2/views/xslt/XSLTResultTest.java +++ b/core/src/test/java/org/apache/struts2/views/xslt/XSLTResultTest.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts.action2.views.xslt; +package org.apache.struts2.views.xslt; -import org.apache.struts.action2.ServletActionContext; -import org.apache.struts.action2.StrutsTestCase; +import org.apache.struts2.ServletActionContext; +import org.apache.struts2.StrutsTestCase; import com.opensymphony.xwork.Action; import com.opensymphony.xwork.ActionContext; import com.opensymphony.xwork.mock.MockActionInvocation; diff --git a/core/src/test/resources/org/apache/struts/action2/TestAction-validation.xml b/core/src/test/resources/org/apache/struts2/TestAction-validation.xml similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/TestAction-validation.xml rename to core/src/test/resources/org/apache/struts2/TestAction-validation.xml diff --git a/core/src/test/resources/org/apache/struts/action2/TestAction.properties b/core/src/test/resources/org/apache/struts2/TestAction.properties similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/TestAction.properties rename to core/src/test/resources/org/apache/struts2/TestAction.properties diff --git a/core/src/test/resources/org/apache/struts/action2/components/tempo.properties b/core/src/test/resources/org/apache/struts2/components/tempo.properties similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/components/tempo.properties rename to core/src/test/resources/org/apache/struts2/components/tempo.properties diff --git a/core/src/test/resources/org/apache/struts/action2/dispatcher/ServletDispatcherTest-xwork.xml b/core/src/test/resources/org/apache/struts2/dispatcher/ServletDispatcherTest-xwork.xml similarity index 67% rename from core/src/test/resources/org/apache/struts/action2/dispatcher/ServletDispatcherTest-xwork.xml rename to core/src/test/resources/org/apache/struts2/dispatcher/ServletDispatcherTest-xwork.xml index e45848a43..2e01aa2a9 100644 --- a/core/src/test/resources/org/apache/struts/action2/dispatcher/ServletDispatcherTest-xwork.xml +++ b/core/src/test/resources/org/apache/struts2/dispatcher/ServletDispatcherTest-xwork.xml @@ -6,10 +6,10 @@ - + - + diff --git a/core/src/test/resources/org/apache/struts/action2/dispatcher/someJspFile.jsp b/core/src/test/resources/org/apache/struts2/dispatcher/someJspFile.jsp similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/dispatcher/someJspFile.jsp rename to core/src/test/resources/org/apache/struts2/dispatcher/someJspFile.jsp diff --git a/core/src/test/resources/org/apache/struts/action2/interceptor/FileUploadInterceptor.properties b/core/src/test/resources/org/apache/struts2/interceptor/FileUploadInterceptor.properties similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/interceptor/FileUploadInterceptor.properties rename to core/src/test/resources/org/apache/struts2/interceptor/FileUploadInterceptor.properties diff --git a/core/src/test/resources/org/apache/struts/action2/othertest.properties b/core/src/test/resources/org/apache/struts2/othertest.properties similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/othertest.properties rename to core/src/test/resources/org/apache/struts2/othertest.properties diff --git a/core/src/test/resources/org/apache/struts/action2/sitegraph/hello.jsp b/core/src/test/resources/org/apache/struts2/sitegraph/hello.jsp similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/sitegraph/hello.jsp rename to core/src/test/resources/org/apache/struts2/sitegraph/hello.jsp diff --git a/core/src/test/resources/org/apache/struts/action2/sitegraph/out.txt b/core/src/test/resources/org/apache/struts2/sitegraph/out.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/sitegraph/out.txt rename to core/src/test/resources/org/apache/struts2/sitegraph/out.txt diff --git a/core/src/test/resources/org/apache/struts/action2/sitegraph/tutorial/sitegraph/guess-error.ftl b/core/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-error.ftl similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/sitegraph/tutorial/sitegraph/guess-error.ftl rename to core/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-error.ftl diff --git a/core/src/test/resources/org/apache/struts/action2/sitegraph/tutorial/sitegraph/guess-input.ftl b/core/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-input.ftl similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/sitegraph/tutorial/sitegraph/guess-input.ftl rename to core/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-input.ftl diff --git a/core/src/test/resources/org/apache/struts/action2/sitegraph/tutorial/sitegraph/guess-success.jsp b/core/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-success.jsp similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/sitegraph/tutorial/sitegraph/guess-success.jsp rename to core/src/test/resources/org/apache/struts2/sitegraph/tutorial/sitegraph/guess-success.jsp diff --git a/core/src/test/resources/org/apache/struts/action2/sitegraph/xwork.xml b/core/src/test/resources/org/apache/struts2/sitegraph/xwork.xml similarity index 87% rename from core/src/test/resources/org/apache/struts/action2/sitegraph/xwork.xml rename to core/src/test/resources/org/apache/struts2/sitegraph/xwork.xml index a57b502a0..51c1d8a04 100644 --- a/core/src/test/resources/org/apache/struts/action2/sitegraph/xwork.xml +++ b/core/src/test/resources/org/apache/struts2/sitegraph/xwork.xml @@ -13,7 +13,7 @@ + class="org.apache.struts2.views.freemarker.FreemarkerResult"/> @@ -24,7 +24,7 @@ + class="org.apache.struts2.views.freemarker.FreemarkerResult"/> diff --git a/core/src/test/resources/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest-applicationContext.xml b/core/src/test/resources/org/apache/struts2/spring/StrutsSpringObjectFactoryTest-applicationContext.xml similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest-applicationContext.xml rename to core/src/test/resources/org/apache/struts2/spring/StrutsSpringObjectFactoryTest-applicationContext.xml diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-1.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-1.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-1.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-2.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-2.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-2.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-3.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-3.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-3.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-4.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-4.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-4.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-5.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-5.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-5.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/CheckboxList-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-1.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/CheckboxList-1.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-1.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/CheckboxList-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-2.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/CheckboxList-2.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-2.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/CheckboxList-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-3.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/CheckboxList-3.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-3.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/CheckboxList-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-4.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/CheckboxList-4.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-4.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/ComboBox-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-1.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/ComboBox-1.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-1.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/ComboBox-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-2.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/ComboBox-2.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-2.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/ComboBox-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-3.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/ComboBox-3.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-3.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Component-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Component-1.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Component-1.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Component-1.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Component-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Component-2.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Component-2.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Component-2.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Component-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Component-3.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Component-3.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Component-3.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Component-param.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Component-param.txt similarity index 63% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Component-param.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Component-param.txt index 3805eaa8a..9d257f601 100644 --- a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Component-param.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Component-param.txt @@ -1,7 +1,7 @@ param hello = world param argle = bargle param glip = glop -param obj.Class = class org.apache.struts.action2.views.jsp.ui.ComponentTag +param obj.Class = class org.apache.struts2.views.jsp.ui.ComponentTag param array[0] = a param array[1] = b diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/DatePickerTagTest-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DatePickerTagTest-1.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/DatePickerTagTest-1.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/DatePickerTagTest-1.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/DatePickerTagTest-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DatePickerTagTest-2.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/DatePickerTagTest-2.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/DatePickerTagTest-2.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/DoubleSelect-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/DoubleSelect-1.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/DoubleSelect-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-2.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/DoubleSelect-2.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-2.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/File-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/File-1.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/File-1.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/File-1.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-1.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-1.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-1.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-10.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-10.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-10.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-10.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-11.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-11.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-2.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-3.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-3.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-3.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-4.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-4.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-4.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-5.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-5.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-5.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-6.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-7.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-7.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-7.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-7.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-8.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-8.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-8.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-8.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-9.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-9.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-9.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-9.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/HeadTagTest-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/HeadTagTest-1.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/HeadTagTest-1.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/HeadTagTest-1.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/HeadTagTest-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/HeadTagTest-2.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/HeadTagTest-2.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/HeadTagTest-2.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/HeadTagTest-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/HeadTagTest-3.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/HeadTagTest-3.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/HeadTagTest-3.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/HeadTagTest-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/HeadTagTest-4.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/HeadTagTest-4.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/HeadTagTest-4.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Hidden-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Hidden-1.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Hidden-1.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Hidden-1.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Label-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-1.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Label-1.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-1.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Label-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-2.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Label-2.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-2.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Label-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-3.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Label-3.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-3.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Password-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Password-1.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Password-1.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Password-1.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Radio-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-1.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Radio-1.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-1.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Radio-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-2.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Radio-2.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-2.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Radio-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-3.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Radio-3.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-3.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Reset-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-1.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Reset-1.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-1.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Reset-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-2.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Reset-2.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-2.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Reset-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-3.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Reset-3.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-3.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Reset-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-4.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Reset-4.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-4.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-1.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-1.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-1.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-2.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-2.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-2.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-3.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-3.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-3.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-4.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-4.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-4.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-5.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-5.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-5.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-6.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-6.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-6.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-1.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-2.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-2.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-2.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-3.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-3.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-3.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-4.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-4.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-4.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-5.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-6.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-6.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-6.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/TestAction1.properties b/core/src/test/resources/org/apache/struts2/views/jsp/ui/TestAction1.properties similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/TestAction1.properties rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/TestAction1.properties diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/TestAction1_de.properties b/core/src/test/resources/org/apache/struts2/views/jsp/ui/TestAction1_de.properties similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/TestAction1_de.properties rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/TestAction1_de.properties diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/TestAction1_fr.properties b/core/src/test/resources/org/apache/struts2/views/jsp/ui/TestAction1_fr.properties similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/TestAction1_fr.properties rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/TestAction1_fr.properties diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Textarea-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textarea-1.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Textarea-1.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Textarea-1.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Textfield-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-1.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Textfield-1.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-1.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Textfield-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-2.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Textfield-2.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-2.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Textfield-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-3.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/Textfield-3.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-3.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/User-validation.xml b/core/src/test/resources/org/apache/struts2/views/jsp/ui/User-validation.xml similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/User-validation.xml rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/User-validation.xml diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/User.properties b/core/src/test/resources/org/apache/struts2/views/jsp/ui/User.properties similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/User.properties rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/User.properties diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/actionerror-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/actionerror-1.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/actionerror-1.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/actionerror-1.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/actionerror-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/actionerror-2.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/actionerror-2.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/actionerror-2.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/actionmessage-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/actionmessage-1.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/actionmessage-1.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/actionmessage-1.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/actionmessage-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/actionmessage-2.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/actionmessage-2.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/actionmessage-2.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/div-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/div-1.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/div-1.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/div-1.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-1.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-1.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-1.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-2.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-2.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-2.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-3.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-3.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-3.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-4.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-4.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-4.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-5.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-5.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/fielderror-5.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/href-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/href-1.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/href-1.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/href-1.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-1.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-2.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-2.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-2.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-3.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-3.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-3.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-4.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-4.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-4.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-5.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-5.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-5.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-6.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-6.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-6.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-7.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-7.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-7.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-7.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/richtexteditor-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/richtexteditor-1.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/richtexteditor-1.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/richtexteditor-1.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/richtexteditor-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/richtexteditor-2.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/richtexteditor-2.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/richtexteditor-2.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/richtexteditor-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/richtexteditor-3.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/richtexteditor-3.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/richtexteditor-3.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/richtexteditor-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/richtexteditor-4.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/richtexteditor-4.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/richtexteditor-4.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/submit-ajax-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/submit-ajax-1.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/submit-ajax-1.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/submit-ajax-1.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/tooltip-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-1.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/tooltip-1.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-1.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/tooltip-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-2.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/tooltip-2.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-2.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/tooltip-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-3.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/tooltip-3.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-3.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/tree-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tree-1.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/tree-1.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/tree-1.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/tree-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tree-2.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/tree-2.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/tree-2.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-1.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-1.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-1.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-10.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-10.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-10.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-10.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-11.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-11.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-11.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-11.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-2.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-2.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-2.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-3.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-3.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-3.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-4.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-4.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-4.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-5.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-5.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-5.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-6.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-6.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-6.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-7.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-7.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-7.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-7.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-8.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-8.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-8.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-8.txt diff --git a/core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-9.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-9.txt similarity index 100% rename from core/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-9.txt rename to core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-9.txt diff --git a/core/src/test/resources/struts.properties b/core/src/test/resources/struts.properties index 06eda20b9..5766ea515 100644 --- a/core/src/test/resources/struts.properties +++ b/core/src/test/resources/struts.properties @@ -4,10 +4,10 @@ struts.multipart.saveDir=\temp struts.multipart.maxSize=12345 ### Load custom property files (does not override struts.properties!) -struts.custom.properties=test,org/apache/struts/action2/othertest +struts.custom.properties=test,org/apache/struts2/othertest # added the MockTag to the path of Tags that the TagDirective will search through -struts.velocity.tag.path = org.apache.struts.action2.views.velocity.ui, org.displaytag.tags +struts.velocity.tag.path = org.apache.struts2.views.velocity.ui, org.displaytag.tags struts.ui.templateDir = template diff --git a/core/src/test/resources/xwork.xml b/core/src/test/resources/xwork.xml index a57b502a0..51c1d8a04 100644 --- a/core/src/test/resources/xwork.xml +++ b/core/src/test/resources/xwork.xml @@ -13,7 +13,7 @@ + class="org.apache.struts2.views.freemarker.FreemarkerResult"/> @@ -24,7 +24,7 @@ + class="org.apache.struts2.views.freemarker.FreemarkerResult"/>